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

This commit is contained in:
Federico Fissore 2013-06-28 15:36:50 +02:00
commit 737ab5164d
2 changed files with 4 additions and 4 deletions

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

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