Skip to content

Commit 4763116

Browse files
committed
🐛 Trigger existing endstops on G38 hit
1 parent 185e0dc commit 4763116

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Marlin/src/module/endstops.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -932,9 +932,13 @@ void Endstops::update() {
932932
#endif
933933
// If G38 command is active check Z_MIN_PROBE for ALL movement
934934
if (G38_move && TEST_ENDSTOP(_ENDSTOP(Z, MIN_PROBE)) != _G38_OPEN_STATE) {
935-
if (stepper.axis_is_moving(X_AXIS)) { _ENDSTOP_HIT(X, MIN); planner.endstop_triggered(X_AXIS); }
936-
else if (stepper.axis_is_moving(Y_AXIS)) { _ENDSTOP_HIT(Y, MIN); planner.endstop_triggered(Y_AXIS); }
937-
else if (stepper.axis_is_moving(Z_AXIS)) { _ENDSTOP_HIT(Z, MIN); planner.endstop_triggered(Z_AXIS); }
935+
if (stepper.axis_is_moving(X_AXIS)) { _ENDSTOP_HIT(X, TERN(X_HOME_TO_MIN, MIN, MAX)); planner.endstop_triggered(X_AXIS); }
936+
#if HAS_Y_AXIS
937+
else if (stepper.axis_is_moving(Y_AXIS)) { _ENDSTOP_HIT(Y, TERN(Y_HOME_TO_MIN, MIN, MAX)); planner.endstop_triggered(Y_AXIS); }
938+
#endif
939+
#if HAS_Z_AXIS
940+
else if (stepper.axis_is_moving(Z_AXIS)) { _ENDSTOP_HIT(Z, TERN(Z_HOME_TO_MIN, MIN, MAX)); planner.endstop_triggered(Z_AXIS); }
941+
#endif
938942
G38_did_trigger = true;
939943
}
940944
#endif

0 commit comments

Comments
 (0)