Browse Source

Cleanup and conditions (#14886)

Ludy 6 years ago
parent
commit
d7172a4558
2 changed files with 2 additions and 28 deletions
  1. 0
    26
      Marlin/src/inc/Conditionals_LCD.h
  2. 2
    2
      Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp

+ 0
- 26
Marlin/src/inc/Conditionals_LCD.h View File

@@ -594,32 +594,6 @@
594 594
   #define INVERT_E_DIR false
595 595
 #endif
596 596
 
597
-#if ENABLED(HOST_ACTION_COMMANDS)
598
-  #ifndef ACTION_ON_PAUSE
599
-    #define ACTION_ON_PAUSE   "pause"
600
-  #endif
601
-  #ifndef ACTION_ON_RESUME
602
-    #define ACTION_ON_RESUME  "resume"
603
-  #endif
604
-  #ifndef ACTION_ON_PAUSED
605
-    #define ACTION_ON_PAUSED  "paused"
606
-  #endif
607
-  #ifndef ACTION_ON_RESUMED
608
-    #define ACTION_ON_RESUMED "resumed"
609
-  #endif
610
-  #ifndef ACTION_ON_CANCEL
611
-    #define ACTION_ON_CANCEL  "cancel"
612
-  #endif
613
-  #if ENABLED(G29_RETRY_AND_RECOVER)
614
-    #ifndef ACTION_ON_G29_RECOVER
615
-      #define ACTION_ON_G29_RECOVER "probe_rewipe"
616
-    #endif
617
-    #ifndef ACTION_ON_G29_FAILURE
618
-      #define ACTION_ON_G29_FAILURE "probe_failed"
619
-    #endif
620
-  #endif
621
-#endif
622
-
623 597
 #if ENABLED(SLIM_LCD_MENUS)
624 598
   #define BOOT_MARLIN_LOGO_SMALL
625 599
 #endif

+ 2
- 2
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp View File

@@ -269,7 +269,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
269 269
 
270 270
   #endif // LCD_PROGRESS_BAR
271 271
 
272
-  #if ENABLED(SDSUPPORT)
272
+  #if ENABLED(SDSUPPORT) && HAS_LCD_MENU
273 273
 
274 274
     // CHARSET_MENU
275 275
     const static PROGMEM byte refresh[8] = {
@@ -319,7 +319,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
319 319
       #endif
320 320
         {
321 321
           createChar_P(LCD_STR_UPLEVEL[0], uplevel);
322
-          #if ENABLED(SDSUPPORT)
322
+          #if ENABLED(SDSUPPORT) && HAS_LCD_MENU
323 323
             // SD Card sub-menu special characters
324 324
             createChar_P(LCD_STR_REFRESH[0], refresh);
325 325
             createChar_P(LCD_STR_FOLDER[0], folder);

Loading…
Cancel
Save