Skip to content

Commit 239d515

Browse files
committed
support up to 9 axes
1 parent 043b917 commit 239d515

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

Marlin/src/module/endstops.cpp

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -916,24 +916,13 @@ void Endstops::update() {
916916
// For G38 moves check the probe's pin for ALL movement
917917
if (G38_move && TEST_ENDSTOP(_ENDSTOP(Z, TERN(USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN))) == TERN1(G38_PROBE_AWAY, (G38_move < 4))) {
918918
G38_did_trigger = true;
919-
#if HAS_X_AXIS
920-
const bool xmoving = stepper.axis_is_moving(X_AXIS);
921-
#endif
922-
#if HAS_Y_AXIS
923-
const bool ymoving = stepper.axis_is_moving(Y_AXIS);
924-
#endif
925-
#if HAS_Z_AXIS
926-
const bool zmoving = stepper.axis_is_moving(Z_AXIS);
927-
#endif
928-
#if HAS_X_AXIS
929-
if (xmoving) { _ENDSTOP_HIT(X, ENDSTOP); planner.endstop_triggered(X_AXIS); }
930-
#endif
931-
#if HAS_Y_AXIS
932-
if (ymoving) { _ENDSTOP_HIT(Y, ENDSTOP); planner.endstop_triggered(Y_AXIS); }
933-
#endif
934-
#if HAS_Z_AXIS
935-
if (zmoving) { _ENDSTOP_HIT(Z, ENDSTOP); planner.endstop_triggered(Z_AXIS); }
936-
#endif
919+
const axis_bits_t moving = NUM_AXIS_ARRAY(
920+
stepper.axis_is_moving(X_AXIS), stepper.axis_is_moving(Y_AXIS), stepper.axis_is_moving(Z_AXIS),
921+
stepper.axis_is_moving(I_AXIS), stepper.axis_is_moving(J_AXIS), stepper.axis_is_moving(K_AXIS),
922+
stepper.axis_is_moving(U_AXIS), stepper.axis_is_moving(V_AXIS), stepper.axis_is_moving(W_AXIS)
923+
);
924+
#define _G38_RESP(Q) if (moving[_AXIS(Q)]) { _ENDSTOP_HIT(Q, ENDSTOP); planner.endstop_triggered(_AXIS(Q)); }
925+
MAIN_AXIS_MAP(_G38_RESP);
937926
}
938927
#endif
939928

0 commit comments

Comments
 (0)