Pārlūkot izejas kodu

Provide a default for Z_PROBE_LOW_POINT

Scott Lahteine 6 gadus atpakaļ
vecāks
revīzija
d5ab4cd22a
1 mainītis faili ar 8 papildinājumiem un 4 dzēšanām
  1. 8
    4
      Marlin/src/inc/Conditionals_LCD.h

+ 8
- 4
Marlin/src/inc/Conditionals_LCD.h Parādīt failu

544
 #define HAS_BED_PROBE (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_PROBE || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE) || ENABLED(SENSORLESS_PROBING) || ENABLED(RACK_AND_PINION_PROBE))
544
 #define HAS_BED_PROBE (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_PROBE || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE) || ENABLED(SENSORLESS_PROBING) || ENABLED(RACK_AND_PINION_PROBE))
545
 #define PROBE_SELECTED (HAS_BED_PROBE || ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING))
545
 #define PROBE_SELECTED (HAS_BED_PROBE || ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING))
546
 
546
 
547
-#if !HAS_BED_PROBE
547
+#if HAS_BED_PROBE
548
+  #ifndef Z_PROBE_LOW_POINT
549
+    #define Z_PROBE_LOW_POINT -5
550
+  #endif
551
+  #if ENABLED(Z_PROBE_ALLEN_KEY)
552
+    #define PROBE_TRIGGERED_WHEN_STOWED_TEST // Extra test for Allen Key Probe
553
+  #endif
554
+#else
548
   // Clear probe pin settings when no probe is selected
555
   // Clear probe pin settings when no probe is selected
549
   #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
556
   #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
550
   #undef Z_MIN_PROBE_ENDSTOP
557
   #undef Z_MIN_PROBE_ENDSTOP
551
-#elif ENABLED(Z_PROBE_ALLEN_KEY)
552
-  // Extra test for Allen Key Probe
553
-  #define PROBE_TRIGGERED_WHEN_STOWED_TEST
554
 #endif
558
 #endif
555
 
559
 
556
 #define HOMING_Z_WITH_PROBE (HAS_BED_PROBE && Z_HOME_DIR < 0 && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))
560
 #define HOMING_Z_WITH_PROBE (HAS_BED_PROBE && Z_HOME_DIR < 0 && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))

Notiek ielāde…
Atcelt
Saglabāt