#12 for #31 (12864)

ursoft · Mar 2, 2020 · e9a9ceb · e9a9ceb
1 parent 4bc2015
commit e9a9ceb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -1966,9 +1966,6 @@
   #if ENABLED(BLTOUCH) && !defined(BLTOUCH_DELAY)
     #define BLTOUCH_DELAY 500
   #endif
-  #if SD_CONNECTION_IS(LCD_AND_ONBOARD) && DISABLED(NO_SD_HOST_DRIVE)
-    #define SHARED_SD_CARD
-  #endif
 #endif
 
 #ifndef __SAM3X8E__ //todo: hal: broken hal encapsulation
@@ -2087,6 +2084,9 @@
     #undef SD_DETECT_PIN
     #define SHARED_SD_CARD
   #endif
+  #if SD_CONNECTION_IS(LCD_AND_ONBOARD) && DISABLED(NO_SD_HOST_DRIVE)
+    #define SHARED_SD_CARD
+  #endif
   #if DISABLED(SHARED_SD_CARD)
     #define INIT_SDCARD_ON_BOOT
   #endif

diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -299,6 +299,9 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
 
 #endif // DO_DRAW_CHAMBER
 
+#if ENABLED(LCD_SHOW_ENDSTOPS_STATUS)
+ #include "../../module/endstops.h"
+#endif
 //
 // Before homing, blink '123' <-> '???'.
 // Homed but unknown... '123' <-> '   '.
@@ -311,8 +314,13 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     #endif
     axis
   );
+#if ENABLED(LCD_SHOW_ENDSTOPS_STATUS)
+  uint32_t axisName = (endstops.axis_min(axis) ? L'x' : L'X') + uint8_t(axis);
+#else
+  uint32_t axisName = L'X' + uint8_t(axis);
+#endif
   const uint8_t offs = (XYZ_SPACING) * a;
-  lcd_put_wchar(X_LABEL_POS + offs, XYZ_BASELINE, axis_codes[axis]);
+  lcd_put_wchar(X_LABEL_POS + offs, XYZ_BASELINE, axisName);
   lcd_moveto(X_VALUE_POS + offs, XYZ_BASELINE);
   if (blink)
     lcd_put_u8str(value);