🐛 No probe enum for DELTA + SENSORLESS_PROBING

Fix MarlinFirmware#22729
AlexColello · Jan 14, 2022 · 085ff51 · 085ff51
1 parent 4654a2d
commit 085ff51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
@@ -931,7 +931,10 @@
  #if DISABLED(NOZZLE_AS_PROBE)
  #define HAS_PROBE_XY_OFFSET 1
  #endif
- #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && !BOTH(DELTA, SENSORLESS_PROBING)
+ #if BOTH(DELTA, SENSORLESS_PROBING)
+ #define HAS_DELTA_SENSORLESS_PROBING 1
+ #endif
+ #if NONE(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, HAS_DELTA_SENSORLESS_PROBING)
  #define USES_Z_MIN_PROBE_PIN 1
  #endif
  #if Z_HOME_TO_MIN && TERN1(USES_Z_MIN_PROBE_PIN, ENABLED(USE_PROBE_FOR_Z_HOMING))

diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
@@ -59,7 +59,9 @@ enum EndstopEnum : char {
  _ES_ITEM(HAS_Z4_MAX, Z4_MAX)
 
  // Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
- _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
+ #if !HAS_DELTA_SENSORLESS_PROBING
+ _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
+ #endif
 
  // The total number of states
  NUM_ENDSTOP_STATES