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

Merge pull request #1323 from PavelSindler/MK3_for_merging

Browse Source 
resume print fix: never disable steppers when preheating nozzle
This commit is contained in:
mkbel 2018-11-09 18:45:26 +01:00 committed by GitHub
commit 3189fcb8de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/Marlin_main.cpp
View File

@ -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

1
Firmware/ultralcd.cpp
View File

@ -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;
}