Parcourir la source

🐛 No probe enum for DELTA + SENSORLESS_PROBING

Fix #22729
Scott Lahteine il y a 3 ans
Parent
révision
011329fe55
2 fichiers modifiés avec 7 ajouts et 2 suppressions
  1. 4
    1
      Marlin/src/inc/Conditionals_LCD.h
  2. 3
    1
      Marlin/src/module/endstops.h

+ 4
- 1
Marlin/src/inc/Conditionals_LCD.h Voir le fichier

@@ -931,7 +931,10 @@
931 931
   #if DISABLED(NOZZLE_AS_PROBE)
932 932
     #define HAS_PROBE_XY_OFFSET 1
933 933
   #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)
935 938
     #define USES_Z_MIN_PROBE_PIN 1
936 939
   #endif
937 940
   #if Z_HOME_TO_MIN && TERN1(USES_Z_MIN_PROBE_PIN, ENABLED(USE_PROBE_FOR_Z_HOMING))

+ 3
- 1
Marlin/src/module/endstops.h Voir le fichier

@@ -59,7 +59,9 @@ enum EndstopEnum : char {
59 59
   _ES_ITEM(HAS_Z4_MAX, Z4_MAX)
60 60
 
61 61
   // 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
63 65
 
64 66
   // The total number of states
65 67
   NUM_ENDSTOP_STATES

Chargement…
Annuler
Enregistrer