From 5d1e59cec3d79093e8bc6d69e2e5f77b609d3b84 Mon Sep 17 00:00:00 2001 From: Marek Bel <marek.bel@posta.cz> Date: Thu, 6 Sep 2018 13:20:24 +0200 Subject: [PATCH] Fix problem that nozzle temperature stays 0 if resume print is invoked from menu earlier than pause movements are finished. --- Firmware/Marlin_main.cpp | 3 --- Firmware/ultralcd.cpp | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 767ab8d5..6f9a6a0e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8122,9 +8122,6 @@ void long_pause() //long pause print if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 15, active_extruder); - //set nozzle target temperature to 0 - setAllTargetHotends(0); - //Move XY to side current_position[X_AXIS] = X_PAUSE_POS; current_position[Y_AXIS] = Y_PAUSE_POS; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c699a19f..3043dbe0 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1683,14 +1683,16 @@ void lcd_return_to_status() } -void lcd_pause_print() { - lcd_return_to_status(); - stop_and_save_print_to_ram(0.0,0.0); - isPrintPaused = true; - if (LCD_COMMAND_IDLE == lcd_commands_type) - { - lcd_commands_type = LCD_COMMAND_LONG_PAUSE; - } +void lcd_pause_print() +{ + lcd_return_to_status(); + stop_and_save_print_to_ram(0.0,0.0); + setAllTargetHotends(0); + isPrintPaused = true; + if (LCD_COMMAND_IDLE == lcd_commands_type) + { + lcd_commands_type = LCD_COMMAND_LONG_PAUSE; + } }