Skip to content

Commit ae41811

Browse files
thinkyheadDarred
authored andcommitted
🐛 No probe enum for DELTA + SENSORLESS_PROBING
Fix MarlinFirmware#22729
1 parent c41f2e7 commit ae41811

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Marlin/src/inc/Conditionals_LCD.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,10 @@
931931
#if DISABLED(NOZZLE_AS_PROBE)
932932
#define HAS_PROBE_XY_OFFSET 1
933933
#endif
934-
#if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && !BOTH(DELTA, SENSORLESS_PROBING)
934+
#if BOTH(DELTA, SENSORLESS_PROBING)
935+
#define HAS_DELTA_SENSORLESS_PROBING 1
936+
#endif
937+
#if NONE(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, HAS_DELTA_SENSORLESS_PROBING)
935938
#define USES_Z_MIN_PROBE_PIN 1
936939
#endif
937940
#if Z_HOME_TO_MIN && TERN1(USES_Z_MIN_PROBE_PIN, ENABLED(USE_PROBE_FOR_Z_HOMING))

Marlin/src/module/endstops.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ enum EndstopEnum : char {
5959
_ES_ITEM(HAS_Z4_MAX, Z4_MAX)
6060

6161
// Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
62-
_ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
62+
#if !HAS_DELTA_SENSORLESS_PROBING
63+
_ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
64+
#endif
6365

6466
// The total number of states
6567
NUM_ENDSTOP_STATES

0 commit comments

Comments
 (0)