diff --git a/Marlin/src/HAL/HC32/sysclock.cpp b/Marlin/src/HAL/HC32/sysclock.cpp index 3057da1a02b..475be3bbc9c 100644 --- a/Marlin/src/HAL/HC32/sysclock.cpp +++ b/Marlin/src/HAL/HC32/sysclock.cpp @@ -97,7 +97,7 @@ void core_hook_sysclock_init() { #endif // sysclk is now configured according to F_CPU (i.e., 200MHz PLL output) - constexpr uint32_t sysclock = F_CPU; + const uint32_t sysclock = F_CPU; // Setup clock divisors for sysclk = 200 MHz // Note: PCLK1 is used for step+temp timers, and need to be kept at 50 MHz (until there is a better solution) diff --git a/Marlin/src/feature/leds/pca9632.cpp b/Marlin/src/feature/leds/pca9632.cpp index 07c379a8154..40c16a9276a 100644 --- a/Marlin/src/feature/leds/pca9632.cpp +++ b/Marlin/src/feature/leds/pca9632.cpp @@ -148,7 +148,7 @@ void PCA9632_set_led_color(const LEDColor &color) { #if ENABLED(PCA9632_BUZZER) - void PCA9632_buzz(const long, const uint16_t=0) { + void PCA9632_buzz(const long, const uint16_t/*=0*/) { uint8_t data[] = PCA9632_BUZZER_DATA; Wire.beginTransmission(I2C_ADDRESS(PCA9632_ADDRESS)); Wire.write(data, sizeof(data)); diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp index 435f40e3a4a..071a88e4753 100644 --- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp +++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp @@ -833,8 +833,6 @@ void MarlinUI::draw_status_message(const bool blink) { #if HAS_PRINT_PROGRESS #define TPOFFSET (LCD_WIDTH - 1) - static uint8_t timepos = TPOFFSET - 6; - static char buffer[8]; #if ENABLED(SHOW_PROGRESS_PERCENT) static lcd_uint_t pc = 0, pr = 2; @@ -853,8 +851,9 @@ void MarlinUI::draw_status_message(const bool blink) { #if ENABLED(SHOW_REMAINING_TIME) void MarlinUI::drawRemain() { if (printJobOngoing()) { + char buffer[8]; const duration_t remaint = get_remaining_time(); - timepos = TPOFFSET - remaint.toDigital(buffer); + const uint8_t timepos = TPOFFSET - remaint.toDigital(buffer); IF_DISABLED(LCD_INFO_SCREEN_STYLE, lcd_put_lchar(timepos - 1, 2, 0x20)); lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'R'); lcd_put_u8str(buffer); @@ -866,7 +865,8 @@ void MarlinUI::draw_status_message(const bool blink) { void MarlinUI::drawInter() { const duration_t interactt = interaction_time; if (printingIsActive() && interactt.value) { - timepos = TPOFFSET - interactt.toDigital(buffer); + char buffer[8]; + const uint8_t timepos = TPOFFSET - interactt.toDigital(buffer); IF_DISABLED(LCD_INFO_SCREEN_STYLE, lcd_put_lchar(timepos - 1, 2, 0x20)); lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'C'); lcd_put_u8str(buffer); @@ -877,8 +877,9 @@ void MarlinUI::draw_status_message(const bool blink) { #if ENABLED(SHOW_ELAPSED_TIME) void MarlinUI::drawElapsed() { if (printJobOngoing()) { + char buffer[8]; const duration_t elapsedt = print_job_timer.duration(); - timepos = TPOFFSET - elapsedt.toDigital(buffer); + const uint8_t timepos = TPOFFSET - elapsedt.toDigital(buffer); IF_DISABLED(LCD_INFO_SCREEN_STYLE, lcd_put_lchar(timepos - 1, 2, 0x20)); lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'E'); lcd_put_u8str(buffer); diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp index eb4ce135db3..6a80044a34d 100644 --- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp +++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp @@ -601,7 +601,6 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const #if HAS_PRINT_PROGRESS // UNTESTED!!! #define TPOFFSET (LCD_WIDTH - 1) - static uint8_t timepos = TPOFFSET - 6; #if ENABLED(SHOW_PROGRESS_PERCENT) void MarlinUI::drawPercent() { @@ -619,7 +618,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const if (printJobOngoing()) { const duration_t remaint = ui.get_remaining_time(); char buffer[10]; - timepos = TPOFFSET - remaint.toDigital(buffer); + const uint8_t timepos = TPOFFSET - remaint.toDigital(buffer); lcd_moveto(timepos, 1); lcd.write('R'); lcd.print(buffer); @@ -631,7 +630,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const const duration_t interactt = ui.interaction_time; if (printingIsActive() && interactt.value) { char buffer[10]; - timepos = TPOFFSET - interactt.toDigital(buffer); + const uint8_t timepos = TPOFFSET - interactt.toDigital(buffer); lcd_moveto(timepos, 1); lcd.write('C'); lcd.print(buffer); @@ -643,7 +642,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const if (printJobOngoing()) { const duration_t elapsedt = print_job_timer.duration(); char buffer[10]; - timepos = TPOFFSET - elapsedt.toDigital(buffer); + const uint8_t timepos = TPOFFSET - elapsedt.toDigital(buffer); lcd_moveto(timepos, 1); lcd.write('E'); lcd.print(buffer); diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp index d408b49e83f..a0551fa28c3 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp @@ -804,13 +804,13 @@ void DGUSRxHandler::pidSetTemp(DGUS_VP &vp, void *data_ptr) { return; } - uint16_t temp = BE16_P(data_ptr); + celsius_t temp = BE16_P(data_ptr); switch (screen.pid_heater) { default: return; #if HAS_HEATED_BED case DGUS_Data::Heater::BED: - LIMIT(temp, BED_MINTEMP, BED_MAX_TARGET); + LIMIT(temp, celsius_t(BED_MINTEMP), celsius_t(BED_MAX_TARGET)); break; #endif #if HAS_HOTEND diff --git a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp index b7a27a253b3..400b2947018 100644 --- a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp +++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp @@ -68,7 +68,6 @@ enum { static void disp_key_value() { char *temp; - TERN_(HAS_TRINAMIC_CONFIG, float milliamps); switch (value) { default: break;