MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix resume_print positioning

Browse Source
This commit is contained in:
Scott Lahteine 2018-01-03 20:12:44 -06:00
parent d3139e47f8
commit a436e89b83
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@ -6783,14 +6783,26 @@ inline void gcode_M17() {
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_RESUME); lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_RESUME);
#endif #endif
// Set extruder to saved position // Intelligent resuming
destination[E_AXIS] = current_position[E_AXIS] = resume_position[E_AXIS]; #if ENABLED(FWRETRACT)
planner.set_e_position_mm(current_position[E_AXIS]); // If retracted before goto pause
if (retracted[active_extruder])
do_pause_e_move(-retract_length, retract_feedrate_mm_s);
#else
// If resume_position negative
if (resume_position[E_AXIS] < 0) do_pause_e_move(resume_position[E_AXIS], PAUSE_PARK_RETRACT_FEEDRATE);
#endif
// Move XY to starting position, then Z // Move XY to starting position, then Z
do_blocking_move_to_xy(resume_position[X_AXIS], resume_position[Y_AXIS], NOZZLE_PARK_XY_FEEDRATE); do_blocking_move_to_xy(resume_position[X_AXIS], resume_position[Y_AXIS], NOZZLE_PARK_XY_FEEDRATE);
// Set Z_AXIS to saved position
do_blocking_move_to_z(resume_position[Z_AXIS], NOZZLE_PARK_Z_FEEDRATE); do_blocking_move_to_z(resume_position[Z_AXIS], NOZZLE_PARK_Z_FEEDRATE);
// Now all extrusion positions are resumed and ready to be confirmed
// Set extruder to saved position
planner.set_e_position_mm((destination[E_AXIS] = current_position[E_AXIS] = resume_position[E_AXIS]));
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
filament_ran_out = false; filament_ran_out = false;
#endif #endif