mirror of https://github.com/noisymime/Arduino.git
Merge remote-tracking branch 'arduino/ide-1.5.x' into dev-ide-1.5.x-discovery
This commit is contained in:
commit
94547ebd9e
|
@ -325,14 +325,14 @@ unsigned char String::concat(unsigned long num)
|
||||||
unsigned char String::concat(float num)
|
unsigned char String::concat(float num)
|
||||||
{
|
{
|
||||||
char buf[20];
|
char buf[20];
|
||||||
char* string = dtostrf(num, 8, 2, buf);
|
char* string = dtostrf(num, 4, 2, buf);
|
||||||
return concat(string, strlen(string));
|
return concat(string, strlen(string));
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned char String::concat(double num)
|
unsigned char String::concat(double num)
|
||||||
{
|
{
|
||||||
char buf[20];
|
char buf[20];
|
||||||
char* string = dtostrf(num, 8, 2, buf);
|
char* string = dtostrf(num, 4, 2, buf);
|
||||||
return concat(string, strlen(string));
|
return concat(string, strlen(string));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -325,14 +325,14 @@ unsigned char String::concat(unsigned long num)
|
||||||
unsigned char String::concat(float num)
|
unsigned char String::concat(float num)
|
||||||
{
|
{
|
||||||
char buf[20];
|
char buf[20];
|
||||||
char* string = dtostrf(num, 8, 2, buf);
|
char* string = dtostrf(num, 4, 2, buf);
|
||||||
return concat(string, strlen(string));
|
return concat(string, strlen(string));
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned char String::concat(double num)
|
unsigned char String::concat(double num)
|
||||||
{
|
{
|
||||||
char buf[20];
|
char buf[20];
|
||||||
char* string = dtostrf(num, 8, 2, buf);
|
char* string = dtostrf(num, 4, 2, buf);
|
||||||
return concat(string, strlen(string));
|
return concat(string, strlen(string));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -326,14 +326,14 @@ unsigned char String::concat(unsigned long num)
|
||||||
unsigned char String::concat(float num)
|
unsigned char String::concat(float num)
|
||||||
{
|
{
|
||||||
char buf[20];
|
char buf[20];
|
||||||
char* string = dtostrf(num, 8, 2, buf);
|
char* string = dtostrf(num, 4, 2, buf);
|
||||||
return concat(string, strlen(string));
|
return concat(string, strlen(string));
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned char String::concat(double num)
|
unsigned char String::concat(double num)
|
||||||
{
|
{
|
||||||
char buf[20];
|
char buf[20];
|
||||||
char* string = dtostrf(num, 8, 2, buf);
|
char* string = dtostrf(num, 4, 2, buf);
|
||||||
return concat(string, strlen(string));
|
return concat(string, strlen(string));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue