Cleanup and conditions (#14886)
This commit is contained in:
		| @@ -594,32 +594,6 @@ | ||||
|   #define INVERT_E_DIR false | ||||
| #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) | ||||
|   #define BOOT_MARLIN_LOGO_SMALL | ||||
| #endif | ||||
|   | ||||
| @@ -269,7 +269,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS | ||||
|  | ||||
|   #endif // LCD_PROGRESS_BAR | ||||
|  | ||||
|   #if ENABLED(SDSUPPORT) | ||||
|   #if ENABLED(SDSUPPORT) && HAS_LCD_MENU | ||||
|  | ||||
|     // CHARSET_MENU | ||||
|     const static PROGMEM byte refresh[8] = { | ||||
| @@ -319,7 +319,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS | ||||
|       #endif | ||||
|         { | ||||
|           createChar_P(LCD_STR_UPLEVEL[0], uplevel); | ||||
|           #if ENABLED(SDSUPPORT) | ||||
|           #if ENABLED(SDSUPPORT) && HAS_LCD_MENU | ||||
|             // SD Card sub-menu special characters | ||||
|             createChar_P(LCD_STR_REFRESH[0], refresh); | ||||
|             createChar_P(LCD_STR_FOLDER[0], folder); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user