Browse Source

🐛 Fix DELTA with SENSORLESS_PROBING

Scott Lahteine 4 years ago
parent
commit
0dae140080
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/src/inc/Conditionals_LCD.h
  2. 1
    1
      Marlin/src/module/probe.cpp

+ 1
- 1
Marlin/src/inc/Conditionals_LCD.h View File

@@ -818,7 +818,7 @@
818 818
   #if DISABLED(NOZZLE_AS_PROBE)
819 819
     #define HAS_PROBE_XY_OFFSET 1
820 820
   #endif
821
-  #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
821
+  #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && !BOTH(DELTA, SENSORLESS_PROBING)
822 822
     #define HAS_CUSTOM_PROBE_PIN 1
823 823
   #endif
824 824
   #if Z_HOME_DIR < 0 && (!HAS_CUSTOM_PROBE_PIN || ENABLED(USE_PROBE_FOR_Z_HOMING))

+ 1
- 1
Marlin/src/module/probe.cpp View File

@@ -507,7 +507,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
507 507
   // Check to see if the probe was triggered
508 508
   const bool probe_triggered =
509 509
     #if BOTH(DELTA, SENSORLESS_PROBING)
510
-      endstops.trigger_state() & (_BV(X_MIN) | _BV(Y_MIN) | _BV(Z_MIN))
510
+      endstops.trigger_state() & (_BV(X_MAX) | _BV(Y_MAX) | _BV(Z_MAX))
511 511
     #else
512 512
       TEST(endstops.trigger_state(), TERN(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, Z_MIN, Z_MIN_PROBE))
513 513
     #endif

Loading…
Cancel
Save