@@ -519,7 +519,7 @@ void Endstops::update() {
519
519
520
520
#if ENABLED(G38_PROBE_TARGET)
521
521
// For G38 moves check the probe's pin for ALL movement
522
- if (G38_move) UPDATE_ENDSTOP_BIT (Z, TERN (USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN) );
522
+ if (G38_move) UPDATE_ENDSTOP_BIT (Z, MIN_PROBE);
523
523
#endif
524
524
525
525
// With Dual X, endstops are only checked in the homing direction for the active extruder
@@ -624,8 +624,7 @@ void Endstops::update() {
624
624
625
625
#if HAS_BED_PROBE
626
626
// When closing the gap check the enabled probe
627
- if (probe_switch_activated ())
628
- UPDATE_ENDSTOP_BIT (Z, TERN (USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN));
627
+ if (probe_switch_activated ()) UPDATE_ENDSTOP_BIT (Z, MIN_PROBE);
629
628
#endif
630
629
631
630
#if HAS_Z_MAX && !Z_SPI_SENSORLESS
@@ -913,7 +912,7 @@ void Endstops::update() {
913
912
914
913
#if ENABLED(G38_PROBE_TARGET)
915
914
// For G38 moves check the probe's pin for ALL movement
916
- if (G38_move && TEST_ENDSTOP (_ENDSTOP (Z, TERN (USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN)) ) == TERN1 (G38_PROBE_AWAY, (G38_move < 4 ))) {
915
+ if (G38_move && TEST_ENDSTOP (Z_MIN_PROBE ) == TERN1 (G38_PROBE_AWAY, (G38_move < 4 ))) {
917
916
G38_did_trigger = true ;
918
917
#define _G38_SET (Q ) | (stepper.axis_is_moving(_AXIS(Q)) << _AXIS(Q))
919
918
#define _G38_RESP (Q ) if (moving[_AXIS(Q)]) { _ENDSTOP_HIT (Q, ENDSTOP); planner.endstop_triggered (_AXIS (Q)); }
0 commit comments