3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-04-06 13:57:12 +00:00
Code Issues Releases Wiki Activity

🚸 MarlinUI edit steps/mm to 2 decimal places ()

Browse source
This commit is contained in:
Giuliano Zaro 2023-01-01 04:03:50 +01:00 • committed by Scott Lahteine
parent c5f95bfe97
commit f2017d4111
4 changed files with 202 additions and 184 deletions

6
Marlin/src/lcd/menu/menu_advanced.cpp
View file

@ -640,11 +640,11 @@ void menu_advanced_steps_per_mm() {
BACK_ITEM(MSG_ADVANCED_SETTINGS); BACK_ITEM(MSG_ADVANCED_SETTINGS);
LOOP_NUM_AXES(a) LOOP_NUM_AXES(a)
EDIT_ITEM_FAST_N(float61, a, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[a], 5, 9999, []{ planner.refresh_positioning(); }); EDIT_ITEM_FAST_N(float72, a, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[a], 5, 9999, []{ planner.refresh_positioning(); });
#if ENABLED(DISTINCT_E_FACTORS) #if ENABLED(DISTINCT_E_FACTORS)
LOOP_L_N(n, E_STEPPERS) LOOP_L_N(n, E_STEPPERS)
EDIT_ITEM_FAST_N(float61, n, MSG_EN_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(n)], 5, 9999, []{ EDIT_ITEM_FAST_N(float72, n, MSG_EN_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(n)], 5, 9999, []{
const uint8_t e = MenuItemBase::itemIndex; const uint8_t e = MenuItemBase::itemIndex;
if (e == active_extruder) if (e == active_extruder)
planner.refresh_positioning(); planner.refresh_positioning();
@ -652,7 +652,7 @@ void menu_advanced_steps_per_mm() {
planner.mm_per_step[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)]; planner.mm_per_step[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)];
}); });
#elif E_STEPPERS #elif E_STEPPERS
EDIT_ITEM_FAST_N(float61, E_AXIS, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); }); EDIT_ITEM_FAST_N(float72, E_AXIS, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
#endif #endif
END_MENU(); END_MENU();

1
Marlin/src/lcd/menu/menu_item.h
View file

@ -153,6 +153,7 @@ DEFINE_MENU_EDIT_ITEM_TYPE(float4 ,float ,ftostr4sign , 1 );
DEFINE_MENU_EDIT_ITEM_TYPE(float5 ,float ,ftostr5rj , 1 ); // 12345 right-justified DEFINE_MENU_EDIT_ITEM_TYPE(float5 ,float ,ftostr5rj , 1 ); // 12345 right-justified
DEFINE_MENU_EDIT_ITEM_TYPE(float5_25 ,float ,ftostr5rj , 0.04f ); // 12345 right-justified (25 increment) DEFINE_MENU_EDIT_ITEM_TYPE(float5_25 ,float ,ftostr5rj , 0.04f ); // 12345 right-justified (25 increment)
DEFINE_MENU_EDIT_ITEM_TYPE(float61 ,float ,ftostr61rj , 10 ); // 12345.6 right-justified DEFINE_MENU_EDIT_ITEM_TYPE(float61 ,float ,ftostr61rj , 10 ); // 12345.6 right-justified
DEFINE_MENU_EDIT_ITEM_TYPE(float72 ,float ,ftostr72rj , 100 ); // 12345.67 right-justified
DEFINE_MENU_EDIT_ITEM_TYPE(float31sign ,float ,ftostr31sign , 10 ); // +12.3 DEFINE_MENU_EDIT_ITEM_TYPE(float31sign ,float ,ftostr31sign , 10 ); // +12.3
DEFINE_MENU_EDIT_ITEM_TYPE(float41sign ,float ,ftostr41sign , 10 ); // +123.4 DEFINE_MENU_EDIT_ITEM_TYPE(float41sign ,float ,ftostr41sign , 10 ); // +123.4
DEFINE_MENU_EDIT_ITEM_TYPE(float51sign ,float ,ftostr51sign , 10 ); // +1234.5 DEFINE_MENU_EDIT_ITEM_TYPE(float51sign ,float ,ftostr51sign , 10 ); // +1234.5

376
Marlin/src/libs/numtostr.cpp
View file

@ -25,7 +25,7 @@
#include "../inc/MarlinConfigPre.h" #include "../inc/MarlinConfigPre.h"
#include "../core/utility.h" #include "../core/utility.h"
char conv[8] = { 0 }; char conv[9] = { 0 };
#define DIGIT(n) ('0' + (n)) #define DIGIT(n) ('0' + (n))
#define DIGIMOD(n, f) DIGIT((n)/(f) % 10) #define DIGIMOD(n, f) DIGIT((n)/(f) % 10)
@ -36,11 +36,11 @@ char conv[8] = { 0 };
// Format uint8_t (0-100) as rj string with 123% / _12% / __1% format // Format uint8_t (0-100) as rj string with 123% / _12% / __1% format
const char* pcttostrpctrj(const uint8_t i) { const char* pcttostrpctrj(const uint8_t i) {
conv[3] = RJDIGIT(i, 100); conv[4] = RJDIGIT(i, 100);
conv[4] = RJDIGIT(i, 10); conv[5] = RJDIGIT(i, 10);
conv[5] = DIGIMOD(i, 1); conv[6] = DIGIMOD(i, 1);
conv[6] = '%'; conv[7] = '%';
return &conv[3]; return &conv[4];
} }
// Convert uint8_t (0-255) to a percentage, format as above // Convert uint8_t (0-255) to a percentage, format as above
@ -50,26 +50,26 @@ const char* ui8tostr4pctrj(const uint8_t i) {
// Convert unsigned 8bit int to string 123 format // Convert unsigned 8bit int to string 123 format
const char* ui8tostr3rj(const uint8_t i) { const char* ui8tostr3rj(const uint8_t i) {
conv[4] = RJDIGIT(i, 100); conv[5] = RJDIGIT(i, 100);
conv[5] = RJDIGIT(i, 10); conv[6] = RJDIGIT(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[4]; return &conv[5];
} }
// Convert uint8_t to string with 12 format // Convert uint8_t to string with 12 format
const char* ui8tostr2(const uint8_t i) { const char* ui8tostr2(const uint8_t i) {
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[5]; return &conv[6];
} }
// Convert signed 8bit int to rj string with 123 or -12 format // Convert signed 8bit int to rj string with 123 or -12 format
const char* i8tostr3rj(const int8_t x) { const char* i8tostr3rj(const int8_t x) {
int xx = x; int xx = x;
conv[4] = MINUSOR(xx, RJDIGIT(xx, 100)); conv[5] = MINUSOR(xx, RJDIGIT(xx, 100));
conv[5] = RJDIGIT(xx, 10); conv[6] = RJDIGIT(xx, 10);
conv[6] = DIGIMOD(xx, 1); conv[7] = DIGIMOD(xx, 1);
return &conv[4]; return &conv[5];
} }
#if HAS_PRINT_PROGRESS_PERMYRIAD #if HAS_PRINT_PROGRESS_PERMYRIAD
@ -78,61 +78,61 @@ const char* i8tostr3rj(const int8_t x) {
if (xx >= 10000) if (xx >= 10000)
return " 100"; // space to keep 4-width alignment return " 100"; // space to keep 4-width alignment
else if (xx >= 1000) { else if (xx >= 1000) {
conv[3] = DIGIMOD(xx, 1000); conv[4] = DIGIMOD(xx, 1000);
conv[5] = DIGIMOD(xx, 100);
conv[6] = '.';
conv[7] = DIGIMOD(xx, 10);
return &conv[4];
}
else {
conv[4] = DIGIMOD(xx, 100); conv[4] = DIGIMOD(xx, 100);
conv[5] = '.'; conv[5] = '.';
conv[6] = DIGIMOD(xx, 10); conv[6] = DIGIMOD(xx, 10);
return &conv[3]; conv[7] = RJDIGIT(xx, 1);
} 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 #endif
// Convert unsigned 16bit int to string 12345 format // Convert unsigned 16bit int to string 12345 format
const char* ui16tostr5rj(const uint16_t xx) { const char* ui16tostr5rj(const uint16_t xx) {
conv[2] = RJDIGIT(xx, 10000); conv[3] = RJDIGIT(xx, 10000);
conv[3] = RJDIGIT(xx, 1000); conv[4] = RJDIGIT(xx, 1000);
conv[4] = RJDIGIT(xx, 100); conv[5] = RJDIGIT(xx, 100);
conv[5] = RJDIGIT(xx, 10); conv[6] = RJDIGIT(xx, 10);
conv[6] = DIGIMOD(xx, 1); conv[7] = DIGIMOD(xx, 1);
return &conv[2]; return &conv[3];
} }
// Convert unsigned 16bit int to string 1234 format // Convert unsigned 16bit int to string 1234 format
const char* ui16tostr4rj(const uint16_t xx) { const char* ui16tostr4rj(const uint16_t xx) {
conv[3] = RJDIGIT(xx, 1000); conv[4] = RJDIGIT(xx, 1000);
conv[4] = RJDIGIT(xx, 100); conv[5] = RJDIGIT(xx, 100);
conv[5] = RJDIGIT(xx, 10); conv[6] = RJDIGIT(xx, 10);
conv[6] = DIGIMOD(xx, 1); conv[7] = DIGIMOD(xx, 1);
return &conv[3]; return &conv[4];
} }
// Convert unsigned 16bit int to string 123 format // Convert unsigned 16bit int to string 123 format
const char* ui16tostr3rj(const uint16_t xx) { const char* ui16tostr3rj(const uint16_t xx) {
conv[4] = RJDIGIT(xx, 100); conv[5] = RJDIGIT(xx, 100);
conv[5] = RJDIGIT(xx, 10); conv[6] = RJDIGIT(xx, 10);
conv[6] = DIGIMOD(xx, 1); conv[7] = DIGIMOD(xx, 1);
return &conv[4]; return &conv[5];
} }
// Convert signed 16bit int to rj string with 123 or -12 format // Convert signed 16bit int to rj string with 123 or -12 format
const char* i16tostr3rj(const int16_t x) { const char* i16tostr3rj(const int16_t x) {
int xx = x; int xx = x;
conv[4] = MINUSOR(xx, RJDIGIT(xx, 100)); conv[5] = MINUSOR(xx, RJDIGIT(xx, 100));
conv[5] = RJDIGIT(xx, 10); conv[6] = RJDIGIT(xx, 10);
conv[6] = DIGIMOD(xx, 1); conv[7] = DIGIMOD(xx, 1);
return &conv[4]; return &conv[5];
} }
// Convert unsigned 16bit int to lj string with 123 format // Convert unsigned 16bit int to lj string with 123 format
const char* i16tostr3left(const int16_t i) { const char* i16tostr3left(const int16_t i) {
char *str = &conv[6]; char *str = &conv[7];
*str = DIGIMOD(i, 1); *str = DIGIMOD(i, 1);
if (i >= 10) { if (i >= 10) {
*(--str) = DIGIMOD(i, 10); *(--str) = DIGIMOD(i, 10);
@ -147,118 +147,118 @@ const char* i16tostr4signrj(const int16_t i) {
const bool neg = i < 0; const bool neg = i < 0;
const int ii = neg ? -i : i; const int ii = neg ? -i : i;
if (i >= 1000) { if (i >= 1000) {
conv[3] = DIGIMOD(ii, 1000); conv[4] = DIGIMOD(ii, 1000);
conv[4] = DIGIMOD(ii, 100); conv[5] = DIGIMOD(ii, 100);
conv[5] = DIGIMOD(ii, 10); conv[6] = DIGIMOD(ii, 10);
} }
else if (ii >= 100) { else if (ii >= 100) {
conv[3] = neg ? '-' : ' '; conv[4] = neg ? '-' : ' ';
conv[4] = DIGIMOD(ii, 100); conv[5] = DIGIMOD(ii, 100);
conv[5] = DIGIMOD(ii, 10); conv[6] = DIGIMOD(ii, 10);
} }
else { else {
conv[3] = ' ';
conv[4] = ' '; conv[4] = ' ';
conv[5] = ' ';
if (ii >= 10) { if (ii >= 10) {
conv[4] = neg ? '-' : ' '; conv[5] = neg ? '-' : ' ';
conv[5] = DIGIMOD(ii, 10); conv[6] = DIGIMOD(ii, 10);
} }
else { else {
conv[5] = neg ? '-' : ' '; conv[6] = neg ? '-' : ' ';
} }
} }
conv[6] = DIGIMOD(ii, 1); conv[7] = DIGIMOD(ii, 1);
return &conv[3]; return &conv[4];
} }
// Convert unsigned float to string with 1.1 format // Convert unsigned float to string with 1.1 format
const char* ftostr11ns(const_float_t f) { const char* ftostr11ns(const_float_t f) {
const long i = UINTFLOAT(f, 1); const long i = UINTFLOAT(f, 1);
conv[4] = DIGIMOD(i, 10); conv[5] = DIGIMOD(i, 10);
conv[5] = '.'; conv[6] = '.';
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[4]; return &conv[5];
} }
// Convert unsigned float to string with 1.23 format // Convert unsigned float to string with 1.23 format
const char* ftostr12ns(const_float_t f) { const char* ftostr12ns(const_float_t f) {
const long i = UINTFLOAT(f, 2); const long i = UINTFLOAT(f, 2);
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
conv[4] = '.'; conv[5] = '.';
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[3]; return &conv[4];
} }
// Convert unsigned float to string with 12.3 format // Convert unsigned float to string with 12.3 format
const char* ftostr31ns(const_float_t f) { const char* ftostr31ns(const_float_t f) {
const long i = UINTFLOAT(f, 1); const long i = UINTFLOAT(f, 1);
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
conv[4] = DIGIMOD(i, 10); conv[5] = DIGIMOD(i, 10);
conv[5] = '.'; conv[6] = '.';
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[3]; return &conv[4];
} }
// Convert unsigned float to string with 123.4 format // Convert unsigned float to string with 123.4 format
const char* ftostr41ns(const_float_t f) { const char* ftostr41ns(const_float_t f) {
const long i = UINTFLOAT(f, 1); const long i = UINTFLOAT(f, 1);
conv[2] = DIGIMOD(i, 1000); conv[3] = DIGIMOD(i, 1000);
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
conv[4] = DIGIMOD(i, 10); conv[5] = DIGIMOD(i, 10);
conv[5] = '.'; conv[6] = '.';
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[2]; return &conv[3];
} }
// Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format // Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format
const char* ftostr42_52(const_float_t f) { const char* ftostr42_52(const_float_t f) {
if (f <= -10 || f >= 100) return ftostr52(f); // -23.45 / 123.45 if (f <= -10 || f >= 100) return ftostr52(f); // -23.45 / 123.45
long i = INTFLOAT(f, 2); long i = INTFLOAT(f, 2);
conv[2] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 1000)); conv[3] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 1000));
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
conv[4] = '.'; conv[5] = '.';
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[2]; return &conv[3];
} }
// 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
const char* ftostr52(const_float_t f) { const char* ftostr52(const_float_t f) {
long i = INTFLOAT(f, 2); long i = INTFLOAT(f, 2);
conv[1] = MINUSOR(i, DIGIMOD(i, 10000)); conv[2] = MINUSOR(i, DIGIMOD(i, 10000));
conv[2] = DIGIMOD(i, 1000); conv[3] = DIGIMOD(i, 1000);
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
conv[4] = '.'; conv[5] = '.';
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[1]; return &conv[2];
} }
// Convert signed float to fixed-length string with 12.345 / _2.345 / -2.345 or -23.45 / 123.45 format // Convert signed float to fixed-length string with 12.345 / _2.345 / -2.345 or -23.45 / 123.45 format
const char* ftostr53_63(const_float_t f) { const char* ftostr53_63(const_float_t f) {
if (f <= -10 || f >= 100) return ftostr63(f); // -23.456 / 123.456 if (f <= -10 || f >= 100) return ftostr63(f); // -23.456 / 123.456
long i = INTFLOAT(f, 3); long i = INTFLOAT(f, 3);
conv[1] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 10000)); conv[2] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 10000));
conv[2] = DIGIMOD(i, 1000); conv[3] = DIGIMOD(i, 1000);
conv[3] = '.'; conv[4] = '.';
conv[4] = DIGIMOD(i, 100); conv[5] = DIGIMOD(i, 100);
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[1]; return &conv[2];
} }
// Convert signed float to fixed-length string with 023.456 / -23.456 format // Convert signed float to fixed-length string with 023.456 / -23.456 format
const char* ftostr63(const_float_t f) { const char* ftostr63(const_float_t f) {
long i = INTFLOAT(f, 3); long i = INTFLOAT(f, 3);
conv[0] = MINUSOR(i, DIGIMOD(i, 100000)); conv[1] = MINUSOR(i, DIGIMOD(i, 100000));
conv[1] = DIGIMOD(i, 10000); conv[2] = DIGIMOD(i, 10000);
conv[2] = DIGIMOD(i, 1000); conv[3] = DIGIMOD(i, 1000);
conv[3] = '.'; conv[4] = '.';
conv[4] = DIGIMOD(i, 100); conv[5] = DIGIMOD(i, 100);
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[0]; return &conv[1];
} }
#if ENABLED(LCD_DECIMAL_SMALL_XY) #if ENABLED(LCD_DECIMAL_SMALL_XY)
@ -269,11 +269,11 @@ const char* ftostr63(const_float_t f) {
if (!WITHIN(i, -99, 999)) return i16tostr4signrj((int)f); if (!WITHIN(i, -99, 999)) return i16tostr4signrj((int)f);
const bool neg = i < 0; const bool neg = i < 0;
const int ii = neg ? -i : i; const int ii = neg ? -i : i;
conv[3] = neg ? '-' : (ii >= 100 ? DIGIMOD(ii, 100) : ' '); conv[4] = neg ? '-' : (ii >= 100 ? DIGIMOD(ii, 100) : ' ');
conv[4] = DIGIMOD(ii, 10); conv[5] = DIGIMOD(ii, 10);
conv[5] = '.'; conv[6] = '.';
conv[6] = DIGIMOD(ii, 1); conv[7] = DIGIMOD(ii, 1);
return &conv[3]; return &conv[4];
} }
#endif #endif
@ -281,49 +281,49 @@ const char* ftostr63(const_float_t f) {
// Convert float to fixed-length string with +12.3 / -12.3 format // Convert float to fixed-length string with +12.3 / -12.3 format
const char* ftostr31sign(const_float_t f) { const char* ftostr31sign(const_float_t f) {
int i = INTFLOAT(f, 1); int i = INTFLOAT(f, 1);
conv[2] = MINUSOR(i, '+'); conv[3] = MINUSOR(i, '+');
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
conv[4] = DIGIMOD(i, 10); conv[5] = DIGIMOD(i, 10);
conv[5] = '.'; conv[6] = '.';
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[2]; return &conv[3];
} }
// Convert float to fixed-length string with +123.4 / -123.4 format // Convert float to fixed-length string with +123.4 / -123.4 format
const char* ftostr41sign(const_float_t f) { const char* ftostr41sign(const_float_t f) {
int i = INTFLOAT(f, 1); int i = INTFLOAT(f, 1);
conv[1] = MINUSOR(i, '+'); conv[2] = MINUSOR(i, '+');
conv[2] = DIGIMOD(i, 1000); conv[3] = DIGIMOD(i, 1000);
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
conv[4] = DIGIMOD(i, 10); conv[5] = DIGIMOD(i, 10);
conv[5] = '.'; conv[6] = '.';
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[1]; return &conv[2];
} }
// 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
const char* ftostr43sign(const_float_t f, char plus/*=' '*/) { const char* ftostr43sign(const_float_t f, char plus/*=' '*/) {
long i = INTFLOAT(f, 3); long i = INTFLOAT(f, 3);
conv[1] = i ? MINUSOR(i, plus) : ' '; conv[2] = i ? MINUSOR(i, plus) : ' ';
conv[2] = DIGIMOD(i, 1000); conv[3] = DIGIMOD(i, 1000);
conv[3] = '.'; conv[4] = '.';
conv[4] = DIGIMOD(i, 100); conv[5] = DIGIMOD(i, 100);
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[1]; return &conv[2];
} }
// Convert signed float to string (5 digit) with -1.2345 / _0.0000 / +1.2345 format // Convert signed float to string (5 digit) with -1.2345 / _0.0000 / +1.2345 format
const char* ftostr54sign(const_float_t f, char plus/*=' '*/) { const char* ftostr54sign(const_float_t f, char plus/*=' '*/) {
long i = INTFLOAT(f, 4); long i = INTFLOAT(f, 4);
conv[0] = i ? MINUSOR(i, plus) : ' '; conv[1] = i ? MINUSOR(i, plus) : ' ';
conv[1] = DIGIMOD(i, 10000); conv[2] = DIGIMOD(i, 10000);
conv[2] = '.'; conv[3] = '.';
conv[3] = DIGIMOD(i, 1000); conv[4] = DIGIMOD(i, 1000);
conv[4] = DIGIMOD(i, 100); conv[5] = DIGIMOD(i, 100);
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return &conv[0]; return &conv[1];
} }
// Convert unsigned float to rj string with 12345 format // Convert unsigned float to rj string with 12345 format
@ -335,52 +335,66 @@ const char* ftostr5rj(const_float_t f) {
// Convert signed float to string with +1234.5 format // Convert signed float to string with +1234.5 format
const char* ftostr51sign(const_float_t f) { const char* ftostr51sign(const_float_t f) {
long i = INTFLOAT(f, 1); long i = INTFLOAT(f, 1);
conv[0] = MINUSOR(i, '+'); conv[1] = MINUSOR(i, '+');
conv[1] = DIGIMOD(i, 10000); conv[2] = DIGIMOD(i, 10000);
conv[2] = DIGIMOD(i, 1000); conv[3] = DIGIMOD(i, 1000);
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
conv[4] = DIGIMOD(i, 10); conv[5] = DIGIMOD(i, 10);
conv[5] = '.'; conv[6] = '.';
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return conv; return &conv[1];
} }
// Convert signed float to string with +123.45 format // Convert signed float to string with +123.45 format
const char* ftostr52sign(const_float_t f) { const char* ftostr52sign(const_float_t f) {
long i = INTFLOAT(f, 2); long i = INTFLOAT(f, 2);
conv[0] = MINUSOR(i, '+'); conv[1] = MINUSOR(i, '+');
conv[1] = DIGIMOD(i, 10000); conv[2] = DIGIMOD(i, 10000);
conv[2] = DIGIMOD(i, 1000); conv[3] = DIGIMOD(i, 1000);
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
conv[4] = '.'; conv[5] = '.';
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return conv; return &conv[1];
} }
// Convert signed float to string with +12.345 format // Convert signed float to string with +12.345 format
const char* ftostr53sign(const_float_t f) { const char* ftostr53sign(const_float_t f) {
long i = INTFLOAT(f, 3); long i = INTFLOAT(f, 3);
conv[0] = MINUSOR(i, '+'); conv[1] = MINUSOR(i, '+');
conv[1] = DIGIMOD(i, 10000); conv[2] = DIGIMOD(i, 10000);
conv[2] = DIGIMOD(i, 1000); conv[3] = DIGIMOD(i, 1000);
conv[3] = '.'; conv[4] = '.';
conv[4] = DIGIMOD(i, 100); conv[5] = DIGIMOD(i, 100);
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIMOD(i, 1); conv[7] = DIGIMOD(i, 1);
return conv; return &conv[1];
} }
// Convert unsigned float to string with ____5.6, ___45.6, __345.6, _2345.6, 12345.6 format // Convert unsigned float to string with ____5.6, ___45.6, __345.6, _2345.6, 12345.6 format
const char* ftostr61rj(const_float_t f) { const char* ftostr61rj(const_float_t f) {
const long i = UINTFLOAT(f, 1); const long i = UINTFLOAT(f, 1);
conv[0] = RJDIGIT(i, 100000); conv[1] = RJDIGIT(i, 100000);
conv[1] = RJDIGIT(i, 10000); conv[2] = RJDIGIT(i, 10000);
conv[2] = RJDIGIT(i, 1000); conv[3] = RJDIGIT(i, 1000);
conv[3] = RJDIGIT(i, 100); conv[4] = RJDIGIT(i, 100);
conv[4] = DIGIMOD(i, 10); conv[5] = DIGIMOD(i, 10);
conv[6] = '.';
conv[7] = DIGIMOD(i, 1);
return &conv[1];
}
// Convert unsigned float to string with ____5.67, ___45.67, __345.67, _2345.67, 12345.67 format
const char* ftostr72rj(const_float_t f) {
const long i = UINTFLOAT(f, 2);
conv[0] = RJDIGIT(i, 1000000);
conv[1] = RJDIGIT(i, 100000);
conv[2] = RJDIGIT(i, 10000);
conv[3] = RJDIGIT(i, 1000);
conv[4] = DIGIMOD(i, 100);
conv[5] = '.'; conv[5] = '.';
conv[6] = DIGIMOD(i, 1); conv[6] = DIGIMOD(i, 10);
conv[7] = DIGIMOD(i, 1);
return conv; return conv;
} }
@ -388,24 +402,24 @@ const char* ftostr61rj(const_float_t f) {
const char* ftostr52sp(const_float_t f) { const char* ftostr52sp(const_float_t f) {
long i = INTFLOAT(f, 2); long i = INTFLOAT(f, 2);
uint8_t dig; uint8_t dig;
conv[0] = MINUSOR(i, ' '); conv[1] = MINUSOR(i, ' ');
conv[1] = RJDIGIT(i, 10000); conv[2] = RJDIGIT(i, 10000);
conv[2] = RJDIGIT(i, 1000); conv[3] = RJDIGIT(i, 1000);
conv[3] = DIGIMOD(i, 100); conv[4] = DIGIMOD(i, 100);
if ((dig = i % 10)) { // second digit after decimal point? if ((dig = i % 10)) { // second digit after decimal point?
conv[4] = '.'; conv[5] = '.';
conv[5] = DIGIMOD(i, 10); conv[6] = DIGIMOD(i, 10);
conv[6] = DIGIT(dig); conv[7] = DIGIT(dig);
} }
else { else {
if ((dig = (i / 10) % 10)) { // first digit after decimal point? if ((dig = (i / 10) % 10)) { // first digit after decimal point?
conv[4] = '.'; conv[5] = '.';
conv[5] = DIGIT(dig); conv[6] = DIGIT(dig);
} }
else // nothing after decimal point else // nothing after decimal point
conv[4] = conv[5] = ' '; conv[5] = conv[6] = ' ';
conv[6] = ' '; conv[7] = ' ';
} }
return conv; return &conv[1];
} }

3
Marlin/src/libs/numtostr.h
View file

@ -116,6 +116,9 @@ const char* ftostr53sign(const_float_t f);
// Convert unsigned float to string with 12345.6 format omitting trailing zeros // Convert unsigned float to string with 12345.6 format omitting trailing zeros
const char* ftostr61rj(const_float_t x); const char* ftostr61rj(const_float_t x);
// Convert unsigned float to string with 12345.67 format omitting trailing zeros
const char* ftostr72rj(const_float_t x);
// Convert float to rj string with 123 or -12 format // Convert float to rj string with 123 or -12 format
FORCE_INLINE const char* ftostr3(const_float_t x) { return i16tostr3rj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); } FORCE_INLINE const char* ftostr3(const_float_t x) { return i16tostr3rj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }