aboutsummaryrefslogtreecommitdiff
path: root/cores
diff options
context:
space:
mode:
authorFede85 <f.vanzati@gmail.com>2013-06-28 15:10:09 +0200
committerFede85 <f.vanzati@gmail.com>2013-06-28 15:10:09 +0200
commit2764f7cf4f3211d3d7be37d4631e003147c4dcd8 (patch)
treec3fd0ed8b439592af978a1ad450b67df7b40a712 /cores
parente01b23840354acd6c260b1f552bf0c5f5d7cdede (diff)
parent620fe0a3ac6ed9ecd63a9e0cdd268b1d0b8e7236 (diff)
Merge remote-tracking branch 'upstream/ide-1.5.x' into ide-1.5.x-library-to-new-format
Diffstat (limited to 'cores')
-rw-r--r--cores/arduino/WString.cpp4
-rw-r--r--cores/robot/WString.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp
index 48c30df..db79da4 100644
--- a/cores/arduino/WString.cpp
+++ b/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/cores/robot/WString.cpp b/cores/robot/WString.cpp
index 48c30df..db79da4 100644
--- a/cores/robot/WString.cpp
+++ b/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));
}