aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino
diff options
context:
space:
mode:
authorMartino Facchin <m.facchin@arduino.cc>2017-02-08 12:56:49 +0100
committerGitHub <noreply@github.com>2017-02-08 12:56:49 +0100
commit045d83b2e59daf9421353a71cdb63803ec91a4b1 (patch)
treef6628d54ecad3e94278ec920d6251dfba3561e43 /cores/arduino
parent5bf5025dfe5003a67cf21da9f7f2dbfc9b99aaef (diff)
parent7ed370a671b9497f88781450c5d6dea9fa0a219a (diff)
Merge branch 'master' into stk500-jtagice3
Diffstat (limited to 'cores/arduino')
-rw-r--r--cores/arduino/IPAddress.cpp2
-rw-r--r--cores/arduino/Print.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/cores/arduino/IPAddress.cpp b/cores/arduino/IPAddress.cpp
index 76aefa8..d9fe5be 100644
--- a/cores/arduino/IPAddress.cpp
+++ b/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/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
index 652fed0..1e4c99a 100644
--- a/cores/arduino/Print.cpp
+++ b/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