From b23f7100344f0a3a0e5a33c375c7fa83deb1750b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Wed, 8 Jun 2016 12:50:12 -0700
Subject: [PATCH] Cleanup and naming for num-to-string functions
---
Marlin/dogm_lcd_implementation.h | 22 +-
Marlin/ultralcd.cpp | 283 ++++++++----------
Marlin/ultralcd.h | 14 +-
.../ultralcd_implementation_hitachi_HD44780.h | 22 +-
4 files changed, 160 insertions(+), 181 deletions(-)
diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h
index 3399f78bf4..51ee6e4423 100644
--- a/Marlin/dogm_lcd_implementation.h
+++ b/Marlin/dogm_lcd_implementation.h
@@ -413,7 +413,7 @@ static void lcd_implementation_status_screen() {
u8g.setPrintPos(83, XYZ_BASELINE);
_draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
u8g.setPrintPos(91, XYZ_BASELINE);
- lcd_print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
+ lcd_print(ftostr52sp(current_position[Z_AXIS] + 0.00001));
u8g.setColorIndex(1); // black on white
@@ -500,22 +500,22 @@ static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const c
#define lcd_implementation_drawmenu_setting_edit_int3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, itostr3(*(data)))
#define lcd_implementation_drawmenu_setting_edit_float3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr3(*(data)))
#define lcd_implementation_drawmenu_setting_edit_float32(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr32(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_float43(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr43(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_float5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_float52(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr52(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_float51(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr51(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_long5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_float43(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr43sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_float5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_float52(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr52sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_float51(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr51sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_long5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
#define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
//Add version for callback functions
#define lcd_implementation_drawmenu_setting_edit_callback_int3(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, itostr3(*(data)))
#define lcd_implementation_drawmenu_setting_edit_callback_float3(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr3(*(data)))
#define lcd_implementation_drawmenu_setting_edit_callback_float32(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr32(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_float43(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr43(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_float5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_float52(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr52(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_float51(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr51(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_float43(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr43sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_float5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_float52(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr52sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_float51(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr51sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
#define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index cf9c9ac4cc..c59bffb6b3 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -995,7 +995,7 @@ void lcd_cooldown() {
// Show message above on clicks instead
if (lcdDrawUpdate) {
float v = current_position[Z_AXIS] - MESH_HOME_SEARCH_Z;
- lcd_implementation_drawedit(PSTR(MSG_MOVE_Z), ftostr43(v + (v < 0 ? -0.0001 : 0.0001), '+'));
+ lcd_implementation_drawedit(PSTR(MSG_MOVE_Z), ftostr43sign(v + (v < 0 ? -0.0001 : 0.0001), '+'));
}
}
@@ -1237,7 +1237,7 @@ static void _lcd_move(const char* name, AxisEnum axis, float min, float max) {
manual_move_to_current(axis);
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
}
- if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr31(current_position[axis]));
+ if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr41sign(current_position[axis]));
if (LCD_CLICKED) lcd_goto_previous_menu(true);
}
#if ENABLED(DELTA)
@@ -1282,7 +1282,7 @@ static void lcd_move_e(
#endif //EXTRUDERS > 2
}
#endif //EXTRUDERS > 1
- lcd_implementation_drawedit(pos_label, ftostr31(current_position[E_AXIS]));
+ lcd_implementation_drawedit(pos_label, ftostr41sign(current_position[E_AXIS]));
}
if (LCD_CLICKED) lcd_goto_previous_menu(true);
#if EXTRUDERS > 1
@@ -1913,11 +1913,11 @@ static void lcd_control_volumetric_menu() {
menu_edit_type(int, int3, itostr3, 1);
menu_edit_type(float, float3, ftostr3, 1);
menu_edit_type(float, float32, ftostr32, 100);
-menu_edit_type(float, float43, ftostr43, 1000);
-menu_edit_type(float, float5, ftostr5, 0.01);
-menu_edit_type(float, float51, ftostr51, 10);
-menu_edit_type(float, float52, ftostr52, 100);
-menu_edit_type(unsigned long, long5, ftostr5, 0.01);
+menu_edit_type(float, float43, ftostr43sign, 1000);
+menu_edit_type(float, float5, ftostr5rj, 0.01);
+menu_edit_type(float, float51, ftostr51sign, 10);
+menu_edit_type(float, float52, ftostr52sign, 100);
+menu_edit_type(unsigned long, long5, ftostr5rj, 0.01);
/**
*
@@ -2382,7 +2382,7 @@ void set_utf_strlen(char* s, uint8_t n) {
i++;
}
while (j++ < n) s[i++] = ' ';
- s[i] = 0;
+ s[i] = '\0';
}
bool lcd_hasstatus() { return (lcd_status_message[0] != '\0'); }
@@ -2556,6 +2556,9 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
/** Number to string conversion **/
/*********************************/
+#define DIGIT(n) ('0' + (n))
+#define DIGIMOD(n) DIGIT((n) % 10)
+
char conv[8];
// Convert float to rj string with 123 or -12 format
@@ -2568,52 +2571,40 @@ char *ftostr4sign(const float& x) { return itostr4sign((int)x); }
char* itostr2(const uint8_t& x) {
//sprintf(conv,"%5.1f",x);
int xx = x;
- conv[0] = (xx / 10) % 10 + '0';
- conv[1] = xx % 10 + '0';
- conv[2] = 0;
+ conv[0] = DIGIMOD(xx / 10);
+ conv[1] = DIGIMOD(xx);
+ conv[2] = '\0';
return conv;
}
// Convert float to string with +123.4 / -123.4 format
-char* ftostr31(const float& x) {
- int xx = abs(x * 10);
- conv[0] = (x >= 0) ? '+' : '-';
- conv[1] = (xx / 1000) % 10 + '0';
- conv[2] = (xx / 100) % 10 + '0';
- conv[3] = (xx / 10) % 10 + '0';
+char* ftostr41sign(const float& x) {
+ int xx = int(abs(x * 10)) % 10000;
+ conv[0] = x >= 0 ? '+' : '-';
+ conv[1] = DIGIMOD(xx / 1000);
+ conv[2] = DIGIMOD(xx / 100);
+ conv[3] = DIGIMOD(xx / 10);
conv[4] = '.';
- conv[5] = xx % 10 + '0';
- conv[6] = 0;
- return conv;
-}
-
-// Convert unsigned float to string with 123.4 format, dropping sign
-char* ftostr31ns(const float& x) {
- int xx = abs(x * 10);
- conv[0] = (xx / 1000) % 10 + '0';
- conv[1] = (xx / 100) % 10 + '0';
- conv[2] = (xx / 10) % 10 + '0';
- conv[3] = '.';
- conv[4] = xx % 10 + '0';
- conv[5] = 0;
+ conv[5] = DIGIMOD(xx);
+ conv[6] = '\0';
return conv;
}
// Convert signed float to string with 023.45 / -23.45 format
char *ftostr32(const float& x) {
long xx = abs(x * 100);
- conv[0] = x >= 0 ? (xx / 10000) % 10 + '0' : '-';
- conv[1] = (xx / 1000) % 10 + '0';
- conv[2] = (xx / 100) % 10 + '0';
+ conv[0] = x >= 0 ? DIGIMOD(xx / 10000) : '-';
+ conv[1] = DIGIMOD(xx / 1000);
+ conv[2] = DIGIMOD(xx / 100);
conv[3] = '.';
- conv[4] = (xx / 10) % 10 + '0';
- conv[5] = xx % 10 + '0';
- conv[6] = 0;
+ conv[4] = DIGIMOD(xx / 10);
+ conv[5] = DIGIMOD(xx);
+ conv[6] = '\0';
return conv;
}
// Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
-char* ftostr43(const float& x, char plus/*=' '*/) {
+char* ftostr43sign(const float& x, char plus/*=' '*/) {
long xx = x * 1000;
if (xx == 0)
conv[0] = ' ';
@@ -2623,12 +2614,12 @@ char* ftostr43(const float& x, char plus/*=' '*/) {
xx = -xx;
conv[0] = '-';
}
- conv[1] = (xx / 1000) % 10 + '0';
+ conv[1] = DIGIMOD(xx / 1000);
conv[2] = '.';
- conv[3] = (xx / 100) % 10 + '0';
- conv[4] = (xx / 10) % 10 + '0';
- conv[5] = (xx) % 10 + '0';
- conv[6] = 0;
+ conv[3] = DIGIMOD(xx / 100);
+ conv[4] = DIGIMOD(xx / 10);
+ conv[5] = DIGIMOD(xx);
+ conv[6] = '\0';
return conv;
}
@@ -2636,57 +2627,11 @@ char* ftostr43(const float& x, char plus/*=' '*/) {
char* ftostr12ns(const float& x) {
long xx = x * 100;
xx = abs(xx);
- conv[0] = (xx / 100) % 10 + '0';
+ conv[0] = DIGIMOD(xx / 100);
conv[1] = '.';
- conv[2] = (xx / 10) % 10 + '0';
- conv[3] = (xx) % 10 + '0';
- conv[4] = 0;
- return conv;
-}
-
-// Convert signed float to space-padded string with -_23.4_ format
-char* ftostr32sp(const float& x) {
- long xx = x * 100;
- uint8_t dig;
- if (xx < 0) { // negative val = -_0
- xx = -xx;
- conv[0] = '-';
- dig = (xx / 1000) % 10;
- conv[1] = dig ? '0' + dig : ' ';
- }
- else { // positive val = __0
- dig = (xx / 10000) % 10;
- if (dig) {
- conv[0] = '0' + dig;
- conv[1] = '0' + (xx / 1000) % 10;
- }
- else {
- conv[0] = ' ';
- dig = (xx / 1000) % 10;
- conv[1] = dig ? '0' + dig : ' ';
- }
- }
-
- conv[2] = '0' + (xx / 100) % 10; // lsd always
-
- dig = xx % 10;
- if (dig) { // 2 decimal places
- conv[5] = '0' + dig;
- conv[4] = '0' + (xx / 10) % 10;
- conv[3] = '.';
- }
- else { // 1 or 0 decimal place
- dig = (xx / 10) % 10;
- if (dig) {
- conv[4] = '0' + dig;
- conv[3] = '.';
- }
- else {
- conv[3] = conv[4] = ' ';
- }
- conv[5] = ' ';
- }
- conv[6] = '\0';
+ conv[2] = DIGIMOD(xx / 10);
+ conv[3] = DIGIMOD(xx);
+ conv[4] = '\0';
return conv;
}
@@ -2701,12 +2646,12 @@ char* itostr3sign(const int& x) {
conv[0] = '-';
xx = -x;
}
- conv[1] = (xx / 100) % 10 + '0';
- conv[2] = (xx / 10) % 10 + '0';
- conv[3] = xx % 10 + '0';
+ conv[1] = DIGIMOD(xx / 100);
+ conv[2] = DIGIMOD(xx / 10);
+ conv[3] = DIGIMOD(xx);
conv[4] = '.';
conv[5] = '0';
- conv[6] = 0;
+ conv[6] = '\0';
return conv;
}
@@ -2718,56 +2663,46 @@ char* itostr3(const int& x) {
xx = -xx;
}
else
- conv[0] = xx >= 100 ? (xx / 100) % 10 + '0' : ' ';
+ conv[0] = xx >= 100 ? DIGIMOD(xx / 100) : ' ';
- conv[1] = xx >= 10 ? (xx / 10) % 10 + '0' : ' ';
- conv[2] = xx % 10 + '0';
- conv[3] = 0;
+ conv[1] = xx >= 10 ? DIGIMOD(xx / 10) : ' ';
+ conv[2] = DIGIMOD(xx);
+ conv[3] = '\0';
return conv;
}
// Convert unsigned int to lj string with 123 format
-char* itostr3left(const int& x) {
- if (x >= 100) {
- conv[0] = (x / 100) % 10 + '0';
- conv[1] = (x / 10) % 10 + '0';
- conv[2] = x % 10 + '0';
- conv[3] = 0;
+char* itostr3left(const int& xx) {
+ if (xx >= 100) {
+ conv[0] = DIGIMOD(xx / 100);
+ conv[1] = DIGIMOD(xx / 10);
+ conv[2] = DIGIMOD(xx);
+ conv[3] = '\0';
}
- else if (x >= 10) {
- conv[0] = (x / 10) % 10 + '0';
- conv[1] = x % 10 + '0';
- conv[2] = 0;
+ else if (xx >= 10) {
+ conv[0] = DIGIMOD(xx / 10);
+ conv[1] = DIGIMOD(xx);
+ conv[2] = '\0';
}
else {
- conv[0] = x % 10 + '0';
- conv[1] = 0;
+ conv[0] = DIGIMOD(xx);
+ conv[1] = '\0';
}
return conv;
}
-// Convert unsigned int to rj string with 1234 format
-char* itostr4(const int& x) {
- conv[0] = x >= 1000 ? (x / 1000) % 10 + '0' : ' ';
- conv[1] = x >= 100 ? (x / 100) % 10 + '0' : ' ';
- conv[2] = x >= 10 ? (x / 10) % 10 + '0' : ' ';
- conv[3] = x % 10 + '0';
- conv[4] = 0;
- return conv;
-}
-
// Convert signed int to rj string with _123, -123, _-12, or __-1 format
char *itostr4sign(const int& x) {
int xx = abs(x);
int sign = 0;
if (xx >= 100) {
- conv[1] = (xx / 100) % 10 + '0';
- conv[2] = (xx / 10) % 10 + '0';
+ conv[1] = DIGIMOD(xx / 100);
+ conv[2] = DIGIMOD(xx / 10);
}
else if (xx >= 10) {
conv[0] = ' ';
sign = 1;
- conv[2] = (xx / 10) % 10 + '0';
+ conv[2] = DIGIMOD(xx / 10);
}
else {
conv[0] = ' ';
@@ -2775,48 +2710,94 @@ char *itostr4sign(const int& x) {
sign = 2;
}
conv[sign] = x < 0 ? '-' : ' ';
- conv[3] = xx % 10 + '0';
- conv[4] = 0;
+ conv[3] = DIGIMOD(xx);
+ conv[4] = '\0';
return conv;
}
// Convert unsigned float to rj string with 12345 format
-char* ftostr5(const float& x) {
+char* ftostr5rj(const float& x) {
long xx = abs(x);
- conv[0] = xx >= 10000 ? (xx / 10000) % 10 + '0' : ' ';
- conv[1] = xx >= 1000 ? (xx / 1000) % 10 + '0' : ' ';
- conv[2] = xx >= 100 ? (xx / 100) % 10 + '0' : ' ';
- conv[3] = xx >= 10 ? (xx / 10) % 10 + '0' : ' ';
- conv[4] = xx % 10 + '0';
- conv[5] = 0;
+ conv[0] = xx >= 10000 ? DIGIMOD(xx / 10000) : ' ';
+ conv[1] = xx >= 1000 ? DIGIMOD(xx / 1000) : ' ';
+ conv[2] = xx >= 100 ? DIGIMOD(xx / 100) : ' ';
+ conv[3] = xx >= 10 ? DIGIMOD(xx / 10) : ' ';
+ conv[4] = DIGIMOD(xx);
+ conv[5] = '\0';
return conv;
}
// Convert signed float to string with +1234.5 format
-char* ftostr51(const float& x) {
+char* ftostr51sign(const float& x) {
long xx = abs(x * 10);
conv[0] = (x >= 0) ? '+' : '-';
- conv[1] = (xx / 10000) % 10 + '0';
- conv[2] = (xx / 1000) % 10 + '0';
- conv[3] = (xx / 100) % 10 + '0';
- conv[4] = (xx / 10) % 10 + '0';
+ conv[1] = DIGIMOD(xx / 10000);
+ conv[2] = DIGIMOD(xx / 1000);
+ conv[3] = DIGIMOD(xx / 100);
+ conv[4] = DIGIMOD(xx / 10);
conv[5] = '.';
- conv[6] = xx % 10 + '0';
- conv[7] = 0;
+ conv[6] = DIGIMOD(xx);
+ conv[7] = '\0';
return conv;
}
// Convert signed float to string with +123.45 format
-char* ftostr52(const float& x) {
- conv[0] = (x >= 0) ? '+' : '-';
+char* ftostr52sign(const float& x) {
long xx = abs(x * 100);
- conv[1] = (xx / 10000) % 10 + '0';
- conv[2] = (xx / 1000) % 10 + '0';
- conv[3] = (xx / 100) % 10 + '0';
+ conv[0] = (x >= 0) ? '+' : '-';
+ conv[1] = DIGIMOD(xx / 10000);
+ conv[2] = DIGIMOD(xx / 1000);
+ conv[3] = DIGIMOD(xx / 100);
conv[4] = '.';
- conv[5] = (xx / 10) % 10 + '0';
- conv[6] = xx % 10 + '0';
- conv[7] = 0;
+ conv[5] = DIGIMOD(xx / 10);
+ conv[6] = DIGIMOD(xx);
+ conv[7] = '\0';
+ return conv;
+}
+
+// Convert signed float to space-padded string with -_23.4_ format
+char* ftostr52sp(const float& x) {
+ long xx = x * 100;
+ uint8_t dig;
+ if (xx < 0) { // negative val = -_0
+ xx = -xx;
+ conv[0] = '-';
+ dig = (xx / 1000) % 10;
+ conv[1] = dig ? DIGIT(dig) : ' ';
+ }
+ else { // positive val = __0
+ dig = (xx / 10000) % 10;
+ if (dig) {
+ conv[0] = DIGIT(dig);
+ conv[1] = DIGIMOD(xx / 1000);
+ }
+ else {
+ conv[0] = ' ';
+ dig = (xx / 1000) % 10;
+ conv[1] = dig ? DIGIT(dig) : ' ';
+ }
+ }
+
+ conv[2] = DIGIMOD(xx / 100); // lsd always
+
+ dig = xx % 10;
+ if (dig) { // 2 decimal places
+ conv[5] = DIGIT(dig);
+ conv[4] = DIGIMOD(xx / 10);
+ conv[3] = '.';
+ }
+ else { // 1 or 0 decimal place
+ dig = (xx / 10) % 10;
+ if (dig) {
+ conv[4] = DIGIT(dig);
+ conv[3] = '.';
+ }
+ else {
+ conv[3] = conv[4] = ' ';
+ }
+ conv[5] = ' ';
+ }
+ conv[6] = '\0';
return conv;
}
diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index b1e97bf49e..5cb1ecc57d 100644
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -165,19 +165,17 @@ char* itostr2(const uint8_t& x);
char* itostr3sign(const int& x);
char* itostr3(const int& x);
char* itostr3left(const int& x);
-char* itostr4(const int& x);
char* itostr4sign(const int& x);
char* ftostr3(const float& x);
char* ftostr4sign(const float& x);
-char* ftostr31ns(const float& x); // float to string without sign character
-char* ftostr31(const float& x);
+char* ftostr41sign(const float& x);
char* ftostr32(const float& x);
-char* ftostr43(const float& x, char plus=' ');
+char* ftostr43sign(const float& x, char plus=' ');
char* ftostr12ns(const float& x);
-char* ftostr32sp(const float& x); // remove zero-padding from ftostr32
-char* ftostr5(const float& x);
-char* ftostr51(const float& x);
-char* ftostr52(const float& x);
+char* ftostr5rj(const float& x);
+char* ftostr51sign(const float& x);
+char* ftostr52sign(const float& x);
+char* ftostr52sp(const float& x); // remove zero-padding from ftostr32
#endif //ULTRALCD_H
diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h
index 61e9a62ee3..d682bfa54b 100644
--- a/Marlin/ultralcd_implementation_hitachi_HD44780.h
+++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h
@@ -723,7 +723,7 @@ static void lcd_implementation_status_screen() {
lcd.setCursor(LCD_WIDTH - 8, 1);
_draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
- lcd.print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
+ lcd.print(ftostr52sp(current_position[Z_AXIS] + 0.00001));
#endif // LCD_HEIGHT > 2
@@ -855,22 +855,22 @@ static void lcd_implementation_drawmenu_setting_edit_generic_P(bool sel, uint8_t
#define lcd_implementation_drawmenu_setting_edit_int3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', itostr3(*(data)))
#define lcd_implementation_drawmenu_setting_edit_float3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr3(*(data)))
#define lcd_implementation_drawmenu_setting_edit_float32(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr32(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_float43(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr43(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_float5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_float52(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr52(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_float51(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr51(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_long5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_float43(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr43sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_float5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_float52(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr52sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_float51(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr51sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_long5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
#define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
//Add version for callback functions
#define lcd_implementation_drawmenu_setting_edit_callback_int3(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', itostr3(*(data)))
#define lcd_implementation_drawmenu_setting_edit_callback_float3(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr3(*(data)))
#define lcd_implementation_drawmenu_setting_edit_callback_float32(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr32(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_float43(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr43(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_float5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_float52(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr52(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_float51(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr51(*(data)))
-#define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_float43(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr43sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_float5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_float52(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr52sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_float51(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr51sign(*(data)))
+#define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
#define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {