arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

Eliminate code duplication by template for printNumber(...)/printFloat(...).

Browse Source 
Move template defintion into cpp file - valid for private member function templates.
This commit is contained in:
Dirk O. Kaar 2020-04-18 10:07:08 +02:00
parent 0b502b3f7b
commit 6f57c222c1
2 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cores/esp8266/Print.cpp
View File

@ -178,7 +178,7 @@ size_t Print::print(unsigned long long n, int base) {
} }
size_t Print::print(double n, int digits) { size_t Print::print(double n, int digits) {
return printFloat(n, digits); return printNumber(n, digits);
} }
size_t Print::print(const Printable& x) { size_t Print::print(const Printable& x) {
@ -243,7 +243,14 @@ size_t Print::println(const Printable& x) {
// Private Methods ///////////////////////////////////////////////////////////// // Private Methods /////////////////////////////////////////////////////////////
size_t Print::printNumber(unsigned long n, uint8_t base) { template<typename T, typename... P> inline size_t Print::_println(T v, P... args)
{
size_t n = print(v, args...);
n += println();
return n;
};
template<typename T> size_t Print::printNumber(T n, uint8_t base) {
char buf[8 * sizeof(n) + 1]; // Assumes 8-bit chars plus zero byte. char buf[8 * sizeof(n) + 1]; // Assumes 8-bit chars plus zero byte.
char* str = &buf[sizeof(buf) - 1]; char* str = &buf[sizeof(buf) - 1];
@ -265,29 +272,7 @@ size_t Print::printNumber(unsigned long n, uint8_t base) {
return write(str); return write(str);
} }
size_t Print::printNumber(unsigned long long n, uint8_t base) { template<> size_t Print::printNumber(double number, uint8_t digits) {
char buf[8 * sizeof(n) + 1]; // Assumes 8-bit chars plus zero byte.
char* str = &buf[sizeof(buf) - 1];
*str = '\0';
// prevent crash if called with base == 1
if (base < 2) {
base = 10;
}
do {
auto m = n;
n /= base;
char c = m - base * n;
*--str = c < 10 ? c + '0' : c + 'A' - 10;
} while (n);
return write(str);
}
size_t Print::printFloat(double number, uint8_t digits) {
char buf[40]; char buf[40];
return write(dtostrf(number, 0, digits, buf)); return write(dtostrf(number, 0, digits, buf));
} }

15
cores/esp8266/Print.h
View File

@ -36,17 +36,8 @@
class Print { class Print {
private: private:
int write_error; int write_error;
size_t printNumber(unsigned long, uint8_t); template<typename T> size_t printNumber(T n, uint8_t base);
size_t printNumber(unsigned long long, uint8_t); template<typename T, typename... P> inline size_t _println(T v, P... args);
size_t printFloat(double, uint8_t);
template<typename T, typename... P> inline size_t _println(T v, P... args)
{
size_t n = print(v, args...);
n += println();
return n;
};
protected: protected:
void setWriteError(int err = 1) { void setWriteError(int err = 1) {
write_error = err; write_error = err;
@ -120,4 +111,6 @@ class Print {
virtual void flush() { /* Empty implementation for backward compatibility */ } virtual void flush() { /* Empty implementation for backward compatibility */ }
}; };
template<> size_t Print::printNumber(double number, uint8_t digits);
#endif #endif