noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/ide-1.5.x' into ide-1.5.x-library-to-new-format

This commit is contained in:
Fede85 2013-06-28 15:10:09 +02:00
parent dc9c791070 8e20bc7b43
commit b6e4c59ab3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/arduino/avr/cores/arduino/WString.cpp
View File

@ -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));
}

4
hardware/arduino/avr/cores/robot/WString.cpp
View File

@ -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));
}

4
hardware/arduino/sam/cores/arduino/WString.cpp
View File

@ -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));
}