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

Federico Fissore · Federico Fissore · commit 94547ebd9e64 · 2013-06-28T15:36:50.000+02:00
diff --git a/hardware/arduino/avr/cores/arduino/WString.cpp b/hardware/arduino/avr/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, 2, buf);
+	char* string = dtostrf(num, 4, 2, buf);
 	return concat(string, strlen(string));
 }
 
 unsigned char String::concat(double num)
 {
 	char buf[20];
-	char* string = dtostrf(num, 8, 2, buf);
+	char* string = dtostrf(num, 4, 2, buf);
 	return concat(string, strlen(string));
 }
 
diff --git a/hardware/arduino/avr/cores/robot/WString.cpp b/hardware/arduino/avr/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, 2, buf);
+	char* string = dtostrf(num, 4, 2, buf);
 	return concat(string, strlen(string));
 }
 
 unsigned char String::concat(double num)
 {
 	char buf[20];
-	char* string = dtostrf(num, 8, 2, buf);
+	char* string = dtostrf(num, 4, 2, buf);
 	return concat(string, strlen(string));
 }
 
diff --git a/hardware/arduino/sam/cores/arduino/WString.cpp b/hardware/arduino/sam/cores/arduino/WString.cpp
@@ -326,14 +326,14 @@ unsigned char String::concat(unsigned long num)
 unsigned char String::concat(float num)
 {
 	char buf[20];
-	char* string = dtostrf(num, 8, 2, buf);
+	char* string = dtostrf(num, 4, 2, buf);
 	return concat(string, strlen(string));
 }
 
 unsigned char String::concat(double num)
 {
 	char buf[20];
-	char* string = dtostrf(num, 8, 2, buf);
+	char* string = dtostrf(num, 4, 2, buf);
 	return concat(string, strlen(string));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -325,14 +325,14 @@ unsigned char String::concat(unsigned long num)`
`325`	`325`	`unsigned char String::concat(float num)`
`326`	`326`	`{`
`327`	`327`	`char buf[20];`
`328`		`- char* string = dtostrf(num, 8, 2, buf);`
	`328`	`+ char* string = dtostrf(num, 4, 2, buf);`
`329`	`329`	`return concat(string, strlen(string));`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`unsigned char String::concat(double num)`
`333`	`333`	`{`
`334`	`334`	`char buf[20];`
`335`		`- char* string = dtostrf(num, 8, 2, buf);`
	`335`	`+ char* string = dtostrf(num, 4, 2, buf);`
`336`	`336`	`return concat(string, strlen(string));`
`337`	`337`	`}`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -326,14 +326,14 @@ unsigned char String::concat(unsigned long num)`
`326`	`326`	`unsigned char String::concat(float num)`
`327`	`327`	`{`
`328`	`328`	`char buf[20];`
`329`		`- char* string = dtostrf(num, 8, 2, buf);`
	`329`	`+ char* string = dtostrf(num, 4, 2, buf);`
`330`	`330`	`return concat(string, strlen(string));`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`unsigned char String::concat(double num)`
`334`	`334`	`{`
`335`	`335`	`char buf[20];`
`336`		`- char* string = dtostrf(num, 8, 2, buf);`
	`336`	`+ char* string = dtostrf(num, 4, 2, buf);`
`337`	`337`	`return concat(string, strlen(string));`
`338`	`338`	`}`
`339`	`339`