feat: add print(float) to save space (vs double)

honnet · fpistm · fpistm · commit c6bc5b23761c · 2023-06-27T07:43:10.000+02:00
Signed-off-by: Cedric Honnet &lt;honnet@telecom-paristech.org&gt;
Co-Authored-By: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
@@ -129,6 +129,11 @@ size_t Print::print(unsigned long long n, int base)
   }
 }
 
+size_t Print::print(float n, int digits)
+{
+  return printFloat(n, digits);
+}
+
 size_t Print::print(double n, int digits)
 {
   return printFloat(n, digits);
@@ -221,6 +226,13 @@ size_t Print::println(unsigned long long num, int base)
   return n;
 }
 
+size_t Print::println(float num, int digits)
+{
+  size_t n = print(num, digits);
+  n += println();
+  return n;
+}
+
 size_t Print::println(double num, int digits)
 {
   size_t n = print(num, digits);
@@ -406,7 +418,8 @@ size_t Print::printULLNumber(unsigned long long n64, uint8_t base)
   return bytes;
 }
 
-size_t Print::printFloat(double number, uint8_t digits)
+template <class T>
+size_t Print::printFloat(T number, uint8_t digits)
 {
   size_t n = 0;
 
@@ -430,7 +443,7 @@ size_t Print::printFloat(double number, uint8_t digits)
   }
 
   // Round correctly so that print(1.999, 2) prints as "2.00"
-  double rounding = 0.5;
+  T rounding = 0.5;
   for (uint8_t i = 0; i < digits; ++i) {
     rounding /= 10.0;
   }
@@ -439,7 +452,7 @@ size_t Print::printFloat(double number, uint8_t digits)
 
   // Extract the integer part of the number and print it
   unsigned long int_part = (unsigned long)number;
-  double remainder = number - (double)int_part;
+  T remainder = number - (T)int_part;
   n += print(int_part);
 
   // Print the decimal point, but only if there are digits beyond
diff --git a/cores/arduino/Print.h b/cores/arduino/Print.h
@@ -36,7 +36,8 @@ class Print {
     int write_error;
     size_t printNumber(unsigned long, uint8_t);
     size_t printULLNumber(unsigned long long, uint8_t);
-    size_t printFloat(double, uint8_t);
+    template <class T>
+    size_t printFloat(T, uint8_t);
   protected:
     void setWriteError(int err = 1)
     {
@@ -86,6 +87,7 @@ class Print {
     size_t print(unsigned long, int = DEC);
     size_t print(long long, int = DEC);
     size_t print(unsigned long long, int = DEC);
+    size_t print(float, int = 2);
     size_t print(double, int = 2);
     size_t print(const Printable &);
 
@@ -100,6 +102,7 @@ class Print {
     size_t println(unsigned long, int = DEC);
     size_t println(long long, int = DEC);
     size_t println(unsigned long long, int = DEC);
+    size_t println(float, int = 2);
     size_t println(double, int = 2);
     size_t println(const Printable &);
     size_t println(void);

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,11 @@ size_t Print::print(unsigned long long n, int base)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
	`132`	`+size_t Print::print(float n, int digits)`
	`133`	`+{`
	`134`	`+ return printFloat(n, digits);`
	`135`	`+}`
	`136`	`+`
`132`	`137`	`size_t Print::print(double n, int digits)`
`133`	`138`	`{`
`134`	`139`	`return printFloat(n, digits);`
`@@ -221,6 +226,13 @@ size_t Print::println(unsigned long long num, int base)`
`221`	`226`	`return n;`
`222`	`227`	`}`
`223`	`228`
	`229`	`+size_t Print::println(float num, int digits)`
	`230`	`+{`
	`231`	`+ size_t n = print(num, digits);`
	`232`	`+ n += println();`
	`233`	`+ return n;`
	`234`	`+}`
	`235`	`+`
`224`	`236`	`size_t Print::println(double num, int digits)`
`225`	`237`	`{`
`226`	`238`	`size_t n = print(num, digits);`
`@@ -406,7 +418,8 @@ size_t Print::printULLNumber(unsigned long long n64, uint8_t base)`
`406`	`418`	`return bytes;`
`407`	`419`	`}`
`408`	`420`
`409`		`-size_t Print::printFloat(double number, uint8_t digits)`
	`421`	`+template <class T>`
	`422`	`+size_t Print::printFloat(T number, uint8_t digits)`
`410`	`423`	`{`
`411`	`424`	`size_t n = 0;`
`412`	`425`
`@@ -430,7 +443,7 @@ size_t Print::printFloat(double number, uint8_t digits)`
`430`	`443`	`}`
`431`	`444`
`432`	`445`	`// Round correctly so that print(1.999, 2) prints as "2.00"`
`433`		`- double rounding = 0.5;`
	`446`	`+ T rounding = 0.5;`
`434`	`447`	`for (uint8_t i = 0; i < digits; ++i) {`
`435`	`448`	`rounding /= 10.0;`
`436`	`449`	`}`
`@@ -439,7 +452,7 @@ size_t Print::printFloat(double number, uint8_t digits)`
`439`	`452`
`440`	`453`	`// Extract the integer part of the number and print it`
`441`	`454`	`unsigned long int_part = (unsigned long)number;`
`442`		`- double remainder = number - (double)int_part;`
	`455`	`+ T remainder = number - (T)int_part;`
`443`	`456`	`n += print(int_part);`
`444`	`457`
`445`	`458`	`// Print the decimal point, but only if there are digits beyond`