From 82dafbba333379eaf62285bfa3641e1a495d7e21 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 9 Apr 2018 01:46:44 -0500 Subject: [PATCH 1/2] Add Z_PROBE_LOW_POINT to example configs --- .../examples/AlephObjects/TAZ4/Configuration.h | 2 ++ .../examples/AliExpress/CL-260/Configuration.h | 2 ++ .../src/config/examples/Anet/A6/Configuration.h | 17 +++++++++++------ .../src/config/examples/Anet/A8/Configuration.h | 2 ++ .../config/examples/Azteeg/X5GT/Configuration.h | 2 ++ .../BIBO/TouchX/cyclops/Configuration.h | 2 ++ .../BIBO/TouchX/default/Configuration.h | 2 ++ .../examples/BQ/Hephestos/Configuration.h | 2 ++ .../examples/BQ/Hephestos_2/Configuration.h | 2 ++ .../config/examples/BQ/WITBOX/Configuration.h | 2 ++ .../config/examples/Cartesio/Configuration.h | 2 ++ .../examples/Creality/CR-10/Configuration.h | 2 ++ .../examples/Creality/CR-10S/Configuration.h | 2 ++ .../examples/Creality/CR-10mini/Configuration.h | 2 ++ .../examples/Creality/CR-8/Configuration.h | 2 ++ .../examples/Creality/Ender-2/Configuration.h | 2 ++ .../examples/Creality/Ender-4/Configuration.h | 2 ++ .../src/config/examples/Felix/Configuration.h | 2 ++ .../config/examples/Felix/DUAL/Configuration.h | 2 ++ .../examples/FolgerTech/i3-2020/Configuration.h | 2 ++ .../examples/Geeetech/GT2560/Configuration.h | 2 ++ .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 2 ++ .../Prusa i3 Pro B/bltouch/Configuration.h | 2 ++ .../Prusa i3 Pro B/noprobe/Configuration.h | 2 ++ .../examples/Infitary/i3-M508/Configuration.h | 2 ++ .../config/examples/JGAurora/A5/Configuration.h | 2 ++ .../config/examples/MakerParts/Configuration.h | 2 ++ .../config/examples/Malyan/M150/Configuration.h | 2 ++ .../config/examples/Malyan/M200/Configuration.h | 2 ++ .../examples/Micromake/C1/basic/Configuration.h | 2 ++ .../Micromake/C1/enhanced/Configuration.h | 2 ++ .../config/examples/Mks/Sbase/Configuration.h | 2 ++ .../examples/RepRapPro/Huxley/Configuration.h | 2 ++ .../RepRapWorld/Megatronics/Configuration.h | 2 ++ .../config/examples/RigidBot/Configuration.h | 2 ++ .../src/config/examples/SCARA/Configuration.h | 2 ++ .../config/examples/STM32F10/Configuration.h | 2 ++ .../examples/Sanguinololu/Configuration.h | 2 ++ .../src/config/examples/TheBorg/Configuration.h | 2 ++ .../config/examples/TinyBoy2/Configuration.h | 2 ++ .../config/examples/Tronxy/X1/Configuration.h | 2 ++ .../config/examples/Tronxy/X5S/Configuration.h | 2 ++ .../examples/Tronxy/XY100/Configuration.h | 2 ++ .../UltiMachine/Archim2/Configuration.h | 2 ++ .../examples/Velleman/K8200/Configuration.h | 2 ++ .../examples/Velleman/K8400/Configuration.h | 2 ++ .../Velleman/K8400/Dual-head/Configuration.h | 2 ++ .../Wanhao/Duplicator 6/Configuration.h | 2 ++ .../examples/adafruit/ST7565/Configuration.h | 2 ++ .../delta/FLSUN/auto_calibrate/Configuration.h | 2 ++ .../examples/delta/FLSUN/kossel/Configuration.h | 2 ++ .../delta/FLSUN/kossel_mini/Configuration.h | 2 ++ .../delta/Hatchbox_Alpha/Configuration.h | 2 ++ .../examples/delta/generic/Configuration.h | 2 ++ .../examples/delta/kossel_mini/Configuration.h | 2 ++ .../examples/delta/kossel_pro/Configuration.h | 2 ++ .../examples/delta/kossel_xl/Configuration.h | 2 ++ .../examples/gCreate/gMax1.5+/Configuration.h | 2 ++ .../src/config/examples/makibox/Configuration.h | 2 ++ .../examples/stm32f103ret6/Configuration.h | 2 ++ .../examples/tvrrug/Round2/Configuration.h | 2 ++ .../src/config/examples/wt150/Configuration.h | 2 ++ 62 files changed, 133 insertions(+), 6 deletions(-) diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h index 7e55655ed8..2f97787a68 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h @@ -797,6 +797,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h index 84443b674c..98b9149a8c 100644 --- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h +++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h index f67960eea4..db6b8479a1 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration.h @@ -843,12 +843,17 @@ * 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 5 // Z Clearance between probe points -//#define Z_AFTER_PROBING 5 // Z position after probing is done -//#define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow -//#define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points -//#define Z_AFTER_PROBING 3 // Z position after probing is done +#if 1 // 0 for less clearance + #define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow + #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points + //#define Z_AFTER_PROBING 5 // Z position after probing is done +#else + #define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow + #define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points + //#define Z_AFTER_PROBING 3 // Z position after probing is done +#endif + +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h index 1b72928924..fe142bb2a8 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration.h @@ -784,6 +784,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h index 83234e15ec..88524909df 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h index a8d7688f06..c9d9e3a814 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -777,6 +777,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#define Z_AFTER_PROBING 10 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h index b56b9a2183..ab8ee1344e 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h @@ -777,6 +777,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points //#define Z_AFTER_PROBING 10 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h index a4cddd40d2..1e4cfe38c6 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h @@ -765,6 +765,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h index 846349e145..2fc4df580e 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h @@ -778,6 +778,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points //#define Z_AFTER_PROBING 2 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -5.5 #define Z_PROBE_OFFSET_RANGE_MAX -3 diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h index 20f5d9166e..d1638c8e12 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h @@ -765,6 +765,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h index 20db4def49..0ee435c57f 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration.h +++ b/Marlin/src/config/examples/Cartesio/Configuration.h @@ -776,6 +776,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h index a8f36efc93..e3d870de74 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h @@ -787,6 +787,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points //#define Z_AFTER_PROBING 10 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h index 401c463b80..0718b250d3 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h index af44896ea5..3e1264e483 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h @@ -796,6 +796,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration.h b/Marlin/src/config/examples/Creality/CR-8/Configuration.h index 0699cb20ec..60a77c0a9d 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration.h @@ -787,6 +787,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h index 23b9ab9fb0..d2e42decf6 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h @@ -781,6 +781,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h index 097dadf499..09dbb0e133 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h @@ -787,6 +787,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h index 4fd8e0442a..545522045e 100644 --- a/Marlin/src/config/examples/Felix/Configuration.h +++ b/Marlin/src/config/examples/Felix/Configuration.h @@ -759,6 +759,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h index 05b26851aa..17250f5242 100644 --- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h +++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h @@ -759,6 +759,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h index cc34bce6d9..54a0495fdd 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h @@ -783,6 +783,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points //#define Z_AFTER_PROBING 3 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index 9734cf7642..835517cb21 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -792,6 +792,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h index c6fce3aac1..33669e37d1 100644 --- a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 6 // Z Clearance between probe points //#define Z_AFTER_PROBING 6 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h index 665ca62359..b4e227732a 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h @@ -793,6 +793,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h index ee95e0f0fb..89a02442dc 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h @@ -792,6 +792,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h index 386c160084..776e4d78b8 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h @@ -781,6 +781,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h index 25be5f77fa..fdba3bbea7 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h @@ -789,6 +789,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h index 0364ddc122..cedbd546e2 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration.h +++ b/Marlin/src/config/examples/MakerParts/Configuration.h @@ -797,6 +797,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h index 30f8baae85..034e2bab14 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h @@ -801,6 +801,8 @@ //#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset //#define Z_PROBE_OFFSET_RANGE_MIN -20 //#define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h index 2440c683f7..dac1f574d2 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h @@ -776,6 +776,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h index ba3cbd6bfd..3b6942b989 100644 --- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h @@ -781,6 +781,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h index 0a6b37fb53..a254db2d86 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h @@ -781,6 +781,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h index 1a0f89f18e..08c6b856df 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h index a6e23e9f9a..1f48ae435a 100644 --- a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h +++ b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h @@ -817,6 +817,8 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h index c686713942..e0de50780f 100644 --- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h index c54eb327c4..62d21fcad7 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration.h +++ b/Marlin/src/config/examples/RigidBot/Configuration.h @@ -775,6 +775,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h index 8559a1fd58..4c14be0173 100644 --- a/Marlin/src/config/examples/SCARA/Configuration.h +++ b/Marlin/src/config/examples/SCARA/Configuration.h @@ -790,6 +790,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h index 4c28d11077..ed00628c0c 100644 --- a/Marlin/src/config/examples/STM32F10/Configuration.h +++ b/Marlin/src/config/examples/STM32F10/Configuration.h @@ -780,6 +780,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h index 216a38a66e..f0de939a66 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h @@ -808,6 +808,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h index 7eb86c40ef..015c685c2c 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration.h +++ b/Marlin/src/config/examples/TheBorg/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h index 5634bf8af6..3e6a8c5d6a 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h @@ -828,6 +828,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h index d31820465f..4cd2255acb 100644 --- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h index a3e2087166..291d7fdf95 100644 --- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h index 1ee899b437..6fee980eb5 100644 --- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h @@ -788,6 +788,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h index 80cc233198..c357c13a7e 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h index d5e6951d22..0e92c34d36 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h @@ -806,6 +806,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h index 73fc71700b..4b4be502eb 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h index adad995a95..03f4831fb0 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h index 4dd47337ca..23ced8f305 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -787,6 +787,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h index ea98002d73..02af2438bc 100644 --- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h +++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h index c491de9314..17e6d888f3 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -907,6 +907,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points //#define Z_AFTER_PROBING 2 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h index 7aff5c1d49..b63d1c595e 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h @@ -907,6 +907,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points //#define Z_AFTER_PROBING 2 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h index d9462d97e7..f48ca4cfea 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -907,6 +907,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h index 8a712ed8ef..37d5c4236f 100644 --- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h +++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h @@ -909,6 +909,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h index 41869b1b6f..e76648db32 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration.h +++ b/Marlin/src/config/examples/delta/generic/Configuration.h @@ -894,6 +894,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h index 008d80810d..93cf1a8c58 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h @@ -897,6 +897,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h index aceecacd6e..f6ffad1c56 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h @@ -896,6 +896,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -15 diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h index a72a0d050f..4997a8aa14 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h @@ -906,6 +906,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points //#define Z_AFTER_PROBING 10 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h index ea03b63ed0..2391a686e6 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h @@ -790,6 +790,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 6 // Z Clearance between probe points //#define Z_AFTER_PROBING 6 // Z position after probing is done +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h index 96a895a22c..0ec0b635c1 100644 --- a/Marlin/src/config/examples/makibox/Configuration.h +++ b/Marlin/src/config/examples/makibox/Configuration.h @@ -780,6 +780,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h index 0f3780d361..d8dec87f81 100644 --- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h +++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h @@ -778,6 +778,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h index ca26a4c3ec..f088255f4c 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h @@ -772,6 +772,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h index 758a4dea87..40efe5912d 100644 --- a/Marlin/src/config/examples/wt150/Configuration.h +++ b/Marlin/src/config/examples/wt150/Configuration.h @@ -782,6 +782,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 From 8b8ad14178374c06858444434988291993903fbb Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 9 Apr 2018 01:46:23 -0500 Subject: [PATCH 2/2] Add Z_PROBE_LOW_POINT to prevent damage --- Marlin/Configuration.h | 2 ++ Marlin/src/config/default/Configuration.h | 2 ++ Marlin/src/gcode/calibrate/G33.cpp | 2 +- Marlin/src/inc/SanityCheck.h | 4 +++ Marlin/src/module/probe.cpp | 35 ++++++++++++++++++----- Marlin/src/module/probe.h | 2 +- 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d3753dafcf..e21b580e3f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h index d3753dafcf..e21b580e3f 100644 --- a/Marlin/src/config/default/Configuration.h +++ b/Marlin/src/config/default/Configuration.h @@ -777,6 +777,8 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points //#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 + // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp index 036b3425f3..72f4a01067 100644 --- a/Marlin/src/gcode/calibrate/G33.cpp +++ b/Marlin/src/gcode/calibrate/G33.cpp @@ -137,7 +137,7 @@ static void G33_cleanup( inline float calibration_probe(const float nx, const float ny, const bool stow) { #if HAS_BED_PROBE - return probe_pt(nx, ny, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, false); + return probe_pt(nx, ny, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true); #else UNUSED(stow); return lcd_probe_pt(nx, ny); diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index cb390d0429..8af08e09ce 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -780,6 +780,10 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE, #error "MULTIPLE_PROBING must be >= 2." #endif + #if Z_PROBE_LOW_POINT > 0 + #error "Z_PROBE_LOW_POINT must be less than or equal to 0." + #endif + #else /** diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index 9375ff247c..ed585299bf 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -539,17 +539,34 @@ static bool do_probe_move(const float z, const float fr_mm_m) { * * @return The raw Z position where the probe was triggered */ -static float run_z_probe() { +#define HAS_CALIBRATION_PROBE (ENABLED(DELTA_AUTO_CALIBRATION) && Z_PROBE_LOW_POINT < 0) +static float run_z_probe( + #if HAS_CALIBRATION_PROBE + const bool is_calibration + #endif +) { #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) DEBUG_POS(">>> run_z_probe", current_position); #endif + #if Z_PROBE_LOW_POINT < 0 + // Stop the probe before it goes too low to prevent damage. + // If Z isn't known or this is a "calibration probe" then probe to -10mm. + #if !HAS_CALIBRATION_PROBE + constexpr bool is_calibration = false; + #endif + const float z_probe_low_point = !is_calibration && axis_known_position[Z_AXIS] ? -zprobe_zoffset + Z_PROBE_LOW_POINT : -10.0; + #else + // Assertively move down in all cases + constexpr float z_probe_low_point = -10.0; + #endif + // Double-probing does a fast probe followed by a slow probe #if MULTIPLE_PROBING == 2 // Do a first probe at the fast speed - if (do_probe_move(-10, Z_PROBE_SPEED_FAST)) return NAN; + if (do_probe_move(z_probe_low_point, Z_PROBE_SPEED_FAST)) return NAN; float first_probe_z = current_position[Z_AXIS]; @@ -580,7 +597,7 @@ static float run_z_probe() { #endif // Move down slowly to find bed, not too far - if (do_probe_move(-10, Z_PROBE_SPEED_SLOW)) return NAN; + if (do_probe_move(z_probe_low_point, Z_PROBE_SPEED_SLOW)) return NAN; #if MULTIPLE_PROBING > 2 probes_total += current_position[Z_AXIS]; @@ -628,14 +645,14 @@ static float run_z_probe() { * - Raise to the BETWEEN height * - Return the probed Z position */ -float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/) { +float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool is_calibration/*=false*/) { #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) { SERIAL_ECHOPAIR(">>> probe_pt(", LOGICAL_X_POSITION(rx)); SERIAL_ECHOPAIR(", ", LOGICAL_Y_POSITION(ry)); SERIAL_ECHOPAIR(", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none"); SERIAL_ECHOPAIR(", ", int(verbose_level)); - SERIAL_ECHOPAIR(", ", probe_relative ? "probe" : "nozzle"); + SERIAL_ECHOPAIR(", ", is_calibration ? "nozzle" : "probe"); SERIAL_ECHOLNPGM("_relative)"); DEBUG_POS("", current_position); } @@ -643,7 +660,7 @@ float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/ // TODO: Adapt for SCARA, where the offset rotates float nx = rx, ny = ry; - if (probe_relative) { + if (!is_calibration) { if (!position_is_reachable_by_probe(rx, ry)) return NAN; // The given position is in terms of the probe nx -= (X_PROBE_OFFSET_FROM_EXTRUDER); // Get the nozzle position ny -= (Y_PROBE_OFFSET_FROM_EXTRUDER); @@ -667,7 +684,11 @@ float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/ float measured_z = NAN; if (!DEPLOY_PROBE()) { - measured_z = run_z_probe() + zprobe_zoffset; + measured_z = run_z_probe( + #if HAS_CALIBRATION_PROBE + is_calibration + #endif + ) + zprobe_zoffset; if (raise_after == PROBE_PT_RAISE) do_blocking_move_to_z(current_position[Z_AXIS] + Z_CLEARANCE_BETWEEN_PROBES, MMM_TO_MMS(Z_PROBE_SPEED_FAST)); diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h index 655fad8701..60052e3ec2 100644 --- a/Marlin/src/module/probe.h +++ b/Marlin/src/module/probe.h @@ -40,7 +40,7 @@ PROBE_PT_STOW, // Do a complete stow after run_z_probe PROBE_PT_RAISE // Raise to "between" clearance after run_z_probe }; - float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true); + float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool is_calibration=false); #define DEPLOY_PROBE() set_probe_deployed(true) #define STOW_PROBE() set_probe_deployed(false) #else