mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-16 00:43:00 +03:00
Extend Print class for 64bit integers.
This commit is contained in:
@ -146,25 +146,35 @@ size_t Print::print(unsigned int n, int base) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
size_t Print::print(long n, int base) {
|
size_t Print::print(long n, int base) {
|
||||||
if(base == 0) {
|
int t = 0;
|
||||||
return write(n);
|
if (base == 10 && n < 0) {
|
||||||
} else if(base == 10) {
|
t = print('-');
|
||||||
if(n < 0) {
|
n = -n;
|
||||||
int t = print('-');
|
|
||||||
n = -n;
|
|
||||||
return printNumber(n, 10) + t;
|
|
||||||
}
|
|
||||||
return printNumber(n, 10);
|
|
||||||
} else {
|
|
||||||
return printNumber(n, base);
|
|
||||||
}
|
}
|
||||||
|
return printNumber(static_cast<unsigned long>(n), base) + t;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t Print::print(unsigned long n, int base) {
|
size_t Print::print(unsigned long n, int base) {
|
||||||
if(base == 0)
|
if (base == 0) {
|
||||||
return write(n);
|
return write(n);
|
||||||
else
|
}
|
||||||
return printNumber(n, base);
|
return printNumber(n, base);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t Print::print(long long n, int base) {
|
||||||
|
int t = 0;
|
||||||
|
if (base == 10 && n < 0) {
|
||||||
|
t = print('-');
|
||||||
|
n = -n;
|
||||||
|
}
|
||||||
|
return printNumber(static_cast<unsigned long long>(n), base) + t;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t Print::print(unsigned long long n, int base) {
|
||||||
|
if (base == 0) {
|
||||||
|
return write(n);
|
||||||
|
}
|
||||||
|
return printNumber(n, base);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t Print::print(double n, int digits) {
|
size_t Print::print(double n, int digits) {
|
||||||
@ -233,6 +243,18 @@ size_t Print::println(unsigned long num, int base) {
|
|||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_t Print::println(long long num, int base) {
|
||||||
|
size_t n = print(num, base);
|
||||||
|
n += println();
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t Print::println(unsigned long long num, int base) {
|
||||||
|
size_t n = print(num, base);
|
||||||
|
n += println();
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
size_t Print::println(double num, int digits) {
|
size_t Print::println(double num, int digits) {
|
||||||
size_t n = print(num, digits);
|
size_t n = print(num, digits);
|
||||||
n += println();
|
n += println();
|
||||||
@ -258,9 +280,29 @@ size_t Print::printNumber(unsigned long n, uint8_t base) {
|
|||||||
base = 10;
|
base = 10;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
unsigned long m = n;
|
char c = n % base;
|
||||||
n /= base;
|
n /= base;
|
||||||
char c = m - base * n;
|
|
||||||
|
*--str = c < 10 ? c + '0' : c + 'A' - 10;
|
||||||
|
} while(n);
|
||||||
|
|
||||||
|
return write(str);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t Print::printNumber(unsigned long long n, uint8_t base) {
|
||||||
|
char buf[8 * sizeof(long long) + 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 {
|
||||||
|
char c = n % base;
|
||||||
|
n /= base;
|
||||||
|
|
||||||
*--str = c < 10 ? c + '0' : c + 'A' - 10;
|
*--str = c < 10 ? c + '0' : c + 'A' - 10;
|
||||||
} while(n);
|
} while(n);
|
||||||
|
|
||||||
|
@ -37,6 +37,7 @@ class Print {
|
|||||||
private:
|
private:
|
||||||
int write_error;
|
int write_error;
|
||||||
size_t printNumber(unsigned long, uint8_t);
|
size_t printNumber(unsigned long, uint8_t);
|
||||||
|
size_t printNumber(unsigned long long, uint8_t);
|
||||||
size_t printFloat(double, uint8_t);
|
size_t printFloat(double, uint8_t);
|
||||||
protected:
|
protected:
|
||||||
void setWriteError(int err = 1) {
|
void setWriteError(int err = 1) {
|
||||||
@ -71,6 +72,8 @@ class Print {
|
|||||||
inline size_t write(unsigned int t) { return write((uint8_t)t); }
|
inline size_t write(unsigned int t) { return write((uint8_t)t); }
|
||||||
inline size_t write(long t) { return write((uint8_t)t); }
|
inline size_t write(long t) { return write((uint8_t)t); }
|
||||||
inline size_t write(unsigned long t) { return write((uint8_t)t); }
|
inline size_t write(unsigned long t) { return write((uint8_t)t); }
|
||||||
|
inline size_t write(long long t) { return write((uint8_t)t); }
|
||||||
|
inline size_t write(unsigned long long t) { return write((uint8_t)t); }
|
||||||
// Enable write(char) to fall through to write(uint8_t)
|
// Enable write(char) to fall through to write(uint8_t)
|
||||||
inline size_t write(char c) { return write((uint8_t) c); }
|
inline size_t write(char c) { return write((uint8_t) c); }
|
||||||
inline size_t write(int8_t c) { return write((uint8_t) c); }
|
inline size_t write(int8_t c) { return write((uint8_t) c); }
|
||||||
@ -86,6 +89,8 @@ class Print {
|
|||||||
size_t print(unsigned int, int = DEC);
|
size_t print(unsigned int, int = DEC);
|
||||||
size_t print(long, int = DEC);
|
size_t print(long, int = DEC);
|
||||||
size_t print(unsigned long, int = DEC);
|
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(double, int = 2);
|
size_t print(double, int = 2);
|
||||||
size_t print(const Printable&);
|
size_t print(const Printable&);
|
||||||
|
|
||||||
@ -98,6 +103,8 @@ class Print {
|
|||||||
size_t println(unsigned int, int = DEC);
|
size_t println(unsigned int, int = DEC);
|
||||||
size_t println(long, int = DEC);
|
size_t println(long, int = DEC);
|
||||||
size_t println(unsigned long, int = DEC);
|
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(double, int = 2);
|
size_t println(double, int = 2);
|
||||||
size_t println(const Printable&);
|
size_t println(const Printable&);
|
||||||
size_t println(void);
|
size_t println(void);
|
||||||
|
Reference in New Issue
Block a user