From af553d5fbd1e4217d38f5e0f629682d79570e438 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 19 May 2025 19:36:20 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Solve=20a=20linker=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #27864 --- Marlin/src/lcd/marlinui.cpp | 11 ++++++----- Marlin/src/lcd/marlinui.h | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index 991a4f549c..ab932adfcd 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -62,6 +62,10 @@ MarlinUI ui; #include "../module/printcounter.h" #endif +#if HAS_WIRED_LCD || HAS_PREHEAT + #include "../module/temperature.h" +#endif + #if LCD_HAS_WAIT_FOR_MOVE bool MarlinUI::wait_for_move; // = false #endif @@ -136,8 +140,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP; #endif #if HAS_PREHEAT - #include "../module/temperature.h" - preheat_t MarlinUI::material_preset[PREHEAT_COUNT]; // Initialized by settings.load void MarlinUI::reset_material_presets() { @@ -331,7 +333,6 @@ void MarlinUI::init() { #include "lcdprint.h" - #include "../module/temperature.h" #include "../module/planner.h" #include "../module/motion.h" @@ -1883,7 +1884,7 @@ uint8_t expand_u8str_P(char * const outstr, PGM_P const ptpl, const int8_t ind, ); } - #if LCD_WITH_BLINK && HAS_EXTRA_PROGRESS + #if HAS_ROTATE_PROGRESS // Renew and redraw all enabled progress strings void MarlinUI::rotate_progress() { @@ -1903,7 +1904,7 @@ uint8_t expand_u8str_P(char * const outstr, PGM_P const ptpl, const int8_t ind, } } - #endif // LCD_WITH_BLINK && HAS_EXTRA_PROGRESS + #endif // HAS_ROTATE_PROGRESS #endif // HAS_PRINT_PROGRESS diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h index 578d143d96..adfecdbaf5 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -95,6 +95,10 @@ typedef bool (*statusResetFunc_t)(); #define LCD_UPDATE_INTERVAL DIV_TERN(DOUBLE_LCD_FRAMERATE, TERN(HAS_TOUCH_BUTTONS, 50, 100), 2) #endif +#if LCD_WITH_BLINK && HAS_EXTRA_PROGRESS && !IS_DWIN_MARLINUI + #define HAS_ROTATE_PROGRESS 1 +#endif + #if HAS_MARLINUI_U8GLIB enum MarlinFont : uint8_t { FONT_STATUSMENU = 1, @@ -347,7 +351,7 @@ public: FORCE_INLINE static uint16_t get_progress_permyriad() { return _get_progress(); } #endif static uint8_t get_progress_percent() { return uint8_t(_get_progress() / (PROGRESS_SCALE)); } - #if LCD_WITH_BLINK && HAS_EXTRA_PROGRESS + #if HAS_ROTATE_PROGRESS #if ENABLED(SHOW_PROGRESS_PERCENT) static void drawPercent(); #endif