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

Fix problem that nozzle temperature stays 0 if resume print is invoked from menu earlier than pause movements are finished.

This commit is contained in:
Marek Bel 2018-09-06 13:20:24 +02:00
parent 0fe48de4af
commit 5d1e59cec3
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/Marlin_main.cpp
View File

@ -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; 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); 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 //Move XY to side
current_position[X_AXIS] = X_PAUSE_POS; current_position[X_AXIS] = X_PAUSE_POS;
current_position[Y_AXIS] = Y_PAUSE_POS; current_position[Y_AXIS] = Y_PAUSE_POS;

18
Firmware/ultralcd.cpp
View File

@ -1683,14 +1683,16 @@ void lcd_return_to_status()
} }
void lcd_pause_print() { void lcd_pause_print()
lcd_return_to_status(); {
stop_and_save_print_to_ram(0.0,0.0); lcd_return_to_status();
isPrintPaused = true; stop_and_save_print_to_ram(0.0,0.0);
if (LCD_COMMAND_IDLE == lcd_commands_type) setAllTargetHotends(0);
{ isPrintPaused = true;
lcd_commands_type = LCD_COMMAND_LONG_PAUSE; if (LCD_COMMAND_IDLE == lcd_commands_type)
} {
lcd_commands_type = LCD_COMMAND_LONG_PAUSE;
}
} }