Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various cosmetic changes #27503

Open
wants to merge 17 commits into
base: bugfix-2.1.x
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix extra init_lcd(), remove HAS_UI_UPDATE (redundant)
classicrocker883 committed Feb 15, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 1deac56450964601ac9ad44f74d0b2e067f7710f
1 change: 0 additions & 1 deletion Marlin/src/inc/Conditionals-2-LCD.h
Original file line number Diff line number Diff line change
@@ -611,7 +611,6 @@
* (calling advance_status_scroll, status_and_len for a scrolling status message)
*/
#define HAS_DISPLAY 1
#define HAS_UI_UPDATE 1
#define HAS_STATUS_MESSAGE 1
#endif

16 changes: 4 additions & 12 deletions Marlin/src/lcd/marlinui.h
Original file line number Diff line number Diff line change
@@ -205,15 +205,6 @@ class MarlinUI {

static void init();

#if HAS_DISPLAY || HAS_DWIN_E3V2
static void init_lcd();
// Erase the LCD contents. Do the lowest-level thing required to clear the LCD.
static void clear_lcd();
#else
static void init_lcd() {}
static void clear_lcd() {}
#endif

#if HAS_MULTI_LANGUAGE
static uint8_t language;
static void set_language(const uint8_t lang);
@@ -504,16 +495,16 @@ class MarlinUI {
template<typename... Args>
static void status_printf(int8_t level, FSTR_P const ffmt, Args... more) { status_printf_P(level, FTOP(ffmt), more...); }

// Periodic or as-needed display update
static void update() IF_DISABLED(HAS_UI_UPDATE, {});

// Tell the screen to redraw on the next call
FORCE_INLINE static void refresh() {
TERN_(HAS_WIRED_LCD, refresh(LCDVIEW_CLEAR_CALL_REDRAW));
}

#if HAS_DISPLAY

// Periodic or as-needed display update
static void update();

static void init_lcd();

// Erase the LCD contents. Do the lowest-level thing required to clear the LCD.
@@ -632,6 +623,7 @@ class MarlinUI {

#else // No LCD

static void update() {}
static void init_lcd() {}
static void clear_lcd() {}
static void clear_for_drawing() {}