Merge branch 'master' into stk500-jtagice3

facchinm · web-flow · commit c98c3de5fc15 · 2017-02-08T12:56:49.000+01:00
diff --git a/hardware/arduino/avr/cores/arduino/IPAddress.cpp b/hardware/arduino/avr/cores/arduino/IPAddress.cpp
@@ -45,8 +45,6 @@ IPAddress::IPAddress(const uint8_t *address)
 
 bool IPAddress::fromString(const char *address)
 {
-    // TODO: add support for "a", "a.b", "a.b.c" formats
-
     uint16_t acc = 0; // Accumulator
     uint8_t dots = 0;
 
diff --git a/hardware/arduino/avr/cores/arduino/Print.cpp b/hardware/arduino/avr/cores/arduino/Print.cpp
@@ -250,7 +250,7 @@ size_t Print::printFloat(double number, uint8_t digits)
 
   // Print the decimal point, but only if there are digits beyond
   if (digits > 0) {
-    n += print("."); 
+    n += print('.'); 
   }
 
   // Extract digits from the remainder one at a time

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ IPAddress::IPAddress(const uint8_t *address)`
`45`	`45`
`46`	`46`	`bool IPAddress::fromString(const char *address)`
`47`	`47`	`{`
`48`		`- // TODO: add support for "a", "a.b", "a.b.c" formats`
`49`		`-`
`50`	`48`	`uint16_t acc = 0; // Accumulator`
`51`	`49`	`uint8_t dots = 0;`
`52`	`50`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ size_t Print::printFloat(double number, uint8_t digits)`
`250`	`250`
`251`	`251`	`// Print the decimal point, but only if there are digits beyond`
`252`	`252`	`if (digits > 0) {`
`253`		`- n += print(".");`
	`253`	`+ n += print('.');`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`// Extract digits from the remainder one at a time`