Support for manually deployed fixed probes (#11899)

2018-09-23 18:50:03 +02:00
parent ddcbf80f23
commit a4cdffdd69
79 changed files with 270 additions and 10 deletions
--- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h
+++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h
@@ -672,7 +672,11 @@
 #define X_MAX_ENDSTOP_INVERTING false  // set to true to invert the logic of the endstop.
 #define Y_MAX_ENDSTOP_INVERTING false  // set to true to invert the logic of the endstop.
 #define Z_MAX_ENDSTOP_INVERTING false  // set to true to invert the logic of the endstop.
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the probe.
+#if ANYCUBIC_PROBE_VERSION == 1
+  #define Z_MIN_PROBE_ENDSTOP_INVERTING false  // V1 Probe is NC
+#elif ANYCUBIC_PROBE_VERSION == 2
+  #define Z_MIN_PROBE_ENDSTOP_INVERTING true  // V2 Probe is NO
+#endif

 /**
 * Stepper Drivers
@@ -871,6 +875,9 @@
 */
 #if ANYCUBIC_PROBE_VERSION > 0
  #define FIX_MOUNTED_PROBE
+#if ENABLED(FIX_MOUNTED_PROBE)
+  #define MANUAL_DEPLOY_STOW
+#endif
 #endif

 /**
@@ -934,12 +941,12 @@
 #define X_PROBE_OFFSET_FROM_EXTRUDER 0     // X offset: -left  +right  [of the nozzle]
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0     // Y offset: -front +behind [the nozzle]

-#if ANYCUBIC_PROBE_VERSION == 0
-  #define Z_PROBE_OFFSET_FROM_EXTRUDER 0     // Z offset: -below +above  [the nozzle]
+#if ANYCUBIC_PROBE_VERSION == 2
+  #define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8     // Z offset: -below +above  [the nozzle]
 #elif ANYCUBIC_PROBE_VERSION == 1
  #define Z_PROBE_OFFSET_FROM_EXTRUDER -19.0 // Z offset: -below +above  [the nozzle]
 #else
-  #define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above  [the nozzle]
+  #define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above  [the nozzle]
 #endif

 // Certain types of probes need to stay away from edges
@@ -1020,10 +1027,10 @@
 * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
 *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
 */
-#define Z_CLEARANCE_DEPLOY_PROBE   10 // Z Clearance for Deploy/Stow
-#define Z_CLEARANCE_BETWEEN_PROBES 25 // Z Clearance between probe points
-#define Z_CLEARANCE_MULTI_PROBE    25 // Z Clearance between multiple probes
-#define Z_AFTER_PROBING            30 // Z position after probing is done
+#define Z_CLEARANCE_DEPLOY_PROBE   30 // Z Clearance for Deploy/Stow
+#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
+#define Z_CLEARANCE_MULTI_PROBE    5 // Z Clearance between multiple probes
+#define Z_AFTER_PROBING            5 // Z position after probing is done

 #define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping

--- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
@@ -835,6 +835,9 @@
 *   (e.g., an inductive probe or a nozzle-based probe-switch.)
 */
 #define FIX_MOUNTED_PROBE
+#if ENABLED(FIX_MOUNTED_PROBE)
+  //#define MANUAL_DEPLOY_STOW
+#endif

 /**
 * Z Servo Probe, such as an endstop switch on a rotating arm.
--- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
@@ -835,6 +835,9 @@
 *   (e.g., an inductive probe or a nozzle-based probe-switch.)
 */
 #define FIX_MOUNTED_PROBE
+#if ENABLED(FIX_MOUNTED_PROBE)
+  //#define MANUAL_DEPLOY_STOW
+#endif

 /**
 * Z Servo Probe, such as an endstop switch on a rotating arm.
--- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
@@ -835,6 +835,9 @@
 *   (e.g., an inductive probe or a nozzle-based probe-switch.)
 */
 #define FIX_MOUNTED_PROBE
+#if ENABLED(FIX_MOUNTED_PROBE)
+  //#define MANUAL_DEPLOY_STOW
+#endif

 /**
 * Z Servo Probe, such as an endstop switch on a rotating arm.
--- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
+++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
@@ -840,6 +840,9 @@
 *   (e.g., an inductive probe or a nozzle-based probe-switch.)
 */
 #define FIX_MOUNTED_PROBE
+#if ENABLED(FIX_MOUNTED_PROBE)
+  //#define MANUAL_DEPLOY_STOW
+#endif

 /**
 * Z Servo Probe, such as an endstop switch on a rotating arm.
--- a/Marlin/src/config/examples/delta/generic/Configuration.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration.h
@@ -825,6 +825,9 @@
 *   (e.g., an inductive probe or a nozzle-based probe-switch.)
 */
 //#define FIX_MOUNTED_PROBE
+#if ENABLED(FIX_MOUNTED_PROBE)
+  //#define MANUAL_DEPLOY_STOW
+#endif

 /**
 * Z Servo Probe, such as an endstop switch on a rotating arm.
--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
@@ -825,6 +825,9 @@
 *   (e.g., an inductive probe or a nozzle-based probe-switch.)
 */
 //#define FIX_MOUNTED_PROBE
+#if ENABLED(FIX_MOUNTED_PROBE)
+  //#define MANUAL_DEPLOY_STOW
+#endif

 /**
 * Z Servo Probe, such as an endstop switch on a rotating arm.
--- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
@@ -818,6 +818,9 @@
 *   (e.g., an inductive probe or a nozzle-based probe-switch.)
 */
 //#define FIX_MOUNTED_PROBE
+#if ENABLED(FIX_MOUNTED_PROBE)
+  //#define MANUAL_DEPLOY_STOW
+#endif

 /**
 * Z Servo Probe, such as an endstop switch on a rotating arm.
--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
@@ -828,6 +828,9 @@
 *   (e.g., an inductive probe or a nozzle-based probe-switch.)
 */
 #define FIX_MOUNTED_PROBE
+#if ENABLED(FIX_MOUNTED_PROBE)
+  //#define MANUAL_DEPLOY_STOW
+#endif

 /**
 * Z Servo Probe, such as an endstop switch on a rotating arm.