Merge pull request #9392 from studiodyne/studiodyne-pause

[2.0.x] Pause resuming fix
This commit is contained in:
Scott Lahteine 2018-02-01 23:32:24 -06:00 committed by GitHub
commit ea5f91737f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -485,10 +485,9 @@ void resume_print(const float &load_length/*=0*/, const float &purge_length/*=AD
// If retracted before goto pause // If retracted before goto pause
if (fwretract.retracted[active_extruder]) if (fwretract.retracted[active_extruder])
do_pause_e_move(-fwretract.retract_length, fwretract.retract_feedrate_mm_s); do_pause_e_move(-fwretract.retract_length, fwretract.retract_feedrate_mm_s);
#else
// If resume_position is negative
if (resume_position[E_AXIS] < 0) do_pause_e_move(resume_position[E_AXIS], PAUSE_PARK_RETRACT_FEEDRATE);
#endif #endif
// If resume_position is negative
if (resume_position[E_AXIS] < 0) do_pause_e_move(resume_position[E_AXIS], PAUSE_PARK_RETRACT_FEEDRATE);
// 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);