fix extra init_lcd(), remove HAS_UI_UPDATE (redundant)

MarlinFirmware · Feb 15, 2025 · 1deac56 · 1deac56
1 parent 85b1513
commit 1deac56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/Marlin/src/inc/Conditionals-2-LCD.h b/Marlin/src/inc/Conditionals-2-LCD.h
@@ -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
 

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
@@ -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() {}