From c991c8b31487d935707751a2356ae2bab0a10e0b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 9 Nov 2018 18:29:35 +0100 Subject: [PATCH 1/2] resume print fix: wait for heater() never disable steppers --- Firmware/Marlin_main.cpp | 3 +-- Firmware/ultralcd.cpp | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 7e9da1c1..ffa12d38 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7457,7 +7457,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s { if(blocks_queued() == false && ignore_stepper_queue == false) { disable_x(); -// SERIAL_ECHOLNPGM("manage_inactivity - disable Y"); disable_y(); disable_z(); disable_e0(); @@ -7791,7 +7790,7 @@ static void wait_for_heater(long codenum, uint8_t extruder) { codenum = millis(); } manage_heater(); - manage_inactivity(); + manage_inactivity(true); //do not disable steppers lcd_update(0); #ifdef TEMP_RESIDENCY_TIME /* start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 311d72ca..c2d8f885 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5677,6 +5677,7 @@ void lcd_resume_print() lcd_reset_alert_level(); //for fan speed error restore_print_from_ram_and_continue(0.0); pause_time += (millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation + refresh_cmd_timeout(); isPrintPaused = false; } From 5931d15566d8ecaabae850406c5949d5751efe36 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 9 Nov 2018 18:31:28 +0100 Subject: [PATCH 2/2] whitespace --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c2d8f885..7ff77937 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5677,7 +5677,7 @@ void lcd_resume_print() lcd_reset_alert_level(); //for fan speed error restore_print_from_ram_and_continue(0.0); pause_time += (millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation - refresh_cmd_timeout(); + refresh_cmd_timeout(); isPrintPaused = false; }