From 782c598e6636568bec909d6f320cdad0e6fd2daf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Sat, 2 Apr 2016 16:06:37 -0700
Subject: [PATCH] Use ftostr43 with '+' option in MBL Z adjuster
---
Marlin/ultralcd.cpp | 16 ++++++++--------
Marlin/ultralcd.h | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index c8fe314976b..b6b8f29db76 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -2223,13 +2223,13 @@ char *ftostr32(const float& x) {
return conv;
}
-// Convert signed float to string (len 5 or 6) with 1.234 / -1.234 format
-char* ftostr43(const float& x) {
+// Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
+char* ftostr43(const float& x, char plus/*=' '*/) {
long xx = x * 1000;
- char *conv_ptr = conv;
- if (xx >= 0) {
- conv_ptr++;
- }
+ if (xx == 0)
+ conv[0] = ' ';
+ else if (xx > 0)
+ conv[0] = plus;
else {
xx = -xx;
conv[0] = '-';
@@ -2240,7 +2240,7 @@ char* ftostr43(const float& x) {
conv[4] = (xx / 10) % 10 + '0';
conv[5] = (xx) % 10 + '0';
conv[6] = 0;
- return conv_ptr;
+ return conv;
}
// Convert unsigned float to string with 1.23 format
@@ -2453,7 +2453,7 @@ char* ftostr52(const float& x) {
}
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), ftostr43(v + (v < 0 ? -0.0001 : 0.0001), '+'));
}
static bool debounce_click = false;
if (LCD_CLICKED) {
diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index 70b6bfbd3c2..cbc5e05c46e 100644
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -156,7 +156,7 @@ char* ftostr4sign(const float& x);
char* ftostr31ns(const float& x); // float to string without sign character
char* ftostr31(const float& x);
char* ftostr32(const float& x);
-char* ftostr43(const float& x);
+char* ftostr43(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);