From 832e1c1f2a8db7d8495e8c5f72142c0cfdc577fa Mon Sep 17 00:00:00 2001 From: esenapaj Date: Sun, 17 Apr 2016 07:50:02 +0900 Subject: [PATCH] Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・Add more "UL" suffix ・Restore removed "UL" suffix --- Marlin/dogm_lcd_implementation.h | 2 +- Marlin/temperature.cpp | 2 +- Marlin/ultralcd_implementation_hitachi_HD44780.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 90b0e6872..b22a1ed67 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -459,7 +459,7 @@ static void lcd_implementation_status_screen() { #if DISABLED(FILAMENT_LCD_DISPLAY) lcd_print(lcd_status_message); #else - if (PENDING(millis(), previous_lcd_status_ms + 5000)) { //Display both Status message line and Filament display on the last line + if (PENDING(millis(), previous_lcd_status_ms + 5000UL)) { //Display both Status message line and Filament display on the last line lcd_print(lcd_status_message); } else { diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 0975e4faf..8b0364c9c 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -1105,7 +1105,7 @@ void tp_init() { void start_watching_heater(int e) { if (degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1)) { watch_target_temp[e] = degHotend(e) + WATCH_TEMP_INCREASE; - watch_heater_next_ms[e] = millis() + (WATCH_TEMP_PERIOD) * 1000; + watch_heater_next_ms[e] = millis() + (WATCH_TEMP_PERIOD) * 1000UL; } else watch_heater_next_ms[e] = 0; diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h index 7c2d76223..96870c975 100644 --- a/Marlin/ultralcd_implementation_hitachi_HD44780.h +++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h @@ -791,7 +791,7 @@ static void lcd_implementation_status_screen() { // Show Filament Diameter and Volumetric Multiplier % // After allowing lcd_status_message to show for 5 seconds - if (ELAPSED(millis(), previous_lcd_status_ms + 5000)) { + if (ELAPSED(millis(), previous_lcd_status_ms + 5000UL)) { lcd_printPGM(PSTR("Dia ")); lcd.print(ftostr12ns(filament_width_meas)); lcd_printPGM(PSTR(" V"));