Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery

cores/arduino/WString.cpp

@@ -325,14 +325,14 @@ unsigned char String::concat(unsigned long num)
 unsigned char String::concat(float num)
 {
 	char buf[20];
-	char* string = dtostrf(num, 8, 6, buf);
+	char* string = dtostrf(num, 8, 2, buf);
 	return concat(string, strlen(string));
 }
 
 unsigned char String::concat(double num)
 {
 	char buf[20];
-	char* string = dtostrf(num, 8, 6, buf);
+	char* string = dtostrf(num, 8, 2, buf);
 	return concat(string, strlen(string));
 }
 

cores/arduino/WString.h

@@ -69,8 +69,8 @@ public:
 	explicit String(unsigned int, unsigned char base=10);
 	explicit String(long, unsigned char base=10);
 	explicit String(unsigned long, unsigned char base=10);
-	explicit String(float, int decimalPlaces=6);
-	explicit String(double, int decimalPlaces=6);
+	explicit String(float, int decimalPlaces=2);
+	explicit String(double, int decimalPlaces=2);
 	~String(void);
 
 	// memory management

cores/robot/WString.cpp

@@ -325,14 +325,14 @@ unsigned char String::concat(unsigned long num)
 unsigned char String::concat(float num)
 {
 	char buf[20];
-	char* string = dtostrf(num, 8, 6, buf);
+	char* string = dtostrf(num, 8, 2, buf);
 	return concat(string, strlen(string));
 }
 
 unsigned char String::concat(double num)
 {
 	char buf[20];
-	char* string = dtostrf(num, 8, 6, buf);
+	char* string = dtostrf(num, 8, 2, buf);
 	return concat(string, strlen(string));
 }
 

cores/robot/WString.h

@@ -69,8 +69,8 @@ public:
 	explicit String(unsigned int, unsigned char base=10);
 	explicit String(long, unsigned char base=10);
 	explicit String(unsigned long, unsigned char base=10);
-	explicit String(float, int decimalPlaces=6);
-	explicit String(double, int decimalPlaces=6);
+	explicit String(float, int decimalPlaces=2);
+	explicit String(double, int decimalPlaces=2);
 	~String(void);
 
 	// memory management