diff options
| author | Federico Fissore <f.fissore@arduino.cc> | 2013-06-28 15:36:50 +0200 |
|---|---|---|
| committer | Federico Fissore <f.fissore@arduino.cc> | 2013-06-28 15:36:50 +0200 |
| commit | 737ab5164de89fe00a2519b67a191bdf31ddc7d3 (patch) | |
| tree | 447941fd3b944aa06b81ef388f59994471230301 | |
| parent | 9bc2ad10cb38ca5c659abb41f03b169928c70792 (diff) | |
| parent | 620fe0a3ac6ed9ecd63a9e0cdd268b1d0b8e7236 (diff) | |
Merge remote-tracking branch 'arduino/ide-1.5.x' into dev-ide-1.5.x-discovery
| -rw-r--r-- | cores/arduino/WString.cpp | 4 | ||||
| -rw-r--r-- | cores/robot/WString.cpp | 4 |
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)); } |