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

Unretract when resuming a paused print

This commit is contained in:
Yuri D'Elia 2019-12-14 18:05:08 +01:00
parent 955c88cf68
commit 0cc68228f8
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/Marlin.h
View File

@ -308,6 +308,7 @@ extern float max_pos[3];
extern bool axis_known_position[3]; extern bool axis_known_position[3];
extern int fanSpeed; extern int fanSpeed;
extern int8_t lcd_change_fil_state; extern int8_t lcd_change_fil_state;
extern float default_retraction;
#ifdef TMC2130 #ifdef TMC2130
void homeaxis(int axis, uint8_t cnt = 1, uint8_t* pstep = 0); void homeaxis(int axis, uint8_t cnt = 1, uint8_t* pstep = 0);

4
Firmware/Marlin_main.cpp
View File

@ -9571,10 +9571,6 @@ void long_pause() //long pause print
// Stop heaters // Stop heaters
setAllTargetHotends(0); setAllTargetHotends(0);
//retract
current_position[E_AXIS] -= default_retraction;
plan_buffer_line_curposXYZE(400, active_extruder);
//lift z //lift z
current_position[Z_AXIS] += Z_PAUSE_LIFT; current_position[Z_AXIS] += Z_PAUSE_LIFT;
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;

4
Firmware/ultralcd.cpp
View File

@ -1662,7 +1662,7 @@ void lcd_return_to_status()
//! @brief Pause print, disable nozzle heater, move to park position //! @brief Pause print, disable nozzle heater, move to park position
void lcd_pause_print() void lcd_pause_print()
{ {
stop_and_save_print_to_ram(0.0,0.0); stop_and_save_print_to_ram(0.0, -default_retraction);
lcd_return_to_status(); lcd_return_to_status();
isPrintPaused = true; isPrintPaused = true;
if (LcdCommands::Idle == lcd_commands_type) if (LcdCommands::Idle == lcd_commands_type)
@ -6771,7 +6771,7 @@ void lcd_resume_print()
if (fan_error_selftest()) return; //abort if error persists if (fan_error_selftest()) return; //abort if error persists
isPrintPaused = false; isPrintPaused = false;
restore_print_from_ram_and_continue(0.0); restore_print_from_ram_and_continue(default_retraction);
pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation
refresh_cmd_timeout(); refresh_cmd_timeout();
SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_RESUMED); //resume octoprint SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_RESUMED); //resume octoprint