Sfoglia il codice sorgente

Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking)

・Add more "UL" suffix
・Restore removed "UL" suffix
esenapaj 8 anni fa
parent
commit
832e1c1f2a

+ 1
- 1
Marlin/dogm_lcd_implementation.h Vedi File

@@ -459,7 +459,7 @@ static void lcd_implementation_status_screen() {
459 459
   #if DISABLED(FILAMENT_LCD_DISPLAY)
460 460
     lcd_print(lcd_status_message);
461 461
   #else
462
-    if (PENDING(millis(), previous_lcd_status_ms + 5000)) {  //Display both Status message line and Filament display on the last line
462
+    if (PENDING(millis(), previous_lcd_status_ms + 5000UL)) {  //Display both Status message line and Filament display on the last line
463 463
       lcd_print(lcd_status_message);
464 464
     }
465 465
     else {

+ 1
- 1
Marlin/temperature.cpp Vedi File

@@ -1105,7 +1105,7 @@ void tp_init() {
1105 1105
   void start_watching_heater(int e) {
1106 1106
     if (degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1)) {
1107 1107
       watch_target_temp[e] = degHotend(e) + WATCH_TEMP_INCREASE;
1108
-      watch_heater_next_ms[e] = millis() + (WATCH_TEMP_PERIOD) * 1000;
1108
+      watch_heater_next_ms[e] = millis() + (WATCH_TEMP_PERIOD) * 1000UL;
1109 1109
     }
1110 1110
     else
1111 1111
       watch_heater_next_ms[e] = 0;

+ 1
- 1
Marlin/ultralcd_implementation_hitachi_HD44780.h Vedi File

@@ -791,7 +791,7 @@ static void lcd_implementation_status_screen() {
791 791
 
792 792
     // Show Filament Diameter and Volumetric Multiplier %
793 793
     // After allowing lcd_status_message to show for 5 seconds
794
-    if (ELAPSED(millis(), previous_lcd_status_ms + 5000)) {
794
+    if (ELAPSED(millis(), previous_lcd_status_ms + 5000UL)) {
795 795
       lcd_printPGM(PSTR("Dia "));
796 796
       lcd.print(ftostr12ns(filament_width_meas));
797 797
       lcd_printPGM(PSTR(" V"));

Loading…
Annulla
Salva