thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename LCD conditionals (#19533)

Browse Source
This commit is contained in:
Scott Lahteine
2020-09-28 01:13:27 -05:00
committed by GitHub
parent 1c372df449
commit c2c6a679ea
138 changed files with 353 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Marlin/src/lcd/ultralcd.h
View File

@@ -40,7 +40,7 @@
#if HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT)
#define HAS_DIGITAL_BUTTONS 1
#endif
#if !HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL)))
#if !HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_WIRED_LCD && DISABLED(NEWPANEL)))
#define HAS_SHIFT_ENCODER 1
#endif
@@ -53,7 +53,7 @@
#define MULTI_MANUAL 1
#endif
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#include "../MarlinCore.h"
@@ -104,7 +104,7 @@
#endif // HAS_LCD_MENU
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
// REPRAPWORLD_KEYPAD (and ADC_KEYPAD)
#if ENABLED(REPRAPWORLD_KEYPAD)
@@ -231,7 +231,7 @@
#endif
#endif
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
enum MarlinFont : uint8_t {
FONT_STATUSMENU = 1,
FONT_EDIT,
@@ -316,11 +316,11 @@ public:
static void refresh();
#else
FORCE_INLINE static void refresh() {
TERN_(HAS_SPI_LCD, refresh(LCDVIEW_CLEAR_CALL_REDRAW));
TERN_(HAS_WIRED_LCD, refresh(LCDVIEW_CLEAR_CALL_REDRAW));
}
#endif
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
static bool detected();
static void init_lcd();
#else
@@ -381,7 +381,7 @@ public:
static void pause_print();
static void resume_print();
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
static millis_t next_button_update_ms;
@@ -403,7 +403,7 @@ public:
static void show_bootscreen();
#endif
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
static void set_font(const MarlinFont font_nr);
@@ -458,7 +458,7 @@ public:
#endif
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
static bool drawing_screen, first_page;
#else
static constexpr bool drawing_screen = false, first_page = true;
@@ -577,7 +577,7 @@ public:
static void draw_select_screen_prompt(PGM_P const pref, const char * const string=nullptr, PGM_P const suff=nullptr);
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
static constexpr bool lcd_clicked = false;
static constexpr bool on_status_screen() { return true; }
@@ -692,7 +692,7 @@ private:
static void finish_status(const bool persist);
#endif
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS > 0
static bool defer_return_to_status;
#else