0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3522 from esenapaj/patch-1

Browse source 
Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking)
This commit is contained in:
Scott Lahteine 2016-04-16 19:03:27 -07:00
parent 04fdb4de7d 832e1c1f2a
commit 0fc84b75f4
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/dogm_lcd_implementation.h
View file

@ -459,7 +459,7 @@ static void lcd_implementation_status_screen() {
#if DISABLED(FILAMENT_LCD_DISPLAY) #if DISABLED(FILAMENT_LCD_DISPLAY)
lcd_print(lcd_status_message); lcd_print(lcd_status_message);
#else #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); lcd_print(lcd_status_message);
} }
else { else {

2
Marlin/temperature.cpp
View file

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

2
Marlin/ultralcd_implementation_hitachi_HD44780.h
View file

@ -791,7 +791,7 @@ static void lcd_implementation_status_screen() {
// Show Filament Diameter and Volumetric Multiplier % // Show Filament Diameter and Volumetric Multiplier %
// After allowing lcd_status_message to show for 5 seconds // 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_printPGM(PSTR("Dia "));
lcd.print(ftostr12ns(filament_width_meas)); lcd.print(ftostr12ns(filament_width_meas));
lcd_printPGM(PSTR(" V")); lcd_printPGM(PSTR(" V"));