🔨 Solve a linker error
Some checks are pending
CI - Build Tests / Build Test (push) Waiting to run
CI - Unit Tests / Unit Test (push) Waiting to run

Fixes #27864
This commit is contained in:
Scott Lahteine 2025-05-19 19:36:20 -05:00
parent 3cd945ab5d
commit af553d5fbd
2 changed files with 11 additions and 6 deletions

View file

@ -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

View file

@ -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