Browse Source

🐛 No probe enum for DELTA + SENSORLESS_PROBING

Fix #22729
vanilla_fb_2.0.x
Scott Lahteine 3 years ago
parent
commit
d6a87aa75b
  1. 5
      Marlin/src/inc/Conditionals_LCD.h
  2. 2
      Marlin/src/module/endstops.h

5
Marlin/src/inc/Conditionals_LCD.h

@ -931,7 +931,10 @@
#if DISABLED(NOZZLE_AS_PROBE) #if DISABLED(NOZZLE_AS_PROBE)
#define HAS_PROBE_XY_OFFSET 1 #define HAS_PROBE_XY_OFFSET 1
#endif #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 #define USES_Z_MIN_PROBE_PIN 1
#endif #endif
#if Z_HOME_TO_MIN && TERN1(USES_Z_MIN_PROBE_PIN, ENABLED(USE_PROBE_FOR_Z_HOMING)) #if Z_HOME_TO_MIN && TERN1(USES_Z_MIN_PROBE_PIN, ENABLED(USE_PROBE_FOR_Z_HOMING))

2
Marlin/src/module/endstops.h

@ -59,7 +59,9 @@ enum EndstopEnum : char {
_ES_ITEM(HAS_Z4_MAX, Z4_MAX) _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) // Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
#if !HAS_DELTA_SENSORLESS_PROBING
_ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN)) _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
#endif
// The total number of states // The total number of states
NUM_ENDSTOP_STATES NUM_ENDSTOP_STATES

Loading…
Cancel
Save