|
|
|
@ -57,14 +57,14 @@ void safe_delay(millis_t ms) {
|
|
|
|
#define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
|
|
|
|
#define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
|
|
|
|
|
|
|
|
|
|
|
|
// Convert unsigned int to string with 12 format
|
|
|
|
// Convert unsigned int to string with 12 format
|
|
|
|
char* itostr2(const uint8_t& xx) {
|
|
|
|
char* itostr2(const uint8_t &xx) {
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return &conv[5];
|
|
|
|
return &conv[5];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert signed int to rj string with 123 or -12 format
|
|
|
|
// Convert signed int to rj string with 123 or -12 format
|
|
|
|
char* itostr3(const int& x) {
|
|
|
|
char* itostr3(const int &x) {
|
|
|
|
int xx = x;
|
|
|
|
int xx = x;
|
|
|
|
conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
|
|
|
|
conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
|
|
|
|
conv[5] = RJDIGIT(xx, 10);
|
|
|
|
conv[5] = RJDIGIT(xx, 10);
|
|
|
|
@ -73,7 +73,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert unsigned int to lj string with 123 format
|
|
|
|
// Convert unsigned int to lj string with 123 format
|
|
|
|
char* itostr3left(const int& xx) {
|
|
|
|
char* itostr3left(const int &xx) {
|
|
|
|
char *str = &conv[6];
|
|
|
|
char *str = &conv[6];
|
|
|
|
*str = DIGIMOD(xx, 1);
|
|
|
|
*str = DIGIMOD(xx, 1);
|
|
|
|
if (xx >= 10) {
|
|
|
|
if (xx >= 10) {
|
|
|
|
@ -85,7 +85,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert signed int to rj string with 1234, _123, -123, _-12, or __-1 format
|
|
|
|
// Convert signed int to rj string with 1234, _123, -123, _-12, or __-1 format
|
|
|
|
char *itostr4sign(const int& x) {
|
|
|
|
char *itostr4sign(const int &x) {
|
|
|
|
const bool neg = x < 0;
|
|
|
|
const bool neg = x < 0;
|
|
|
|
const int xx = neg ? -x : x;
|
|
|
|
const int xx = neg ? -x : x;
|
|
|
|
if (x >= 1000) {
|
|
|
|
if (x >= 1000) {
|
|
|
|
@ -116,7 +116,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert unsigned float to string with 1.23 format
|
|
|
|
// Convert unsigned float to string with 1.23 format
|
|
|
|
char* ftostr12ns(const float& x) {
|
|
|
|
char* ftostr12ns(const float &x) {
|
|
|
|
const long xx = (x < 0 ? -x : x) * 100;
|
|
|
|
const long xx = (x < 0 ? -x : x) * 100;
|
|
|
|
conv[3] = DIGIMOD(xx, 100);
|
|
|
|
conv[3] = DIGIMOD(xx, 100);
|
|
|
|
conv[4] = '.';
|
|
|
|
conv[4] = '.';
|
|
|
|
@ -126,7 +126,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert signed float to fixed-length string with 023.45 / -23.45 format
|
|
|
|
// Convert signed float to fixed-length string with 023.45 / -23.45 format
|
|
|
|
char *ftostr32(const float& x) {
|
|
|
|
char *ftostr32(const float &x) {
|
|
|
|
long xx = x * 100;
|
|
|
|
long xx = x * 100;
|
|
|
|
conv[1] = MINUSOR(xx, DIGIMOD(xx, 10000));
|
|
|
|
conv[1] = MINUSOR(xx, DIGIMOD(xx, 10000));
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
@ -140,7 +140,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
#if ENABLED(LCD_DECIMAL_SMALL_XY)
|
|
|
|
#if ENABLED(LCD_DECIMAL_SMALL_XY)
|
|
|
|
|
|
|
|
|
|
|
|
// Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
|
|
|
|
// Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
|
|
|
|
char *ftostr4sign(const float& fx) {
|
|
|
|
char *ftostr4sign(const float &fx) {
|
|
|
|
const int x = fx * 10;
|
|
|
|
const int x = fx * 10;
|
|
|
|
if (!WITHIN(x, -99, 999)) return itostr4sign((int)fx);
|
|
|
|
if (!WITHIN(x, -99, 999)) return itostr4sign((int)fx);
|
|
|
|
const bool neg = x < 0;
|
|
|
|
const bool neg = x < 0;
|
|
|
|
@ -155,7 +155,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
#endif // LCD_DECIMAL_SMALL_XY
|
|
|
|
#endif // LCD_DECIMAL_SMALL_XY
|
|
|
|
|
|
|
|
|
|
|
|
// Convert float to fixed-length string with +123.4 / -123.4 format
|
|
|
|
// Convert float to fixed-length string with +123.4 / -123.4 format
|
|
|
|
char* ftostr41sign(const float& x) {
|
|
|
|
char* ftostr41sign(const float &x) {
|
|
|
|
int xx = x * 10;
|
|
|
|
int xx = x * 10;
|
|
|
|
conv[1] = MINUSOR(xx, '+');
|
|
|
|
conv[1] = MINUSOR(xx, '+');
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
@ -167,7 +167,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
|
|
|
|
// Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
|
|
|
|
char* ftostr43sign(const float& x, char plus/*=' '*/) {
|
|
|
|
char* ftostr43sign(const float &x, char plus/*=' '*/) {
|
|
|
|
long xx = x * 1000;
|
|
|
|
long xx = x * 1000;
|
|
|
|
conv[1] = xx ? MINUSOR(xx, plus) : ' ';
|
|
|
|
conv[1] = xx ? MINUSOR(xx, plus) : ' ';
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
@ -179,7 +179,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert unsigned float to rj string with 12345 format
|
|
|
|
// Convert unsigned float to rj string with 12345 format
|
|
|
|
char* ftostr5rj(const float& x) {
|
|
|
|
char* ftostr5rj(const float &x) {
|
|
|
|
const long xx = x < 0 ? -x : x;
|
|
|
|
const long xx = x < 0 ? -x : x;
|
|
|
|
conv[2] = RJDIGIT(xx, 10000);
|
|
|
|
conv[2] = RJDIGIT(xx, 10000);
|
|
|
|
conv[3] = RJDIGIT(xx, 1000);
|
|
|
|
conv[3] = RJDIGIT(xx, 1000);
|
|
|
|
@ -190,7 +190,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert signed float to string with +1234.5 format
|
|
|
|
// Convert signed float to string with +1234.5 format
|
|
|
|
char* ftostr51sign(const float& x) {
|
|
|
|
char* ftostr51sign(const float &x) {
|
|
|
|
long xx = x * 10;
|
|
|
|
long xx = x * 10;
|
|
|
|
conv[0] = MINUSOR(xx, '+');
|
|
|
|
conv[0] = MINUSOR(xx, '+');
|
|
|
|
conv[1] = DIGIMOD(xx, 10000);
|
|
|
|
conv[1] = DIGIMOD(xx, 10000);
|
|
|
|
@ -203,7 +203,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert signed float to string with +123.45 format
|
|
|
|
// Convert signed float to string with +123.45 format
|
|
|
|
char* ftostr52sign(const float& x) {
|
|
|
|
char* ftostr52sign(const float &x) {
|
|
|
|
long xx = x * 100;
|
|
|
|
long xx = x * 100;
|
|
|
|
conv[0] = MINUSOR(xx, '+');
|
|
|
|
conv[0] = MINUSOR(xx, '+');
|
|
|
|
conv[1] = DIGIMOD(xx, 10000);
|
|
|
|
conv[1] = DIGIMOD(xx, 10000);
|
|
|
|
@ -216,7 +216,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert unsigned float to string with 1234.56 format omitting trailing zeros
|
|
|
|
// Convert unsigned float to string with 1234.56 format omitting trailing zeros
|
|
|
|
char* ftostr62rj(const float& x) {
|
|
|
|
char* ftostr62rj(const float &x) {
|
|
|
|
const long xx = (x < 0 ? -x : x) * 100;
|
|
|
|
const long xx = (x < 0 ? -x : x) * 100;
|
|
|
|
conv[0] = RJDIGIT(xx, 100000);
|
|
|
|
conv[0] = RJDIGIT(xx, 100000);
|
|
|
|
conv[1] = RJDIGIT(xx, 10000);
|
|
|
|
conv[1] = RJDIGIT(xx, 10000);
|
|
|
|
@ -229,7 +229,7 @@ void safe_delay(millis_t ms) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Convert signed float to space-padded string with -_23.4_ format
|
|
|
|
// Convert signed float to space-padded string with -_23.4_ format
|
|
|
|
char* ftostr52sp(const float& x) {
|
|
|
|
char* ftostr52sp(const float &x) {
|
|
|
|
long xx = x * 100;
|
|
|
|
long xx = x * 100;
|
|
|
|
uint8_t dig;
|
|
|
|
uint8_t dig;
|
|
|
|
conv[1] = MINUSOR(xx, RJDIGIT(xx, 10000));
|
|
|
|
conv[1] = MINUSOR(xx, RJDIGIT(xx, 10000));
|
|
|
|
|
Scott Lahteine
8 years ago
committed by