fix #12

ursoft · Nov 21, 2019 · e4ecd36 · e4ecd36
1 parent 9e56316
commit e4ecd36
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -631,6 +631,7 @@
 //===========================================================================
 
 // @section homing
+#define LCD_SHOW_ENDSTOPS_STATUS
 
 // Specify here all the endstop connectors that are connected to any endstop or probe.
 // Almost all printers will be using one per axis. Probes will use one or more of the

diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -501,8 +501,16 @@ void MarlinUI::draw_kill_screen() {
 // Homed but unknown... '123' <-> '   '.
 // Homed and known, display constantly.
 //
+#if ENABLED(LCD_SHOW_ENDSTOPS_STATUS)
+ #include "../../module/endstops.h"
+#endif
+
 FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const bool blink) {
+#if ENABLED(LCD_SHOW_ENDSTOPS_STATUS)
+  lcd_put_wchar((endstops.axis_min(axis) ? 'x' : 'X') + uint8_t(axis));
+#else
   lcd_put_wchar('X' + uint8_t(axis));
+#endif
   if (blink)
     lcd_put_u8str(value);
   else {

diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
@@ -396,6 +396,27 @@ static void print_es_state(const bool is_hit, PGM_P const label=nullptr) {
   SERIAL_EOL();
 }
 
+#if ENABLED(LCD_SHOW_ENDSTOPS_STATUS)
+bool Endstops::axis_min(AxisEnum ax) {
+  bool ret;
+  switch(ax) {
+    case X_AXIS:
+      ret = READ(X_MIN_PIN) != X_MIN_ENDSTOP_INVERTING;
+      break;
+    case Y_AXIS:
+      ret = READ(Y_MIN_PIN) != Y_MIN_ENDSTOP_INVERTING;
+      break;
+    case Z_AXIS:
+      ret = READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING;
+      break;
+    default:
+      ret = false;
+      break;
+  }
+  return ret;
+}
+#endif
+
 void _O2 Endstops::report_states() {
   #if ENABLED(BLTOUCH)
     bltouch._set_SW_mode();

diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
@@ -154,6 +154,9 @@ class Endstops {
     #endif
 
     static void resync();
+#if ENABLED(LCD_SHOW_ENDSTOPS_STATUS)
+    static bool axis_min(AxisEnum ax);
+#endif
 
     // Debugging of endstops
     #if ENABLED(PINS_DEBUGGING)