Browse Source

Cleanup and conditions (#14886)

pull/1/head
Ludy 5 years ago
committed by Scott Lahteine
parent
commit
d7172a4558
  1. 26
      Marlin/src/inc/Conditionals_LCD.h
  2. 4
      Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp

26
Marlin/src/inc/Conditionals_LCD.h

@ -594,32 +594,6 @@
#define INVERT_E_DIR false #define INVERT_E_DIR false
#endif #endif
#if ENABLED(HOST_ACTION_COMMANDS)
#ifndef ACTION_ON_PAUSE
#define ACTION_ON_PAUSE "pause"
#endif
#ifndef ACTION_ON_RESUME
#define ACTION_ON_RESUME "resume"
#endif
#ifndef ACTION_ON_PAUSED
#define ACTION_ON_PAUSED "paused"
#endif
#ifndef ACTION_ON_RESUMED
#define ACTION_ON_RESUMED "resumed"
#endif
#ifndef ACTION_ON_CANCEL
#define ACTION_ON_CANCEL "cancel"
#endif
#if ENABLED(G29_RETRY_AND_RECOVER)
#ifndef ACTION_ON_G29_RECOVER
#define ACTION_ON_G29_RECOVER "probe_rewipe"
#endif
#ifndef ACTION_ON_G29_FAILURE
#define ACTION_ON_G29_FAILURE "probe_failed"
#endif
#endif
#endif
#if ENABLED(SLIM_LCD_MENUS) #if ENABLED(SLIM_LCD_MENUS)
#define BOOT_MARLIN_LOGO_SMALL #define BOOT_MARLIN_LOGO_SMALL
#endif #endif

4
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp

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

Loading…
Cancel
Save