3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not disable bed heating, when the print is paused.

Browse source 
Also remove duplicate handleSafetyTimer() call.
This commit is contained in:
Marek Bel 2018-05-04 15:21:22 +02:00
parent 777beac66a
commit c359d11858
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Firmware/Marlin_main.cpp
View file

@ -7132,6 +7132,8 @@ void handle_status_leds(void) {
* @brief Turn off heating after 30 minutes of inactivity * @brief Turn off heating after 30 minutes of inactivity
* *
* Full screen blocking notification message is shown after heater turning off. * Full screen blocking notification message is shown after heater turning off.
* Paused print is not considered inactivity, as nozzle is cooled anyway and bed cooling would
* damage print.
*/ */
static void handleSafetyTimer() static void handleSafetyTimer()
{ {
@ -7139,8 +7141,8 @@ static void handleSafetyTimer()
#error Implemented only for one extruder. #error Implemented only for one extruder.
#endif //(EXTRUDERS > 1) #endif //(EXTRUDERS > 1)
static Timer safetyTimer; static Timer safetyTimer;
if (IS_SD_PRINTING || is_usb_printing || (custom_message_type == 4) || (lcd_commands_type == LCD_COMMAND_V2_CAL) || if (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == 4)
(!degTargetBed() && !degTargetHotend(0))) || (lcd_commands_type == LCD_COMMAND_V2_CAL) || (!degTargetBed() && !degTargetHotend(0)))
{ {
safetyTimer.stop(); safetyTimer.stop();
} }
@ -7199,11 +7201,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
fsensor_autoload_check_stop(); fsensor_autoload_check_stop();
#endif //PAT9125 #endif //PAT9125
#ifdef SAFETYTIMER
handleSafetyTimer();
#endif //SAFETYTIMER
#ifdef SAFETYTIMER #ifdef SAFETYTIMER
handleSafetyTimer(); handleSafetyTimer();
#endif //SAFETYTIMER #endif //SAFETYTIMER