|
|
@ -1132,7 +1132,12 @@ void refresh_cmd_timeout(void)
|
|
|
|
retracted=true;
|
|
|
|
retracted=true;
|
|
|
|
prepare_move();
|
|
|
|
prepare_move();
|
|
|
|
current_position[Z_AXIS]-=retract_zlift;
|
|
|
|
current_position[Z_AXIS]-=retract_zlift;
|
|
|
|
|
|
|
|
#ifdef DELTA
|
|
|
|
|
|
|
|
calculate_delta(current_position); // change cartesian kinematic to delta kinematic;
|
|
|
|
|
|
|
|
plan_set_position(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], current_position[E_AXIS]);
|
|
|
|
|
|
|
|
#else
|
|
|
|
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
|
|
|
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
prepare_move();
|
|
|
|
prepare_move();
|
|
|
|
feedrate = oldFeedrate;
|
|
|
|
feedrate = oldFeedrate;
|
|
|
|
} else if(!retracting && retracted) {
|
|
|
|
} else if(!retracting && retracted) {
|
|
|
@ -1141,7 +1146,12 @@ void refresh_cmd_timeout(void)
|
|
|
|
destination[Z_AXIS]=current_position[Z_AXIS];
|
|
|
|
destination[Z_AXIS]=current_position[Z_AXIS];
|
|
|
|
destination[E_AXIS]=current_position[E_AXIS];
|
|
|
|
destination[E_AXIS]=current_position[E_AXIS];
|
|
|
|
current_position[Z_AXIS]+=retract_zlift;
|
|
|
|
current_position[Z_AXIS]+=retract_zlift;
|
|
|
|
|
|
|
|
#ifdef DELTA
|
|
|
|
|
|
|
|
calculate_delta(current_position); // change cartesian kinematic to delta kinematic;
|
|
|
|
|
|
|
|
plan_set_position(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], current_position[E_AXIS]);
|
|
|
|
|
|
|
|
#else
|
|
|
|
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
|
|
|
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
//prepare_move();
|
|
|
|
//prepare_move();
|
|
|
|
current_position[E_AXIS]-=(retract_length+retract_recover_length)/volumetric_multiplier[active_extruder];
|
|
|
|
current_position[E_AXIS]-=(retract_length+retract_recover_length)/volumetric_multiplier[active_extruder];
|
|
|
|
plan_set_e_position(current_position[E_AXIS]);
|
|
|
|
plan_set_e_position(current_position[E_AXIS]);
|
|
|
|