Added optional support for printing floating point numbers using the Print class with values greater/less than +/-4,294,967,295. It now supports +/-18,446,744,073,709,551,615.

mattairtech · mattairtech · commit 060bcc5f4725 · 2018-06-26T06:33:02.000Z
diff --git a/config.h b/config.h
@@ -81,6 +81,13 @@
    * milliseconds). This saves about 64 bytes.
    */
   #define NO_DELAY_HIGH_WORD
+
+  /* Define LONG_LONG_PRINT_FLOAT to enable the use of Unsigned Long Long variables for printing
+   * the integer part of single or double floating point numbers using the Print class. This allows
+   * printing integers up to +/-18,446,744,073,709,551,615, rather than the default +/-4,294,967,295.
+   * This cost a little code space.
+   */
+  //#define LONG_LONG_PRINT_FLOAT
 #endif
 
 #endif // _CONFIG_H_
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
@@ -20,9 +20,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <limits.h>
 #include "Arduino.h"
 
 #include "Print.h"
+#include "../../config.h"
 
 // Public Methods //////////////////////////////////////////////////////////////
 
@@ -295,8 +297,13 @@ size_t Print::printFloat(double number, uint8_t digits)
   if (isnan(number)) return print("nan");
   if (isinf(number)) return print("inf");
 
+#if defined(LONG_LONG_PRINT_FLOAT)
+  if (number > (double)ULONG_LONG_MAX) return print ("ovf");
+  if (number < -(double)ULONG_LONG_MAX) return print ("ovf");
+#else
   if (number > 4294967040.0) return print ("ovf");  // constant determined empirically
   if (number <-4294967040.0) return print ("ovf");  // constant determined empirically
+#endif
 
   // Handle negative numbers
   if (number < 0.0)
@@ -313,7 +320,11 @@ size_t Print::printFloat(double number, uint8_t digits)
   number += rounding;
 
   // Extract the integer part of the number and print it
+#if defined(LONG_LONG_PRINT_FLOAT)
+  unsigned long long int_part = (unsigned long long)number;
+#else
   unsigned long int_part = (unsigned long)number;
+#endif
   double remainder = number - (double)int_part;
   n += print(int_part);
 
@@ -342,8 +353,13 @@ size_t Print::printFloat(float number, uint8_t digits)
   if (isnan(number)) return print("nan");
   if (isinf(number)) return print("inf");
 
+#if defined(LONG_LONG_PRINT_FLOAT)
+  if (number > (float)ULONG_LONG_MAX) return print ("ovf");
+  if (number < -(float)ULONG_LONG_MAX) return print ("ovf");
+#else
   if (number > 4294967040.0) return print ("ovf");  // constant determined empirically
   if (number <-4294967040.0) return print ("ovf");  // constant determined empirically
+#endif
 
   // Handle negative numbers
   if (number < 0.0)
@@ -360,7 +376,11 @@ size_t Print::printFloat(float number, uint8_t digits)
   number += rounding;
 
   // Extract the integer part of the number and print it
+#if defined(LONG_LONG_PRINT_FLOAT)
+  unsigned long long int_part = (unsigned long long)number;
+#else
   unsigned long int_part = (unsigned long)number;
+#endif
   float remainder = number - (float)int_part;
   n += print(int_part);
 
