Merge branch 'master' of https://github.com/mykeul/Arduino into mykeul-master

# Conflicts:
#	cores/esp8266/Print.cpp

Author: igrr

cores/esp8266/Print.cpp

@@ -105,15 +105,21 @@ size_t Print::print(long n, int base) {
     } else if(base == 10) {
         if(n < 0) {
             int t = print('-');
-            n = -n;
-            return printNumber(n, 10) + t;
+            return printNumber<unsigned long>(-n, 10) + t;
         }
-        return printNumber(n, 10);
+        return printNumber<unsigned long>(n, 10);
     } else {
-        return printNumber(n, base);
+        return printNumber<unsigned long>(n, base);
     }
 }
 
+size_t Print::print(uint64_t n, int base) {
+    if(base == 0)
+        return write(n);
+    else
+        return printNumber(n, base);
+}
+
 size_t Print::print(unsigned long n, int base) {
     if(base == 0)
         return write(n);
@@ -181,6 +187,12 @@ size_t Print::println(long num, int base) {
     return n;
 }
 
+size_t Print::println(uint64_t num, int base) {
+    size_t n = print(num, base);
+    n += println();
+    return n;
+}
+
 size_t Print::println(unsigned long num, int base) {
     size_t n = print(num, base);
     n += println();
@@ -201,9 +213,10 @@ size_t Print::println(const Printable& x) {
 
 // Private Methods /////////////////////////////////////////////////////////////
 
-size_t Print::printNumber(unsigned long n, uint8_t base) {
-    char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte.
-    char *str = &buf[sizeof(buf) - 1];
+template<typename UINT_T>
+size_t Print::printNumber(UINT_T n, uint8_t base) {
+    char buf[8 * sizeof(n) + 1]; // Assumes 8-bit chars plus zero byte.
+    char *str = buf + sizeof(buf) - 1;
 
     *str = '\0';
 
@@ -212,7 +225,7 @@ size_t Print::printNumber(unsigned long n, uint8_t base) {
         base = 10;
 
     do {
-        unsigned long m = n;
+        UINT_T m = n;
         n /= base;
         char c = m - base * n;
         *--str = c < 10 ? c + '0' : c + 'A' - 10;

cores/esp8266/Print.h

@@ -34,7 +34,8 @@
 class Print {
     private:
         int write_error;
-        size_t printNumber(unsigned long, uint8_t);
+        template<typename UINT_T>
+        size_t printNumber(UINT_T, uint8_t);
         size_t printFloat(double, uint8_t);
     protected:
         void setWriteError(int err = 1) {
@@ -72,6 +73,7 @@ class Print {
         size_t print(int, int = DEC);
         size_t print(unsigned int, int = DEC);
         size_t print(long, int = DEC);
+        size_t print(uint64_t, int = DEC);
         size_t print(unsigned long, int = DEC);
         size_t print(double, int = 2);
         size_t print(const Printable&);
@@ -84,6 +86,7 @@ class Print {
         size_t println(int, int = DEC);
         size_t println(unsigned int, int = DEC);
         size_t println(long, int = DEC);
+        size_t println(uint64_t, int = DEC);
         size_t println(unsigned long, int = DEC);
         size_t println(double, int = 2);
         size_t println(const Printable&);