Add NOZZLE_AS_PROBE option to disable limits on probe point and alway…

…s use nozzle for XY
MarlinFirmware · Dec 4, 2019 · 6560c3f · 6560c3f
1 parent 0832a60
commit 6560c3f
Show file tree

Hide file tree

Showing 126 changed files with 757 additions and 0 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -195,6 +195,11 @@
   #define Z_SAFE_HOMING
 #endif
 
+// NOZZLE_AS_PROBE is a subset of FIX_MOUNTED_PROBE
+#if ENABLED(NOZZLE_AS_PROBE)
+  #define FIX_MOUNTED_PROBE
+#endif
+
 /**
  * DELTA should ignore Z_SAFE_HOMING and SLOWDOWN
  */

diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
@@ -85,6 +85,8 @@
     return (
       #if IS_KINEMATIC
         (X_CENTER) - probe_radius()
+      #elif ENABLED(NOZZLE_AS_PROBE)
+        MIN_PROBE_EDGE_LEFT, X_MIN_POS
       #else
         _MAX((X_MIN_BED) + (MIN_PROBE_EDGE_LEFT), (X_MIN_POS) + probe_offset.x)
       #endif
@@ -94,6 +96,8 @@
     return (
       #if IS_KINEMATIC
         (X_CENTER) + probe_radius()
+      #elif ENABLED(NOZZLE_AS_PROBE)
+        MIN_PROBE_EDGE_RIGHT, X_MAX_POS
       #else
         _MIN((X_MAX_BED) - (MIN_PROBE_EDGE_RIGHT), (X_MAX_POS) + probe_offset.x)
       #endif
@@ -103,6 +107,8 @@
     return (
       #if IS_KINEMATIC
         (Y_CENTER) - probe_radius()
+      #elif ENABLED(NOZZLE_AS_PROBE)
+        MIN_PROBE_EDGE_FRONT, Y_MIN_POS
       #else
         _MAX((Y_MIN_BED) + (MIN_PROBE_EDGE_FRONT), (Y_MIN_POS) + probe_offset.y)
       #endif
@@ -112,6 +118,8 @@
     return (
       #if IS_KINEMATIC
         (Y_CENTER) + probe_radius()
+      #elif ENABLED(NOZZLE_AS_PROBE)
+        MIN_PROBE_EDGE_BACK, Y_MAX_POS
       #else
         _MIN((Y_MAX_BED) - (MIN_PROBE_EDGE_BACK), (Y_MAX_POS) + probe_offset.y)
       #endif

diff --git a/config/default/Configuration.h b/config/default/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/3DFabXYZ/Migbot/Configuration.h b/config/examples/3DFabXYZ/Migbot/Configuration.h
@@ -861,6 +861,12 @@
  */
 #define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/ADIMLab/Gantry v1/Configuration.h b/config/examples/ADIMLab/Gantry v1/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/ADIMLab/Gantry v2/Configuration.h b/config/examples/ADIMLab/Gantry v2/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/AlephObjects/TAZ4/Configuration.h b/config/examples/AlephObjects/TAZ4/Configuration.h
@@ -875,6 +875,12 @@
  */
 #define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Alfawise/U20-bltouch/Configuration.h b/config/examples/Alfawise/U20-bltouch/Configuration.h
@@ -918,6 +918,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Alfawise/U20/Configuration.h b/config/examples/Alfawise/U20/Configuration.h
@@ -918,6 +918,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/AliExpress/CL-260/Configuration.h b/config/examples/AliExpress/CL-260/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/AliExpress/UM2pExt/Configuration.h b/config/examples/AliExpress/UM2pExt/Configuration.h
@@ -866,6 +866,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Anet/A2/Configuration.h b/config/examples/Anet/A2/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Anet/A2plus/Configuration.h b/config/examples/Anet/A2plus/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Anet/A6/Configuration.h b/config/examples/Anet/A6/Configuration.h
@@ -896,6 +896,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Anet/A8/Configuration.h b/config/examples/Anet/A8/Configuration.h
@@ -868,6 +868,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Anet/A8plus/Configuration.h b/config/examples/Anet/A8plus/Configuration.h
@@ -866,6 +866,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Anet/E16/Configuration.h b/config/examples/Anet/E16/Configuration.h
@@ -867,6 +867,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/AnyCubic/i3/Configuration.h b/config/examples/AnyCubic/i3/Configuration.h
@@ -865,6 +865,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/ArmEd/Configuration.h b/config/examples/ArmEd/Configuration.h
@@ -856,6 +856,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Azteeg/X5GT/Configuration.h b/config/examples/Azteeg/X5GT/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/BIBO/TouchX/cyclops/Configuration.h b/config/examples/BIBO/TouchX/cyclops/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/BIBO/TouchX/default/Configuration.h b/config/examples/BIBO/TouchX/default/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/BQ/Hephestos/Configuration.h b/config/examples/BQ/Hephestos/Configuration.h
@@ -843,6 +843,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/BQ/Hephestos_2/Configuration.h b/config/examples/BQ/Hephestos_2/Configuration.h
@@ -856,6 +856,12 @@
  */
 #define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/BQ/WITBOX/Configuration.h b/config/examples/BQ/WITBOX/Configuration.h
@@ -843,6 +843,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Cartesio/Configuration.h b/config/examples/Cartesio/Configuration.h
@@ -854,6 +854,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Creality/CR-10/Configuration.h b/config/examples/Creality/CR-10/Configuration.h
@@ -865,6 +865,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */

diff --git a/config/examples/Creality/CR-10S/Configuration.h b/config/examples/Creality/CR-10S/Configuration.h
@@ -855,6 +855,12 @@
  */
 //#define FIX_MOUNTED_PROBE
 
+/**
+ * Utilize the nozzle as a probe for systems such as the Lulzbot
+ * conductive nozzle or a Piezeo Electric smart effector
+ */
+//#define NOZZLE_AS_PROBE
+
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */