Fix some String error.

Author: bitsk

cores/arduino/Arduino.h

@@ -30,6 +30,7 @@
 // AVR stuff, assuming Arduino.h or WProgram.h
 // automatically includes it...
 #include <avr/pgmspace.h>
+#include <avr/dtostrf.h>
 //#include <avr/interrupt.h>
 
 #include "binary.h"

cores/arduino/WString.cpp

@@ -20,11 +20,11 @@
 */
 
 #include "WString.h"
-#include "itoa.h"
+#include "stdlib_noniso.h"
+
 
-#ifdef NOTYET /* XXX Marko FIXME! */
 #include "avr/dtostrf.h"
-#endif
+
 
 extern "C" {
 #include "avr/pgmspace.h"
@@ -114,7 +114,7 @@ String::String(unsigned long value, unsigned char base)
 	*this = buf;
 }
 
-#ifdef NOTYET /* XXX Marko FIXME! */
+
 String::String(float value, unsigned char decimalPlaces)
 {
 	init();
@@ -128,7 +128,7 @@ String::String(double value, unsigned char decimalPlaces)
 	char buf[33];
 	*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
 }
-#endif /* XXX Marko FIXME! */
+
 
 String::~String()
 {
@@ -331,7 +331,7 @@ unsigned char String::concat(unsigned long num)
 	return concat(buf, strlen(buf));
 }
 
-#ifdef NOTYET /* XXX Marko FIXME! */
+
 unsigned char String::concat(float num)
 {
 	char buf[20];
@@ -345,7 +345,7 @@ unsigned char String::concat(double num)
 	char* string = dtostrf(num, 4, 2, buf);
 	return concat(string, strlen(string));
 }
-#endif /* XXX Marko FIXME! */
+
 
 unsigned char String::concat(const __FlashStringHelper * str)
 {
@@ -748,7 +748,7 @@ void String::trim(void)
 /*  Parsing / Conversion                     */
 /*********************************************/
 
-#ifdef NOTYET /* XXX Marko FIXME! */
+
 long String::toInt(void) const
 {
 	if (buffer) return atol(buffer);
@@ -760,4 +760,4 @@ float String::toFloat(void) const
 	if (buffer) return float(atof(buffer));
 	return 0;
 }
-#endif /* XXX Marko FIXME! */
+

cores/arduino/avr/dtostrf.h

@@ -0,0 +1,34 @@
+/*
+  dtostrf - Emulation for dtostrf function from avr-libc
+  Copyright (c) 2015 Arduino LLC.  All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#pragma once
+
+#if !defined(ARDUINO_ARCH_AVR)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char *dtostrf(double val, signed char width, unsigned char prec, char *sout);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

cores/arduino/itoa.c

@@ -23,8 +23,10 @@
 extern "C"{
 #endif // __cplusplus
 
-extern char* ltoa( long value, char *string, int radix ) ;
-extern char* ultoa( unsigned long value, char *string, int radix ) ;
+extern char* itoa(int value, char *string, int radix);
+extern char* ltoa(long value, char *string, int radix);
+extern char* utoa(unsigned value, char *string, int radix);
+extern char* ultoa(unsigned long value, char *string, int radix);
 
 #ifdef __cplusplus
 } // extern "C"