浏览代码

Merge pull request #3522 from esenapaj/patch-1

Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking)
Scott Lahteine 9 年前
父节点
当前提交
0fc84b75f4
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1
    1
      Marlin/dogm_lcd_implementation.h
  2. 1
    1
      Marlin/temperature.cpp
  3. 1
    1
      Marlin/ultralcd_implementation_hitachi_HD44780.h

+ 1
- 1
Marlin/dogm_lcd_implementation.h 查看文件

459
   #if DISABLED(FILAMENT_LCD_DISPLAY)
459
   #if DISABLED(FILAMENT_LCD_DISPLAY)
460
     lcd_print(lcd_status_message);
460
     lcd_print(lcd_status_message);
461
   #else
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
       lcd_print(lcd_status_message);
463
       lcd_print(lcd_status_message);
464
     }
464
     }
465
     else {
465
     else {

+ 1
- 1
Marlin/temperature.cpp 查看文件

1105
   void start_watching_heater(int e) {
1105
   void start_watching_heater(int e) {
1106
     if (degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1)) {
1106
     if (degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1)) {
1107
       watch_target_temp[e] = degHotend(e) + WATCH_TEMP_INCREASE;
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
     else
1110
     else
1111
       watch_heater_next_ms[e] = 0;
1111
       watch_heater_next_ms[e] = 0;

+ 1
- 1
Marlin/ultralcd_implementation_hitachi_HD44780.h 查看文件

791
 
791
 
792
     // Show Filament Diameter and Volumetric Multiplier %
792
     // Show Filament Diameter and Volumetric Multiplier %
793
     // After allowing lcd_status_message to show for 5 seconds
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
       lcd_printPGM(PSTR("Dia "));
795
       lcd_printPGM(PSTR("Dia "));
796
       lcd.print(ftostr12ns(filament_width_meas));
796
       lcd.print(ftostr12ns(filament_width_meas));
797
       lcd_printPGM(PSTR(" V"));
797
       lcd_printPGM(PSTR(" V"));

正在加载...
取消
保存