|
|
|
@ -1369,28 +1369,34 @@ void homeaxis(const AxisEnum axis) {
|
|
|
|
|
#if ENABLED(X_DUAL_ENDSTOPS)
|
|
|
|
|
if (axis == X_AXIS) {
|
|
|
|
|
const float adj = ABS(endstops.x_endstop_adj);
|
|
|
|
|
if (pos_dir ? (endstops.x_endstop_adj > 0) : (endstops.x_endstop_adj < 0)) stepper.set_x_lock(true); else stepper.set_x2_lock(true);
|
|
|
|
|
do_homing_move(axis, pos_dir ? -adj : adj);
|
|
|
|
|
stepper.set_x_lock(false);
|
|
|
|
|
stepper.set_x2_lock(false);
|
|
|
|
|
if (adj) {
|
|
|
|
|
if (pos_dir ? (endstops.x_endstop_adj > 0) : (endstops.x_endstop_adj < 0)) stepper.set_x_lock(true); else stepper.set_x2_lock(true);
|
|
|
|
|
do_homing_move(axis, pos_dir ? -adj : adj);
|
|
|
|
|
stepper.set_x_lock(false);
|
|
|
|
|
stepper.set_x2_lock(false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
#if ENABLED(Y_DUAL_ENDSTOPS)
|
|
|
|
|
if (axis == Y_AXIS) {
|
|
|
|
|
const float adj = ABS(endstops.y_endstop_adj);
|
|
|
|
|
if (pos_dir ? (endstops.y_endstop_adj > 0) : (endstops.y_endstop_adj < 0)) stepper.set_y_lock(true); else stepper.set_y2_lock(true);
|
|
|
|
|
do_homing_move(axis, pos_dir ? -adj : adj);
|
|
|
|
|
stepper.set_y_lock(false);
|
|
|
|
|
stepper.set_y2_lock(false);
|
|
|
|
|
if (adj) {
|
|
|
|
|
if (pos_dir ? (endstops.y_endstop_adj > 0) : (endstops.y_endstop_adj < 0)) stepper.set_y_lock(true); else stepper.set_y2_lock(true);
|
|
|
|
|
do_homing_move(axis, pos_dir ? -adj : adj);
|
|
|
|
|
stepper.set_y_lock(false);
|
|
|
|
|
stepper.set_y2_lock(false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
|
|
|
|
if (axis == Z_AXIS) {
|
|
|
|
|
const float adj = ABS(endstops.z_endstop_adj);
|
|
|
|
|
if (pos_dir ? (endstops.z_endstop_adj > 0) : (endstops.z_endstop_adj < 0)) stepper.set_z_lock(true); else stepper.set_z2_lock(true);
|
|
|
|
|
do_homing_move(axis, pos_dir ? -adj : adj);
|
|
|
|
|
stepper.set_z_lock(false);
|
|
|
|
|
stepper.set_z2_lock(false);
|
|
|
|
|
if (adj) {
|
|
|
|
|
if (pos_dir ? (endstops.z_endstop_adj > 0) : (endstops.z_endstop_adj < 0)) stepper.set_z_lock(true); else stepper.set_z2_lock(true);
|
|
|
|
|
do_homing_move(axis, pos_dir ? -adj : adj);
|
|
|
|
|
stepper.set_z_lock(false);
|
|
|
|
|
stepper.set_z2_lock(false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
stepper.set_homing_dual_axis(false);
|
|
|
|
|