Estimate Remaining Time (graphical display) (#15497)
This commit is contained in:
LinFor
Scott Lahteine
@ -33,7 +33,7 @@ char conv[8] = { 0 };
|
||||
#define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
|
||||
|
||||
// Convert a full-range unsigned 8bit int to a percentage
|
||||
char* ui8tostr4pct(const uint8_t i) {
|
||||
const char* ui8tostr4pct(const uint8_t i) {
|
||||
const uint8_t n = ui8_to_percent(i);
|
||||
conv[3] = RJDIGIT(n, 100);
|
||||
conv[4] = RJDIGIT(n, 10);
|
||||
@ -43,7 +43,7 @@ char* ui8tostr4pct(const uint8_t i) {
|
||||
}
|
||||
|
||||
// Convert unsigned 8bit int to string 123 format
|
||||
char* ui8tostr3(const uint8_t i) {
|
||||
const char* ui8tostr3(const uint8_t i) {
|
||||
conv[4] = RJDIGIT(i, 100);
|
||||
conv[5] = RJDIGIT(i, 10);
|
||||
conv[6] = DIGIMOD(i, 1);
|
||||
@ -51,7 +51,7 @@ char* ui8tostr3(const uint8_t i) {
|
||||
}
|
||||
|
||||
// Convert signed 8bit int to rj string with 123 or -12 format
|
||||
char* i8tostr3(const int8_t x) {
|
||||
const char* i8tostr3(const int8_t x) {
|
||||
int xx = x;
|
||||
conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
|
||||
conv[5] = RJDIGIT(xx, 10);
|
||||
@ -59,8 +59,36 @@ char* i8tostr3(const int8_t x) {
|
||||
return &conv[4];
|
||||
}
|
||||
|
||||
#if HAS_PRINT_PROGRESS_PERMYRIAD
|
||||
// Convert unsigned 16-bit permyriad to percent with 100 / 23 / 23.4 / 3.45 format
|
||||
const char* permyriadtostr4(const uint16_t xx) {
|
||||
if (xx >= 10000)
|
||||
return "100";
|
||||
else if (xx >= 1000) {
|
||||
conv[3] = DIGIMOD(xx, 1000);
|
||||
conv[4] = DIGIMOD(xx, 100);
|
||||
conv[5] = '.';
|
||||
conv[6] = DIGIMOD(xx, 10);
|
||||
return &conv[3];
|
||||
}
|
||||
else if (xx % 100 == 0) {
|
||||
conv[4] = ' ';
|
||||
conv[5] = RJDIGIT(xx, 1000);
|
||||
conv[6] = DIGIMOD(xx, 100);
|
||||
return &conv[4];
|
||||
}
|
||||
else {
|
||||
conv[3] = DIGIMOD(xx, 100);
|
||||
conv[4] = '.';
|
||||
conv[5] = DIGIMOD(xx, 10);
|
||||
conv[6] = RJDIGIT(xx, 1);
|
||||
return &conv[3];
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Convert unsigned 16bit int to string 12345 format
|
||||
char* ui16tostr5(const uint16_t xx) {
|
||||
const char* ui16tostr5(const uint16_t xx) {
|
||||
conv[2] = RJDIGIT(xx, 10000);
|
||||
conv[3] = RJDIGIT(xx, 1000);
|
||||
conv[4] = RJDIGIT(xx, 100);
|
||||
@ -70,7 +98,7 @@ char* ui16tostr5(const uint16_t xx) {
|
||||
}
|
||||
|
||||
// Convert unsigned 16bit int to string 1234 format
|
||||
char* ui16tostr4(const uint16_t xx) {
|
||||
const char* ui16tostr4(const uint16_t xx) {
|
||||
conv[3] = RJDIGIT(xx, 1000);
|
||||
conv[4] = RJDIGIT(xx, 100);
|
||||
conv[5] = RJDIGIT(xx, 10);
|
||||
@ -79,7 +107,7 @@ char* ui16tostr4(const uint16_t xx) {
|
||||
}
|
||||
|
||||
// Convert unsigned 16bit int to string 123 format
|
||||
char* ui16tostr3(const uint16_t xx) {
|
||||
const char* ui16tostr3(const uint16_t xx) {
|
||||
conv[4] = RJDIGIT(xx, 100);
|
||||
conv[5] = RJDIGIT(xx, 10);
|
||||
conv[6] = DIGIMOD(xx, 1);
|
||||
@ -87,7 +115,7 @@ char* ui16tostr3(const uint16_t xx) {
|
||||
}
|
||||
|
||||
// Convert signed 16bit int to rj string with 123 or -12 format
|
||||
char* i16tostr3(const int16_t x) {
|
||||
const char* i16tostr3(const int16_t x) {
|
||||
int xx = x;
|
||||
conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
|
||||
conv[5] = RJDIGIT(xx, 10);
|
||||
@ -96,7 +124,7 @@ char* i16tostr3(const int16_t x) {
|
||||
}
|
||||
|
||||
// Convert unsigned 16bit int to lj string with 123 format
|
||||
char* i16tostr3left(const int16_t i) {
|
||||
const char* i16tostr3left(const int16_t i) {
|
||||
char *str = &conv[6];
|
||||
*str = DIGIMOD(i, 1);
|
||||
if (i >= 10) {
|
||||
@ -108,7 +136,7 @@ char* i16tostr3left(const int16_t i) {
|
||||
}
|
||||
|
||||
// Convert signed 16bit int to rj string with 1234, _123, -123, _-12, or __-1 format
|
||||
char* i16tostr4sign(const int16_t i) {
|
||||
const char* i16tostr4sign(const int16_t i) {
|
||||
const bool neg = i < 0;
|
||||
const int ii = neg ? -i : i;
|
||||
if (i >= 1000) {
|
||||
@ -137,7 +165,7 @@ char* i16tostr4sign(const int16_t i) {
|
||||
}
|
||||
|
||||
// Convert unsigned float to string with 1.23 format
|
||||
char* ftostr12ns(const float &f) {
|
||||
const char* ftostr12ns(const float &f) {
|
||||
const long i = ((f < 0 ? -f : f) * 1000 + 5) / 10;
|
||||
conv[3] = DIGIMOD(i, 100);
|
||||
conv[4] = '.';
|
||||
@ -147,7 +175,7 @@ char* ftostr12ns(const float &f) {
|
||||
}
|
||||
|
||||
// Convert signed float to fixed-length string with 12.34 / -2.34 format or 123.45 / -23.45 format
|
||||
char* ftostr42_52(const float &f) {
|
||||
const char* ftostr42_52(const float &f) {
|
||||
if (f <= -10 || f >= 100) return ftostr52(f); // need more digits
|
||||
long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
|
||||
conv[2] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 1000));
|
||||
@ -159,7 +187,7 @@ char* ftostr42_52(const float &f) {
|
||||
}
|
||||
|
||||
// Convert signed float to fixed-length string with 023.45 / -23.45 format
|
||||
char* ftostr52(const float &f) {
|
||||
const char* ftostr52(const float &f) {
|
||||
long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
|
||||
conv[1] = MINUSOR(i, DIGIMOD(i, 10000));
|
||||
conv[2] = DIGIMOD(i, 1000);
|
||||
@ -188,7 +216,7 @@ char* ftostr52(const float &f) {
|
||||
#endif
|
||||
|
||||
// Convert float to fixed-length string with +123.4 / -123.4 format
|
||||
char* ftostr41sign(const float &f) {
|
||||
const char* ftostr41sign(const float &f) {
|
||||
int i = (f * 100 + (f < 0 ? -5: 5)) / 10;
|
||||
conv[1] = MINUSOR(i, '+');
|
||||
conv[2] = DIGIMOD(i, 1000);
|
||||
@ -200,7 +228,7 @@ char* ftostr41sign(const float &f) {
|
||||
}
|
||||
|
||||
// Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
|
||||
char* ftostr43sign(const float &f, char plus/*=' '*/) {
|
||||
const char* ftostr43sign(const float &f, char plus/*=' '*/) {
|
||||
long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
|
||||
conv[1] = i ? MINUSOR(i, plus) : ' ';
|
||||
conv[2] = DIGIMOD(i, 1000);
|
||||
@ -212,7 +240,7 @@ char* ftostr43sign(const float &f, char plus/*=' '*/) {
|
||||
}
|
||||
|
||||
// Convert signed float to string (5 digit) with -1.2345 / _0.0000 / +1.2345 format
|
||||
char* ftostr54sign(const float &f, char plus/*=' '*/) {
|
||||
const char* ftostr54sign(const float &f, char plus/*=' '*/) {
|
||||
long i = (f * 100000 + (f < 0 ? -5: 5)) / 10;
|
||||
conv[0] = i ? MINUSOR(i, plus) : ' ';
|
||||
conv[1] = DIGIMOD(i, 10000);
|
||||
@ -225,13 +253,13 @@ char* ftostr54sign(const float &f, char plus/*=' '*/) {
|
||||
}
|
||||
|
||||
// Convert unsigned float to rj string with 12345 format
|
||||
char* ftostr5rj(const float &f) {
|
||||
const char* ftostr5rj(const float &f) {
|
||||
const long i = ((f < 0 ? -f : f) * 10 + 5) / 10;
|
||||
return ui16tostr5(i);
|
||||
}
|
||||
|
||||
// Convert signed float to string with +1234.5 format
|
||||
char* ftostr51sign(const float &f) {
|
||||
const char* ftostr51sign(const float &f) {
|
||||
long i = (f * 100 + (f < 0 ? -5: 5)) / 10;
|
||||
conv[0] = MINUSOR(i, '+');
|
||||
conv[1] = DIGIMOD(i, 10000);
|
||||
@ -244,7 +272,7 @@ char* ftostr51sign(const float &f) {
|
||||
}
|
||||
|
||||
// Convert signed float to string with +123.45 format
|
||||
char* ftostr52sign(const float &f) {
|
||||
const char* ftostr52sign(const float &f) {
|
||||
long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
|
||||
conv[0] = MINUSOR(i, '+');
|
||||
conv[1] = DIGIMOD(i, 10000);
|
||||
@ -257,7 +285,7 @@ char* ftostr52sign(const float &f) {
|
||||
}
|
||||
|
||||
// Convert unsigned float to string with 1234.5 format omitting trailing zeros
|
||||
char* ftostr51rj(const float &f) {
|
||||
const char* ftostr51rj(const float &f) {
|
||||
const long i = ((f < 0 ? -f : f) * 100 + 5) / 10;
|
||||
conv[0] = ' ';
|
||||
conv[1] = RJDIGIT(i, 10000);
|
||||
@ -270,7 +298,7 @@ char* ftostr51rj(const float &f) {
|
||||
}
|
||||
|
||||
// Convert signed float to space-padded string with -_23.4_ format
|
||||
char* ftostr52sp(const float &f) {
|
||||
const char* ftostr52sp(const float &f) {
|
||||
long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
|
||||
uint8_t dig;
|
||||
conv[0] = MINUSOR(i, ' ');
|
||||
|
||||
@ -24,69 +24,74 @@
|
||||
#include <stdint.h>
|
||||
|
||||
// Convert a full-range unsigned 8bit int to a percentage
|
||||
char* ui8tostr4pct(const uint8_t i);
|
||||
const char* ui8tostr4pct(const uint8_t i);
|
||||
|
||||
// Convert uint8_t to string with 123 format
|
||||
char* ui8tostr3(const uint8_t i);
|
||||
const char* ui8tostr3(const uint8_t i);
|
||||
|
||||
// Convert int8_t to string with 123 format
|
||||
char* i8tostr3(const int8_t x);
|
||||
const char* i8tostr3(const int8_t x);
|
||||
|
||||
#if HAS_PRINT_PROGRESS_PERMYRIAD
|
||||
// Convert 16-bit unsigned permyriad value to percent: 100 / 23 / 23.4 / 3.45
|
||||
const char* permyriadtostr4(const uint16_t xx);
|
||||
#endif
|
||||
|
||||
// Convert uint16_t to string with 12345 format
|
||||
char* ui16tostr5(const uint16_t x);
|
||||
const char* ui16tostr5(const uint16_t x);
|
||||
|
||||
// Convert uint16_t to string with 1234 format
|
||||
char* ui16tostr4(const uint16_t x);
|
||||
const char* ui16tostr4(const uint16_t x);
|
||||
|
||||
// Convert uint16_t to string with 123 format
|
||||
char* ui16tostr3(const uint16_t x);
|
||||
const char* ui16tostr3(const uint16_t x);
|
||||
|
||||
// Convert int16_t to string with 123 format
|
||||
char* i16tostr3(const int16_t x);
|
||||
const char* i16tostr3(const int16_t x);
|
||||
|
||||
// Convert unsigned int to lj string with 123 format
|
||||
char* i16tostr3left(const int16_t xx);
|
||||
const char* i16tostr3left(const int16_t xx);
|
||||
|
||||
// Convert signed int to rj string with _123, -123, _-12, or __-1 format
|
||||
char* i16tostr4sign(const int16_t x);
|
||||
const char* i16tostr4sign(const int16_t x);
|
||||
|
||||
// Convert unsigned float to string with 1.23 format
|
||||
char* ftostr12ns(const float &x);
|
||||
const char* ftostr12ns(const float &x);
|
||||
|
||||
// Convert signed float to fixed-length string with 12.34 / -2.34 or 023.45 / -23.45 format
|
||||
char* ftostr42_52(const float &x);
|
||||
const char* ftostr42_52(const float &x);
|
||||
|
||||
// Convert signed float to fixed-length string with 023.45 / -23.45 format
|
||||
char* ftostr52(const float &x);
|
||||
const char* ftostr52(const float &x);
|
||||
|
||||
// Convert float to fixed-length string with +123.4 / -123.4 format
|
||||
char* ftostr41sign(const float &x);
|
||||
const char* ftostr41sign(const float &x);
|
||||
|
||||
// Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
|
||||
char* ftostr43sign(const float &x, char plus=' ');
|
||||
const char* ftostr43sign(const float &x, char plus=' ');
|
||||
|
||||
// Convert signed float to string (5 digit) with -1.2345 / _0.0000 / +1.2345 format
|
||||
char* ftostr54sign(const float &x, char plus=' ');
|
||||
const char* ftostr54sign(const float &x, char plus=' ');
|
||||
|
||||
// Convert unsigned float to rj string with 12345 format
|
||||
char* ftostr5rj(const float &x);
|
||||
const char* ftostr5rj(const float &x);
|
||||
|
||||
// Convert signed float to string with +1234.5 format
|
||||
char* ftostr51sign(const float &x);
|
||||
const char* ftostr51sign(const float &x);
|
||||
|
||||
// Convert signed float to space-padded string with -_23.4_ format
|
||||
char* ftostr52sp(const float &x);
|
||||
const char* ftostr52sp(const float &x);
|
||||
|
||||
// Convert signed float to string with +123.45 format
|
||||
char* ftostr52sign(const float &x);
|
||||
const char* ftostr52sign(const float &x);
|
||||
|
||||
// Convert unsigned float to string with 1234.5 format omitting trailing zeros
|
||||
char* ftostr51rj(const float &x);
|
||||
const char* ftostr51rj(const float &x);
|
||||
|
||||
#include "../core/macros.h"
|
||||
|
||||
// Convert float to rj string with 123 or -12 format
|
||||
FORCE_INLINE char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
|
||||
FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
|
||||
|
||||
#include "../inc/MarlinConfigPre.h"
|
||||
|
||||
@ -95,5 +100,5 @@ FORCE_INLINE char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0
|
||||
char* ftostr4sign(const float &fx);
|
||||
#else
|
||||
// Convert float to rj string with 1234, _123, -123, __12, _-12, ___1, or __-1 format
|
||||
FORCE_INLINE char* ftostr4sign(const float &x) { return i16tostr4sign(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
|
||||
FORCE_INLINE const char* ftostr4sign(const float &x) { return i16tostr4sign(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user