From d5bf1684feebc02e714cb1ea25730bbbbc0689d5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 5 Dec 2016 08:58:26 -0600
Subject: [PATCH] Implement as optional feature LCD_DECIMAL_SMALL_XY
And reduce the function size to simplify
---
Marlin/Configuration_adv.h | 3 ++
.../Cartesio/Configuration_adv.h | 3 ++
.../Felix/Configuration_adv.h | 3 ++
.../Hephestos/Configuration_adv.h | 3 ++
.../Hephestos_2/Configuration_adv.h | 3 ++
.../K8200/Configuration_adv.h | 3 ++
.../K8400/Configuration_adv.h | 3 ++
.../RigidBot/Configuration_adv.h | 3 ++
.../SCARA/Configuration_adv.h | 3 ++
.../TAZ4/Configuration_adv.h | 3 ++
.../WITBOX/Configuration_adv.h | 3 ++
.../delta/biv2.5/Configuration_adv.h | 3 ++
.../delta/generic/Configuration_adv.h | 3 ++
.../delta/kossel_mini/Configuration_adv.h | 3 ++
.../delta/kossel_pro/Configuration_adv.h | 3 ++
.../delta/kossel_xl/Configuration_adv.h | 3 ++
.../makibox/Configuration_adv.h | 3 ++
.../tvrrug/Round2/Configuration_adv.h | 3 ++
Marlin/utility.cpp | 31 +++++++------------
Marlin/utility.h | 9 ++++--
20 files changed, 73 insertions(+), 21 deletions(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e66f9c9f7b..e291db87f9 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h
index 680f49f580..dabe5ead08 100644
--- a/Marlin/example_configurations/Cartesio/Configuration_adv.h
+++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h
index 2f848454f7..a954e43ae2 100644
--- a/Marlin/example_configurations/Felix/Configuration_adv.h
+++ b/Marlin/example_configurations/Felix/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h
index 5294766e62..940acf7669 100644
--- a/Marlin/example_configurations/Hephestos/Configuration_adv.h
+++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h
index d48952e1a9..52c3a872f8 100644
--- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h
+++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h
index b6acbff103..554a6b02ba 100644
--- a/Marlin/example_configurations/K8200/Configuration_adv.h
+++ b/Marlin/example_configurations/K8200/Configuration_adv.h
@@ -435,6 +435,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h
index 0df0c0d7d3..69043cd68f 100644
--- a/Marlin/example_configurations/K8400/Configuration_adv.h
+++ b/Marlin/example_configurations/K8400/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h
index 45671c1431..a8fd1940da 100644
--- a/Marlin/example_configurations/RigidBot/Configuration_adv.h
+++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h
index 5f4e0e2cf3..97684b06cc 100644
--- a/Marlin/example_configurations/SCARA/Configuration_adv.h
+++ b/Marlin/example_configurations/SCARA/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h
index 7e60618641..e81b9e2371 100644
--- a/Marlin/example_configurations/TAZ4/Configuration_adv.h
+++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h
@@ -430,6 +430,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h
index 5294766e62..940acf7669 100644
--- a/Marlin/example_configurations/WITBOX/Configuration_adv.h
+++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
index cabcff9cfe..9e83512ee4 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
@@ -424,6 +424,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h
index 591e898320..ae111f4094 100644
--- a/Marlin/example_configurations/delta/generic/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h
@@ -424,6 +424,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
index 591e898320..ae111f4094 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
@@ -424,6 +424,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
index 0a3becc21f..aa4825980a 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
@@ -429,6 +429,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
index 318fe6eccc..909a5bc048 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
@@ -424,6 +424,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h
index 749d842bd7..e68116b19f 100644
--- a/Marlin/example_configurations/makibox/Configuration_adv.h
+++ b/Marlin/example_configurations/makibox/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
index 0097c6db25..27dccc0fec 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
@@ -422,6 +422,9 @@
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
diff --git a/Marlin/utility.cpp b/Marlin/utility.cpp
index 31be8275ce..8d638067b0 100644
--- a/Marlin/utility.cpp
+++ b/Marlin/utility.cpp
@@ -129,29 +129,22 @@ void safe_delay(millis_t ms) {
return conv;
}
- // Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
- char *ftostr4sign(const float& fx) {
- int x = fx * 10, xx = abs(x);
- bool ispos = x >= 0,
- isten = xx >= 100,
- ishun = xx >= 1000;
- if (!isten || (ispos && !ishun)) {
- // 12.3, _1.2, -1.2
- conv[0] = ispos ? (isten ? DIGIMOD(xx, 100) : ' ') : '-';
+ #if ENABLED(LCD_DECIMAL_SMALL_XY)
+
+ // Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
+ char *ftostr4sign(const float& fx) {
+ int x = fx * 10;
+ if (x <= -100 || x >= 1000) return itostr4sign((int)fx);
+ int xx = abs(x);
+ conv[0] = x < 0 ? '-' : (xx >= 100 ? DIGIMOD(xx, 100) : ' ');
conv[1] = DIGIMOD(xx, 10);
conv[2] = '.';
conv[3] = DIGIMOD(xx, 1);
+ conv[4] = '\0';
+ return conv;
}
- else {
- // 1234, _123, -123, _-12
- conv[0] = ispos ? (xx >= 10000 ? DIGIMOD(xx, 10000) : ' ') : (ishun ? '-' : ' ');
- conv[1] = ishun ? DIGIMOD(xx, 1000) : '-';
- conv[2] = DIGIMOD(xx, 100);
- conv[3] = DIGIMOD(xx, 10);
- }
- conv[4] = '\0';
- return conv;
- }
+
+ #endif // LCD_DECIMAL_SMALL_XY
// Convert float to fixed-length string with +123.4 / -123.4 format
char* ftostr41sign(const float& x) {
diff --git a/Marlin/utility.h b/Marlin/utility.h
index 4bdf18f344..09d569debb 100644
--- a/Marlin/utility.h
+++ b/Marlin/utility.h
@@ -69,8 +69,13 @@ void safe_delay(millis_t ms);
// Convert float to rj string with 123 or -12 format
FORCE_INLINE char *ftostr3(const float& x) { return itostr3((int)x); }
- // Convert float to rj string with 1234, _123, 12.3, _1.2, -123, _-12, or -1.2 format
- char *ftostr4sign(const float& fx);
+ #if ENABLED(LCD_DECIMAL_SMALL_XY)
+ // Convert float to rj string with 1234, _123, 12.3, _1.2, -123, _-12, or -1.2 format
+ 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 itostr4sign((int)x); }
+ #endif
#endif // ULTRA_LCD
--
GitLab