From 99d0022fae0efd9164946062bf641f7294597675 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Mar 2019 00:27:45 -0600 Subject: [PATCH] Drop the Z_MIN_PROBE_ENDSTOP option (#13276) --- Marlin/Configuration.h | 13 +++++-------- Marlin/src/config/default/Configuration.h | 13 +++++-------- .../examples/3DFabXYZ/Migbot/Configuration.h | 13 +++++-------- .../examples/AlephObjects/TAZ4/Configuration.h | 13 +++++-------- .../examples/AliExpress/CL-260/Configuration.h | 13 +++++-------- .../src/config/examples/Anet/A2/Configuration.h | 13 +++++-------- .../config/examples/Anet/A2plus/Configuration.h | 13 +++++-------- .../src/config/examples/Anet/A6/Configuration.h | 13 +++++-------- .../src/config/examples/Anet/A8/Configuration.h | 13 +++++-------- .../config/examples/AnyCubic/i3/Configuration.h | 13 +++++-------- Marlin/src/config/examples/ArmEd/Configuration.h | 13 +++++-------- .../config/examples/Azteeg/X5GT/Configuration.h | 13 +++++-------- .../examples/BIBO/TouchX/cyclops/Configuration.h | 13 +++++-------- .../examples/BIBO/TouchX/default/Configuration.h | 13 +++++-------- .../config/examples/BQ/Hephestos/Configuration.h | 13 +++++-------- .../examples/BQ/Hephestos_2/Configuration.h | 13 +++++-------- .../config/examples/BQ/WITBOX/Configuration.h | 13 +++++-------- .../src/config/examples/Cartesio/Configuration.h | 13 +++++-------- .../examples/Creality/CR-10/Configuration.h | 13 +++++-------- .../examples/Creality/CR-10S/Configuration.h | 13 +++++-------- .../examples/Creality/CR-10_5S/Configuration.h | 13 +++++-------- .../examples/Creality/CR-10mini/Configuration.h | 13 +++++-------- .../examples/Creality/CR-8/Configuration.h | 13 +++++-------- .../examples/Creality/Ender-2/Configuration.h | 13 +++++-------- .../examples/Creality/Ender-3/Configuration.h | 13 +++++-------- .../examples/Creality/Ender-4/Configuration.h | 13 +++++-------- .../config/examples/Einstart-S/Configuration.h | 13 +++++-------- Marlin/src/config/examples/Felix/Configuration.h | 13 +++++-------- .../config/examples/Felix/DUAL/Configuration.h | 13 +++++-------- .../FlashForge/CreatorPro/Configuration.h | 13 +++++-------- .../examples/FolgerTech/i3-2020/Configuration.h | 13 +++++-------- .../examples/Formbot/Raptor/Configuration.h | 13 +++++-------- .../examples/Formbot/T_Rex_2+/Configuration.h | 13 +++++-------- .../examples/Formbot/T_Rex_3/Configuration.h | 13 +++++-------- .../examples/Geeetech/A10M/Configuration.h | 13 +++++-------- .../examples/Geeetech/A20M/Configuration.h | 13 +++++-------- .../examples/Geeetech/GT2560/Configuration.h | 13 +++++-------- .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 13 +++++-------- .../examples/Geeetech/MeCreator2/Configuration.h | 13 +++++-------- .../Prusa i3 Pro B/bltouch/Configuration.h | 13 +++++-------- .../Prusa i3 Pro B/noprobe/Configuration.h | 13 +++++-------- .../Geeetech/Prusa i3 Pro C/Configuration.h | 13 +++++-------- .../Geeetech/Prusa i3 Pro W/Configuration.h | 13 +++++-------- .../examples/Infitary/i3-M508/Configuration.h | 13 +++++-------- .../config/examples/JGAurora/A5/Configuration.h | 13 +++++-------- .../config/examples/MakerParts/Configuration.h | 13 +++++-------- .../config/examples/Malyan/M150/Configuration.h | 13 +++++-------- .../config/examples/Malyan/M200/Configuration.h | 13 +++++-------- .../examples/Micromake/C1/basic/Configuration.h | 13 +++++-------- .../Micromake/C1/enhanced/Configuration.h | 13 +++++-------- .../config/examples/Mks/Robin/Configuration.h | 13 +++++-------- .../config/examples/Mks/Sbase/Configuration.h | 13 +++++-------- .../Printrbot/PrintrboardG2/Configuration.h | 13 +++++-------- .../examples/RapideLite/RL200/Configuration.h | 13 +++++-------- .../examples/RepRapPro/Huxley/Configuration.h | 13 +++++-------- .../RepRapWorld/Megatronics/Configuration.h | 13 +++++-------- .../src/config/examples/RigidBot/Configuration.h | 13 +++++-------- Marlin/src/config/examples/SCARA/Configuration.h | 13 +++++-------- .../src/config/examples/STM32F10/Configuration.h | 13 +++++-------- .../src/config/examples/STM32F4/Configuration.h | 13 +++++-------- .../config/examples/Sanguinololu/Configuration.h | 13 +++++-------- .../src/config/examples/TheBorg/Configuration.h | 13 +++++-------- .../src/config/examples/TinyBoy2/Configuration.h | 13 +++++-------- .../config/examples/Tronxy/X1/Configuration.h | 13 +++++-------- .../config/examples/Tronxy/X3A/Configuration.h | 13 +++++-------- .../config/examples/Tronxy/X5S/Configuration.h | 13 +++++-------- .../config/examples/Tronxy/XY100/Configuration.h | 13 +++++-------- .../examples/UltiMachine/Archim1/Configuration.h | 13 +++++-------- .../examples/UltiMachine/Archim2/Configuration.h | 13 +++++-------- .../config/examples/VORONDesign/Configuration.h | 13 +++++-------- .../examples/Velleman/K8200/Configuration.h | 13 +++++-------- .../examples/Velleman/K8400/Configuration.h | 13 +++++-------- .../Velleman/K8400/Dual-head/Configuration.h | 13 +++++-------- .../examples/WASP/PowerWASP/Configuration.h | 13 +++++-------- .../examples/Wanhao/Duplicator 6/Configuration.h | 13 +++++-------- .../examples/adafruit/ST7565/Configuration.h | 13 +++++-------- .../delta/Anycubic/Kossel/Configuration.h | 13 +++++-------- .../delta/FLSUN/auto_calibrate/Configuration.h | 13 +++++-------- .../examples/delta/FLSUN/kossel/Configuration.h | 13 +++++-------- .../delta/FLSUN/kossel_mini/Configuration.h | 13 +++++-------- .../delta/Geeetech/Rostock 301/Configuration.h | 13 +++++-------- .../delta/Hatchbox_Alpha/Configuration.h | 13 +++++-------- .../examples/delta/MKS/SBASE/Configuration.h | 13 +++++-------- .../delta/Tevo Little Monster/Configuration.h | 13 +++++-------- .../examples/delta/generic/Configuration.h | 13 +++++-------- .../examples/delta/kossel_mini/Configuration.h | 13 +++++-------- .../examples/delta/kossel_pro/Configuration.h | 13 +++++-------- .../examples/delta/kossel_xl/Configuration.h | 13 +++++-------- .../examples/gCreate/gMax1.5+/Configuration.h | 13 +++++-------- .../src/config/examples/makibox/Configuration.h | 13 +++++-------- .../examples/stm32f103ret6/Configuration.h | 13 +++++-------- .../examples/tvrrug/Round2/Configuration.h | 13 +++++-------- Marlin/src/config/examples/wt150/Configuration.h | 13 +++++-------- Marlin/src/gcode/config/M43.cpp | 2 +- Marlin/src/inc/Conditionals_LCD.h | 2 +- Marlin/src/inc/Conditionals_post.h | 6 +++--- Marlin/src/inc/SanityCheck.h | 14 +++++--------- Marlin/src/module/endstops.cpp | 16 ++++++++-------- Marlin/src/module/motion.cpp | 2 +- Marlin/src/module/probe.cpp | 4 ++-- Marlin/src/pins/pins.h | 2 +- 101 files changed, 487 insertions(+), 770 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 498804b4a..34b351236 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h index 498804b4a..34b351236 100644 --- a/Marlin/src/config/default/Configuration.h +++ b/Marlin/src/config/default/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration.h b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration.h index 9be67520d..ccb2a8a4a 100644 --- a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration.h +++ b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration.h @@ -770,11 +770,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -784,11 +784,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h index d304080da..c23d54f7f 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h @@ -784,11 +784,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -798,11 +798,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h index b8d490024..67643a38b 100644 --- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h +++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Anet/A2/Configuration.h b/Marlin/src/config/examples/Anet/A2/Configuration.h index 30487b4f3..9565659b1 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration.h @@ -764,11 +764,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration.h b/Marlin/src/config/examples/Anet/A2plus/Configuration.h index 19c40df8a..b0822e48c 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration.h @@ -764,11 +764,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h index a057e4e6d..2521909b0 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration.h @@ -811,11 +811,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -825,11 +825,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h index a3887d299..b80e1360e 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration.h @@ -777,11 +777,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -791,11 +791,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/AnyCubic/i3/Configuration.h b/Marlin/src/config/examples/AnyCubic/i3/Configuration.h index fe25c4a26..d6444b74b 100644 --- a/Marlin/src/config/examples/AnyCubic/i3/Configuration.h +++ b/Marlin/src/config/examples/AnyCubic/i3/Configuration.h @@ -774,11 +774,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -788,11 +788,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/ArmEd/Configuration.h b/Marlin/src/config/examples/ArmEd/Configuration.h index 2181daafa..bf3acb3de 100644 --- a/Marlin/src/config/examples/ArmEd/Configuration.h +++ b/Marlin/src/config/examples/ArmEd/Configuration.h @@ -765,11 +765,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -779,11 +779,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h index 2bc14739b..2b8b91d16 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h index 2efda17ed..dc1405c10 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -764,11 +764,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h index 03ddb7b34..98e0a15a2 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h @@ -764,11 +764,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h index 667c1aaee..42468c5f1 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h @@ -752,11 +752,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -766,11 +766,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h index e9a6fe686..5646f7596 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h @@ -765,11 +765,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -779,11 +779,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h index ddf319a3b..ef690c5aa 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h @@ -752,11 +752,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -766,11 +766,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h index 42bcd7b27..6ffa78229 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration.h +++ b/Marlin/src/config/examples/Cartesio/Configuration.h @@ -763,11 +763,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -777,11 +777,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h index 656dc28f3..4f6916a28 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h @@ -774,11 +774,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -788,11 +788,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h index 89f6ddb94..7bd92bcf4 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Creality/CR-10_5S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10_5S/Configuration.h index e33dbfa75..72010ea0b 100644 --- a/Marlin/src/config/examples/Creality/CR-10_5S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10_5S/Configuration.h @@ -765,11 +765,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -779,11 +779,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h index 766090b03..e08548300 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h @@ -783,11 +783,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -797,11 +797,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration.h b/Marlin/src/config/examples/Creality/CR-8/Configuration.h index 6a0d1c459..bbe7d0062 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration.h @@ -774,11 +774,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -788,11 +788,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h index b6935e936..daf3ffd52 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h @@ -768,11 +768,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -782,11 +782,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h index f823ff7b8..1c999bb78 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h @@ -768,11 +768,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -782,11 +782,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h index a1e78ee29..88671c5f5 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h @@ -774,11 +774,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -788,11 +788,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Einstart-S/Configuration.h b/Marlin/src/config/examples/Einstart-S/Configuration.h index 567f501f6..ec8c3476b 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration.h @@ -776,11 +776,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -790,11 +790,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h index cab8aea7a..dbe75566d 100644 --- a/Marlin/src/config/examples/Felix/Configuration.h +++ b/Marlin/src/config/examples/Felix/Configuration.h @@ -746,11 +746,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -760,11 +760,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h index 9136a9402..d8f77af12 100644 --- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h +++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h @@ -746,11 +746,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -760,11 +760,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration.h b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration.h index 44e188743..e47078d9b 100644 --- a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration.h +++ b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration.h @@ -756,11 +756,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -770,11 +770,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h index af7312b27..38278a40a 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h @@ -770,11 +770,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -784,11 +784,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h index 0da8b68ea..9a4e94943 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h @@ -847,11 +847,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -861,11 +861,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h index 2606105c8..44a6093a1 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h @@ -793,11 +793,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -807,11 +807,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h index ed02cc11f..ecff0d5c0 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h @@ -780,11 +780,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -794,11 +794,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Geeetech/A10M/Configuration.h b/Marlin/src/config/examples/Geeetech/A10M/Configuration.h index 124f1bfc7..62fd3c47e 100644 --- a/Marlin/src/config/examples/Geeetech/A10M/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/A10M/Configuration.h @@ -747,11 +747,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -761,11 +761,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Geeetech/A20M/Configuration.h b/Marlin/src/config/examples/Geeetech/A20M/Configuration.h index a230dd954..dff1888ff 100644 --- a/Marlin/src/config/examples/Geeetech/A20M/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/A20M/Configuration.h @@ -747,11 +747,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -761,11 +761,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index a66106569..c2af0f4dc 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -779,11 +779,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -793,11 +793,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type 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 634bcfb90..b8603b484 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 @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h index 1d66ef218..5c9672169 100644 --- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h @@ -771,11 +771,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -785,11 +785,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type 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 b5856f245..6bbc02435 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 @@ -779,11 +779,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -793,11 +793,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default #define Z_MIN_PROBE_PIN 32 /** 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 b319a44a5..60546e783 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 @@ -779,11 +779,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -793,11 +793,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h index 5f7ff12f6..68a3b7990 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h index 9dbada5c1..81dab2a58 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h index ac10cefa3..21d379e59 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h @@ -768,11 +768,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -782,11 +782,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h index 5b5e15324..7d79c61e0 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h @@ -776,11 +776,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -790,11 +790,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h index b4600d22e..59ee1387b 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration.h +++ b/Marlin/src/config/examples/MakerParts/Configuration.h @@ -784,11 +784,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -798,11 +798,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h index d2f9868c5..267d446fd 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h @@ -784,11 +784,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -798,11 +798,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h index 961e8441d..739c3a3c2 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h @@ -763,11 +763,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -777,11 +777,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h index 210f2bc83..6240d4cfa 100644 --- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h @@ -768,11 +768,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -782,11 +782,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h index a363d3892..14524d8e1 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h @@ -768,11 +768,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -782,11 +782,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Mks/Robin/Configuration.h b/Marlin/src/config/examples/Mks/Robin/Configuration.h index f1bfd613c..198fbef4e 100644 --- a/Marlin/src/config/examples/Mks/Robin/Configuration.h +++ b/Marlin/src/config/examples/Mks/Robin/Configuration.h @@ -765,11 +765,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -779,11 +779,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h index 326bc9d94..c72911b25 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Printrbot/PrintrboardG2/Configuration.h b/Marlin/src/config/examples/Printrbot/PrintrboardG2/Configuration.h index fbdf2db19..5a3c4270c 100644 --- a/Marlin/src/config/examples/Printrbot/PrintrboardG2/Configuration.h +++ b/Marlin/src/config/examples/Printrbot/PrintrboardG2/Configuration.h @@ -772,11 +772,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -786,11 +786,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/RapideLite/RL200/Configuration.h b/Marlin/src/config/examples/RapideLite/RL200/Configuration.h index 9a1acc3a9..2b02d2e16 100644 --- a/Marlin/src/config/examples/RapideLite/RL200/Configuration.h +++ b/Marlin/src/config/examples/RapideLite/RL200/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h index dc005977c..6bc563c6d 100644 --- a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h +++ b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h @@ -804,11 +804,11 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -818,11 +818,8 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h index 44d2dc61d..7a0bd07bd 100644 --- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h index 5ace9903f..79b162abc 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration.h +++ b/Marlin/src/config/examples/RigidBot/Configuration.h @@ -762,11 +762,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -776,11 +776,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h index 46d838db9..b3b2fc2c8 100644 --- a/Marlin/src/config/examples/SCARA/Configuration.h +++ b/Marlin/src/config/examples/SCARA/Configuration.h @@ -777,11 +777,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -791,11 +791,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h index 057fc8066..deaf828b3 100644 --- a/Marlin/src/config/examples/STM32F10/Configuration.h +++ b/Marlin/src/config/examples/STM32F10/Configuration.h @@ -766,11 +766,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -780,11 +780,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/STM32F4/Configuration.h b/Marlin/src/config/examples/STM32F4/Configuration.h index 3232185ca..412e81df2 100644 --- a/Marlin/src/config/examples/STM32F4/Configuration.h +++ b/Marlin/src/config/examples/STM32F4/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h index fb6fbf31e..6c3ec1e29 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h @@ -795,11 +795,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -809,11 +809,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h index 086f1f9de..6de8c04eb 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration.h +++ b/Marlin/src/config/examples/TheBorg/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h index f7b06c18b..480af111e 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h @@ -815,11 +815,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -829,11 +829,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h index 4afc71c07..292260669 100644 --- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h index 8a6987c20..58ad9582a 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h index d51f061e6..d89f28edd 100644 --- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h @@ -763,11 +763,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -777,11 +777,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h index 5a790e27d..966981772 100644 --- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h @@ -775,11 +775,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -789,11 +789,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration.h index 62debd028..f6ac9705f 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h index 79557a0ab..37f7e9400 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/VORONDesign/Configuration.h b/Marlin/src/config/examples/VORONDesign/Configuration.h index 5f0d93b2c..93379337f 100644 --- a/Marlin/src/config/examples/VORONDesign/Configuration.h +++ b/Marlin/src/config/examples/VORONDesign/Configuration.h @@ -773,11 +773,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -787,11 +787,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h index 80fbc506e..f2f9c6b4b 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h @@ -793,11 +793,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -807,11 +807,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h index 66fd7106f..749d230dc 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type 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 689bc8c93..92585d97c 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/WASP/PowerWASP/Configuration.h b/Marlin/src/config/examples/WASP/PowerWASP/Configuration.h index f0f23d426..13cd36f64 100644 --- a/Marlin/src/config/examples/WASP/PowerWASP/Configuration.h +++ b/Marlin/src/config/examples/WASP/PowerWASP/Configuration.h @@ -783,11 +783,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -797,11 +797,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h index a9fb4b2d2..f36a1a86f 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -774,11 +774,11 @@ //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -788,11 +788,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h index 3842a1333..7e34c3a2c 100644 --- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h +++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h @@ -764,11 +764,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -778,11 +778,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h index d89ee40b3..b963813de 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h @@ -896,11 +896,11 @@ #endif /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -910,11 +910,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type 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 2b8b7cd25..0f1dd82c9 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -846,11 +846,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -860,11 +860,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP // A3K leave disabled! +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h index b6619e562..6b77864fe 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h @@ -846,11 +846,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -860,11 +860,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP // A3K leave disabled! +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type 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 504c2a21f..4b90dcc54 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -846,11 +846,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -860,11 +860,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP // A3K leave disabled! +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h index f4fd208a5..7bb9fdc01 100644 --- a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h +++ b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h @@ -836,11 +836,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -850,11 +850,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h index 41e720fbb..1482cf1db 100644 --- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h +++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h @@ -851,11 +851,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -865,11 +865,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration.h b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration.h index 95498cd8a..3c93a3605 100644 --- a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration.h +++ b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration.h @@ -836,11 +836,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -850,11 +850,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration.h b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration.h index ac25cc0d1..dd689173a 100644 --- a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration.h +++ b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration.h @@ -840,11 +840,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -854,11 +854,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h index 1271c4680..57d9b0509 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration.h +++ b/Marlin/src/config/examples/delta/generic/Configuration.h @@ -836,11 +836,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -850,11 +850,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h index 9ae61b3ce..741611ead 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h @@ -836,11 +836,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -850,11 +850,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h index d53798bb7..02c4a451e 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h @@ -829,11 +829,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -843,11 +843,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h index e6a619fa3..cbab19958 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h @@ -839,11 +839,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -853,11 +853,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h index 7c84e15aa..866210d84 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h @@ -777,11 +777,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -791,11 +791,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h index 4fa124913..962a7de2f 100644 --- a/Marlin/src/config/examples/makibox/Configuration.h +++ b/Marlin/src/config/examples/makibox/Configuration.h @@ -767,11 +767,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -781,11 +781,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h index ee48ee848..afa9b63d0 100644 --- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h +++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h @@ -766,11 +766,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -780,11 +780,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h index 002d079d1..c55a81e16 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h @@ -759,11 +759,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -773,11 +773,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h index f47045c99..46f0aea37 100644 --- a/Marlin/src/config/examples/wt150/Configuration.h +++ b/Marlin/src/config/examples/wt150/Configuration.h @@ -769,11 +769,11 @@ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** - * Z_MIN_PROBE_ENDSTOP + * Z_MIN_PROBE_PIN * - * Enable this option for a probe connected to any pin except Z-Min. - * (By default Marlin assumes the Z-Max endstop pin.) - * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * Define this pin if the probe is not connected to Z_MIN_PIN. + * If not defined the default pin for the selected MOTHERBOARD + * will be used. Most of the time the default is what you want. * * - The simplest option is to use a free endstop connector. * - Use 5V for powered (usually inductive) sensors. @@ -783,11 +783,8 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. * - * WARNING: Setting the wrong pin may have unexpected and potentially - * disastrous consequences. Use with caution and do your homework. - * */ -//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default /** * Probe Type diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp index 977709250..25265bc4a 100644 --- a/Marlin/src/gcode/config/M43.cpp +++ b/Marlin/src/gcode/config/M43.cpp @@ -126,7 +126,7 @@ inline void servo_probe_test() { probe_inverting = Z_MIN_ENDSTOP_INVERTING; - #elif ENABLED(Z_MIN_PROBE_ENDSTOP) + #elif USES_Z_MIN_PROBE_ENDSTOP #define PROBE_TEST_PIN Z_MIN_PROBE_PIN SERIAL_ECHOLNPAIR(". probe uses Z_MIN_PROBE_PIN: ", PROBE_TEST_PIN); diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 049935050..f4b457154 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -505,6 +505,7 @@ #define PROBE_SELECTED (HAS_BED_PROBE || ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING)) #if HAS_BED_PROBE + #define USES_Z_MIN_PROBE_ENDSTOP DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) #ifndef Z_PROBE_LOW_POINT #define Z_PROBE_LOW_POINT -5 #endif @@ -514,7 +515,6 @@ #else // Clear probe pin settings when no probe is selected #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - #undef Z_MIN_PROBE_ENDSTOP #endif #define HOMING_Z_WITH_PROBE (HAS_BED_PROBE && Z_HOME_DIR < 0 && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 7f389c3c5..65e34d94e 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -725,12 +725,12 @@ // Is an endstop plug used for the Z2 endstop or the bed probe? #define IS_Z2_OR_PROBE(A,M) ( \ (Z_MULTI_ENDSTOPS && Z2_USE_ENDSTOP == _##A##M##_) \ - || (ENABLED(Z_MIN_PROBE_ENDSTOP) && Z_MIN_PROBE_PIN == A##_##M##_PIN ) ) + || (USES_Z_MIN_PROBE_ENDSTOP && Z_MIN_PROBE_PIN == A##_##M##_PIN ) ) // Is an endstop plug used for the Z3 endstop or the bed probe? #define IS_Z3_OR_PROBE(A,M) ( \ (ENABLED(Z_TRIPLE_ENDSTOPS) && Z3_USE_ENDSTOP == _##A##M##_) \ - || (ENABLED(Z_MIN_PROBE_ENDSTOP) && Z_MIN_PROBE_PIN == A##_##M##_PIN ) ) + || (USES_Z_MIN_PROBE_ENDSTOP && Z_MIN_PROBE_PIN == A##_##M##_PIN ) ) /** * Set ENDSTOPPULLUPS for active endstop switches @@ -894,7 +894,7 @@ #define HAS_Z2_MAX (PIN_EXISTS(Z2_MAX)) #define HAS_Z3_MIN (PIN_EXISTS(Z3_MIN)) #define HAS_Z3_MAX (PIN_EXISTS(Z3_MAX)) -#define HAS_Z_MIN_PROBE_PIN (PIN_EXISTS(Z_MIN_PROBE)) +#define HAS_Z_MIN_PROBE_PIN (USES_Z_MIN_PROBE_ENDSTOP && PIN_EXISTS(Z_MIN_PROBE)) #define HAS_CALIBRATION_PIN (PIN_EXISTS(CALIBRATION)) // ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 11d9bde1d..13d1331df 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -343,6 +343,8 @@ #error "MAX6675_SS2 is now MAX6675_SS2_PIN. Please update your configuration and/or pins." #elif defined(TMC_Z_CALIBRATION) #error "TMC_Z_CALIBRATION has been deprecated in favor of Z_STEPPER_AUTO_ALIGN. Please update your configuration." +#elif defined(Z_MIN_PROBE_ENDSTOP) + #error "Z_MIN_PROBE_ENDSTOP is no longer required. Please remove it from Configuration.h." #endif #define BOARD_MKS_13 -47 @@ -1018,21 +1020,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS #error "SENSORLESS_PROBING requires a TMC2130 driver on Z." #endif #elif ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) - #if ENABLED(Z_MIN_PROBE_ENDSTOP) - #error "Enable only one option: Z_MIN_PROBE_ENDSTOP or Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN." - #elif DISABLED(USE_ZMIN_PLUG) + #if DISABLED(USE_ZMIN_PLUG) #error "Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN requires USE_ZMIN_PLUG to be enabled." #elif !HAS_Z_MIN #error "Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN requires the Z_MIN_PIN to be defined." #elif Z_MIN_PROBE_ENDSTOP_INVERTING != Z_MIN_ENDSTOP_INVERTING #error "Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN requires Z_MIN_ENDSTOP_INVERTING to match Z_MIN_PROBE_ENDSTOP_INVERTING." #endif - #elif ENABLED(Z_MIN_PROBE_ENDSTOP) - #if !HAS_Z_MIN_PROBE_PIN - #error "Z_MIN_PROBE_ENDSTOP requires the Z_MIN_PROBE_PIN to be defined." - #endif - #else - #error "You must enable either Z_MIN_PROBE_ENDSTOP or Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use a probe." + #elif !HAS_Z_MIN_PROBE_PIN + #error "Z_MIN_PROBE_PIN must be defined if Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN is not enabled." #endif /** diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp index addc6699a..d79c63c77 100644 --- a/Marlin/src/module/endstops.cpp +++ b/Marlin/src/module/endstops.cpp @@ -228,7 +228,7 @@ void Endstops::init() { #endif #endif - #if ENABLED(Z_MIN_PROBE_ENDSTOP) + #if USES_Z_MIN_PROBE_ENDSTOP #if ENABLED(ENDSTOPPULLUP_ZMIN_PROBE) SET_INPUT_PULLUP(Z_MIN_PROBE_PIN); #elif ENABLED(ENDSTOPPULLDOWN_ZMIN_PROBE) @@ -351,7 +351,7 @@ void Endstops::event_handler() { ENDSTOP_HIT_TEST_Y(); ENDSTOP_HIT_TEST_Z(); - #if ENABLED(Z_MIN_PROBE_ENDSTOP) + #if USES_Z_MIN_PROBE_ENDSTOP #define P_AXIS Z_AXIS if (TEST(hit_state, Z_MIN_PROBE)) _ENDSTOP_HIT_ECHO(P, 'P'); #endif @@ -425,7 +425,7 @@ void _O2 Endstops::M119() { #if HAS_Z3_MAX ES_REPORT(Z3_MAX); #endif - #if ENABLED(Z_MIN_PROBE_ENDSTOP) + #if USES_Z_MIN_PROBE_ENDSTOP print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE)); #endif #if HAS_FILAMENT_SENSOR @@ -586,7 +586,7 @@ void Endstops::update() { #endif // When closing the gap check the enabled probe - #if ENABLED(Z_MIN_PROBE_ENDSTOP) + #if USES_Z_MIN_PROBE_ENDSTOP UPDATE_ENDSTOP_BIT(Z, MIN_PROBE); #endif @@ -606,7 +606,7 @@ void Endstops::update() { COPY_LIVE_STATE(Z_MAX, Z3_MAX); #endif #endif - #elif DISABLED(Z_MIN_PROBE_ENDSTOP) || Z_MAX_PIN != Z_MIN_PROBE_PIN + #elif !USES_Z_MIN_PROBE_ENDSTOP || Z_MAX_PIN != Z_MIN_PROBE_PIN // If this pin isn't the bed probe it's the Z endstop UPDATE_ENDSTOP_BIT(Z, MAX); #endif @@ -736,7 +736,7 @@ void Endstops::update() { #else #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) if (z_probe_enabled) PROCESS_ENDSTOP(Z, MIN); - #elif ENABLED(Z_MIN_PROBE_ENDSTOP) + #elif USES_Z_MIN_PROBE_ENDSTOP if (!z_probe_enabled) PROCESS_ENDSTOP(Z, MIN); #else PROCESS_ENDSTOP(Z, MIN); @@ -745,7 +745,7 @@ void Endstops::update() { #endif // When closing the gap check the enabled probe - #if ENABLED(Z_MIN_PROBE_ENDSTOP) + #if USES_Z_MIN_PROBE_ENDSTOP if (z_probe_enabled) PROCESS_ENDSTOP(Z, MIN_PROBE); #endif } @@ -755,7 +755,7 @@ void Endstops::update() { PROCESS_TRIPLE_ENDSTOP(Z, Z2, Z3, MAX); #elif ENABLED(Z_DUAL_ENDSTOPS) PROCESS_DUAL_ENDSTOP(Z, Z2, MAX); - #elif DISABLED(Z_MIN_PROBE_ENDSTOP) || Z_MAX_PIN != Z_MIN_PROBE_PIN + #elif !USES_Z_MIN_PROBE_ENDSTOP || Z_MAX_PIN != Z_MIN_PROBE_PIN // If this pin is not hijacked for the bed probe // then it belongs to the Z endstop PROCESS_ENDSTOP(Z, MAX); diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp index 60a86c7d8..891947558 100644 --- a/Marlin/src/module/motion.cpp +++ b/Marlin/src/module/motion.cpp @@ -1309,7 +1309,7 @@ void set_axis_is_at_home(const AxisEnum axis) { #elif ENABLED(DEBUG_LEVELING_FEATURE) - if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("*** Z HOMED TO ENDSTOP (Z_MIN_PROBE_ENDSTOP) ***"); + if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("*** Z HOMED TO ENDSTOP ***"); #endif } diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index 1eb8ac2b4..ee6bff24c 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -450,7 +450,7 @@ bool set_probe_deployed(const bool deploy) { oldYpos = current_position[Y_AXIS]; #if ENABLED(PROBE_TRIGGERED_WHEN_STOWED_TEST) - #if ENABLED(Z_MIN_PROBE_ENDSTOP) + #if USES_Z_MIN_PROBE_ENDSTOP #define PROBE_STOWED() (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING) #else #define PROBE_STOWED() (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING) @@ -497,7 +497,7 @@ bool set_probe_deployed(const bool deploy) { #endif #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING) - #if ENABLED(Z_MIN_PROBE_ENDSTOP) + #if USES_Z_MIN_PROBE_ENDSTOP #define TEST_PROBE_PIN (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING) #else #define TEST_PROBE_PIN (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 97cc232d5..032a05936 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -812,7 +812,7 @@ // // Disable unused endstop / probe pins // -#if !HAS_BED_PROBE || DISABLED(Z_MIN_PROBE_ENDSTOP) +#if !USES_Z_MIN_PROBE_ENDSTOP #undef Z_MIN_PROBE_PIN #define Z_MIN_PROBE_PIN -1 #endif