From e05af606a8f2fb945cbb7b4fbe23f5ce635da31a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 18 Sep 2016 23:28:11 -0500 Subject: [PATCH] Clean up probe config options --- Marlin/Conditionals_LCD.h | 8 ++ Marlin/Conditionals_post.h | 6 +- Marlin/Configuration.h | 21 ++-- Marlin/SanityCheck.h | 110 ++++++++---------- Marlin/endstops.cpp | 8 +- .../Cartesio/Configuration.h | 21 ++-- .../Felix/Configuration.h | 21 ++-- .../Felix/DUAL/Configuration.h | 21 ++-- .../Hephestos/Configuration.h | 21 ++-- .../Hephestos_2/Configuration.h | 21 ++-- .../K8200/Configuration.h | 21 ++-- .../K8400/Configuration.h | 21 ++-- .../K8400/Dual-head/Configuration.h | 21 ++-- .../RepRapWorld/Megatronics/Configuration.h | 21 ++-- .../RigidBot/Configuration.h | 21 ++-- .../SCARA/Configuration.h | 21 ++-- .../TAZ4/Configuration.h | 21 ++-- .../WITBOX/Configuration.h | 21 ++-- .../adafruit/ST7565/Configuration.h | 21 ++-- .../delta/biv2.5/Configuration.h | 21 ++-- .../delta/generic/Configuration.h | 21 ++-- .../delta/kossel_mini/Configuration.h | 21 ++-- .../delta/kossel_pro/Configuration.h | 21 ++-- .../delta/kossel_xl/Configuration.h | 21 ++-- .../makibox/Configuration.h | 21 ++-- .../tvrrug/Round2/Configuration.h | 21 ++-- Marlin/pins.h | 2 +- 27 files changed, 284 insertions(+), 312 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index a3ee093b4..21bfdd4ee 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -345,4 +345,12 @@ */ #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED)) + /** + * Clear probe pin settings when no probe is selected + */ + #if !PROBE_SELECTED + #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + #undef Z_MIN_PROBE_ENDSTOP + #endif + #endif //CONDITIONALS_LCD_H diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index 2ac1dfeb1..9bd0de86a 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -409,9 +409,6 @@ #if ENABLED(USE_ZMIN_PLUG) #define ENDSTOPPULLUP_ZMIN #endif - #if DISABLED(DISABLE_Z_MIN_PROBE_ENDSTOP) - #define ENDSTOPPULLUP_ZMIN_PROBE - #endif #endif /** @@ -589,6 +586,9 @@ * Bed Probe dependencies */ #if HAS_BED_PROBE + #if ENABLED(ENDSTOPPULLUPS) && HAS_Z_MIN_PROBE_PIN + #define ENDSTOPPULLUP_ZMIN_PROBE + #endif #ifndef Z_PROBE_OFFSET_RANGE_MIN #define Z_PROBE_OFFSET_RANGE_MIN -20 #endif diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 87b4d58a5..0361d8eea 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -573,9 +573,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -593,16 +590,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -611,12 +616,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 6ed5bfe21..dccf7b8ea 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -352,6 +352,42 @@ #if PROBE_SELECTED + /** + * Only allow one probe option to be defined + */ + #define COUNT_PROBE_1 0 + #if ENABLED(FIX_MOUNTED_PROBE) + #define COUNT_PROBE_2 INCREMENT(COUNT_PROBE_1) + #else + #define COUNT_PROBE_2 COUNT_PROBE_1 + #endif + #if HAS_Z_SERVO_ENDSTOP && DISABLED(BLTOUCH) + #define COUNT_PROBE_3 INCREMENT(COUNT_PROBE_2) + #else + #define COUNT_PROBE_3 COUNT_PROBE_2 + #endif + #if ENABLED(BLTOUCH) + #define COUNT_PROBE_4 INCREMENT(COUNT_PROBE_3) + #else + #define COUNT_PROBE_4 COUNT_PROBE_3 + #endif + #if ENABLED(Z_PROBE_ALLEN_KEY) + #define COUNT_PROBE_5 INCREMENT(COUNT_PROBE_4) + #else + #define COUNT_PROBE_5 COUNT_PROBE_4 + #endif + #if ENABLED(Z_PROBE_SLED) + #define COUNT_PROBE_6 INCREMENT(COUNT_PROBE_5) + #else + #define COUNT_PROBE_6 COUNT_PROBE_5 + #endif + #if COUNT_PROBE_6 > 1 + #error "Please enable only one probe: FIX_MOUNTED_PROBE, Z Servo, BLTOUCH, Z_PROBE_ALLEN_KEY, or Z_PROBE_SLED." + #endif + + /** + * Z_PROBE_SLED is incompatible with DELTA + */ #if ENABLED(Z_PROBE_SLED) && ENABLED(DELTA) #error "You cannot use Z_PROBE_SLED with DELTA." #endif @@ -368,72 +404,22 @@ #endif /** - * A probe needs a pin - */ - #if !PROBE_PIN_CONFIGURED - #error "A probe needs a pin! Use Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN or Z_MIN_PROBE_PIN." - #endif - - /** - * Require a Z min pin + * Require pin options and pins to be defined */ - #if HAS_Z_MIN - // Z_MIN_PIN and Z_MIN_PROBE_PIN can't co-exist when Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - #if HAS_Z_MIN_PROBE_PIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) - #error "A probe cannot have more than one pin! Use Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN or Z_MIN_PROBE_PIN." + #if 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) + #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." #endif - #elif !HAS_Z_MIN_PROBE_PIN || (DISABLED(Z_MIN_PROBE_ENDSTOP) || ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP)) - // A pin was set for the Z probe, but not enabled. - #error "A probe requires a Z_MIN or Z_PROBE pin. Z_MIN_PIN or Z_MIN_PROBE_PIN must point to a valid hardware pin." - #endif - - /** - * Make sure the plug is enabled if it's used - */ - #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && DISABLED(USE_ZMIN_PLUG) - #error "You must enable USE_ZMIN_PLUG if any probe or endstop is connected to the ZMIN plug." - #endif - - /** - * Only allow one probe option to be defined - */ - #if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \ - || (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \ - || (HAS_Z_SERVO_ENDSTOP && ENABLED(Z_PROBE_SLED)) - #error "Please define only one type of probe: Z Servo/BLTOUCH, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE." - #endif - - /** - * Don't allow nonsense probe-pin settings - */ - #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && ENABLED(Z_MIN_PROBE_ENDSTOP) - #error "You can't enable both Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN and Z_MIN_PROBE_ENDSTOP." - #elif ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP) - #error "Don't enable DISABLE_Z_MIN_PROBE_ENDSTOP with Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN." - #elif ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP) && DISABLED(Z_MIN_PROBE_ENDSTOP) - #error "DISABLE_Z_MIN_PROBE_ENDSTOP requires Z_MIN_PROBE_ENDSTOP to be set." - #endif - - /** - * Require a Z probe pin if Z_MIN_PROBE_ENDSTOP is enabled. - */ - #if ENABLED(Z_MIN_PROBE_ENDSTOP) + #elif ENABLED(Z_MIN_PROBE_ENDSTOP) #if !HAS_Z_MIN_PROBE_PIN - #error "Z_MIN_PROBE_ENDSTOP requires a Z_MIN_PROBE_PIN in your board's pins_XXXX.h file." + #error "Z_MIN_PROBE_ENDSTOP requires the Z_MIN_PROBE_PIN to be defined." #endif - // Forcing Servo definitions can break some hall effect sensor setups. Leaving these here for further comment. - //#ifndef NUM_SERVOS - // #error "You must have NUM_SERVOS defined and there must be at least 1 configured to use Z_MIN_PROBE_ENDSTOP." - //#endif - //#if defined(NUM_SERVOS) && NUM_SERVOS < 1 - // #error "You must have at least 1 servo defined for NUM_SERVOS to use Z_MIN_PROBE_ENDSTOP." - //#endif - //#if Z_ENDSTOP_SERVO_NR < 0 - // #error "You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_MIN_PROBE_ENDSTOP." - //#endif - //#ifndef Z_SERVO_ANGLES - // #error "You must have Z_SERVO_ANGLES defined for Z Extend and Retract to use Z_MIN_PROBE_ENDSTOP." - //#endif + #else + #error "You must enable either Z_MIN_PROBE_ENDSTOP or Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use a probe." #endif /** diff --git a/Marlin/endstops.cpp b/Marlin/endstops.cpp index 751296d40..5cbc382f7 100644 --- a/Marlin/endstops.cpp +++ b/Marlin/endstops.cpp @@ -122,7 +122,7 @@ void Endstops::init() { #endif #endif - #if HAS_Z_MIN_PROBE_PIN && ENABLED(Z_MIN_PROBE_ENDSTOP) // Check for Z_MIN_PROBE_ENDSTOP so we don't pull a pin high unless it's to be used. + #if ENABLED(Z_MIN_PROBE_ENDSTOP) SET_INPUT(Z_MIN_PROBE_PIN); #if ENABLED(ENDSTOPPULLUP_ZMIN_PROBE) WRITE(Z_MIN_PROBE_PIN,HIGH); @@ -209,7 +209,7 @@ void Endstops::M119() { SERIAL_PROTOCOLPGM(MSG_Z2_MAX); SERIAL_PROTOCOLLN(((READ(Z2_MAX_PIN)^Z2_MAX_ENDSTOP_INVERTING) ? MSG_ENDSTOP_HIT : MSG_ENDSTOP_OPEN)); #endif - #if HAS_Z_MIN_PROBE_PIN + #if ENABLED(Z_MIN_PROBE_ENDSTOP) SERIAL_PROTOCOLPGM(MSG_Z_PROBE); SERIAL_PROTOCOLLN(((READ(Z_MIN_PROBE_PIN)^Z_MIN_PROBE_ENDSTOP_INVERTING) ? MSG_ENDSTOP_HIT : MSG_ENDSTOP_OPEN)); #endif @@ -331,7 +331,7 @@ void Endstops::update() { #else // !Z_DUAL_ENDSTOPS - #if HAS_BED_PROBE && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) + #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) if (z_probe_enabled) UPDATE_ENDSTOP(Z, MIN); #else UPDATE_ENDSTOP(Z, MIN); @@ -341,7 +341,7 @@ void Endstops::update() { #endif // HAS_Z_MIN - #if HAS_BED_PROBE && ENABLED(Z_MIN_PROBE_ENDSTOP) && DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) + #if ENABLED(Z_MIN_PROBE_ENDSTOP) if (z_probe_enabled) { UPDATE_ENDSTOP(Z, MIN_PROBE); if (TEST_ENDSTOP(Z_MIN_PROBE)) SBI(endstop_hit_bits, Z_MIN_PROBE); diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index 452ec3276..da7161e3c 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -556,9 +556,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -576,16 +573,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -594,12 +599,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 8ae7eff30..16802dfd3 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -539,9 +539,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -559,16 +556,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -577,12 +582,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index 44581c6f1..b8baf3c67 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -537,9 +537,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -557,16 +554,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -575,12 +580,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index c642467b5..5bac996bb 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -548,9 +548,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -568,16 +565,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// #define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -586,12 +591,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index a7094c0f3..fc5a6cf92 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -550,9 +550,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -570,16 +567,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// #define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -588,12 +593,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index efc72e13f..87142b70b 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -573,9 +573,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -593,16 +590,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -611,12 +616,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index ad21151af..e3c7b8433 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -556,9 +556,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -576,16 +573,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -594,12 +599,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index fddbb12c5..27f58977d 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -556,9 +556,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -576,16 +573,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -594,12 +599,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 794ec71dd..1755e47d3 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -556,9 +556,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -576,16 +573,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -594,12 +599,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index c2d8ed6b7..1f4cd5747 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -554,9 +554,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -574,16 +571,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -592,12 +597,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 5ca470662..a0bc7066d 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -566,9 +566,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -586,16 +583,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -604,12 +609,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 54a4ace02..495e11bdf 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -577,9 +577,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -597,16 +594,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -615,12 +620,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 8b10193dc..b46ce3148 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -548,9 +548,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -568,16 +565,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -586,12 +591,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 056e603ae..fd239237e 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -556,9 +556,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -576,16 +573,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -594,12 +599,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index f196ba96d..cbbe08b11 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -646,9 +646,6 @@ #endif // Z_PROBE_ALLEN_KEY -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -666,16 +663,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -684,12 +689,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 06ad8e129..f609017fe 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -640,9 +640,6 @@ #endif // Z_PROBE_ALLEN_KEY -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -660,16 +657,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// #define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -678,12 +683,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 83d70a54c..7bed412b1 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -643,9 +643,6 @@ #endif // Z_PROBE_ALLEN_KEY -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -663,16 +660,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -681,12 +686,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index ef820d42b..264077dcf 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -644,9 +644,6 @@ #endif // Z_PROBE_ALLEN_KEY -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -664,16 +661,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -682,12 +687,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 4b25bf171..eddc9fbb4 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -646,9 +646,6 @@ #endif // Z_PROBE_ALLEN_KEY -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -666,16 +663,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// #define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -684,12 +689,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index d194a1d33..9a76b77a8 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -559,9 +559,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -579,16 +576,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -597,12 +602,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 9168a026a..40c317a52 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -552,9 +552,6 @@ // Allen Key Probe is defined in the Delta example configurations. // -// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. -// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. -// // *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** // // To continue using the Z-min-endstop for homing, be sure to disable Z_SAFE_HOMING. @@ -572,16 +569,24 @@ // - normally-open switches to 5V and D32. // // Normally-closed switches are advised and are the default. +// + // // The Z_MIN_PROBE_PIN sets the Arduino pin to use. (See your board's pins file.) // Since the RAMPS Aux4->D32 pin maps directly to the Arduino D32 pin, D32 is the -// default pin for all RAMPS-based boards. Some other boards map differently. -// To set or change the pin for your board, edit the appropriate pins_XXXXX.h file. +// default pin for all RAMPS-based boards. Most boards use the X_MAX_PIN by default. +// To use a different pin you can override it here. // // WARNING: // Setting the wrong pin may have unexpected and potentially disastrous consequences. // Use with caution and do your homework. // +//#define Z_MIN_PROBE_PIN X_MAX_PIN + +// +// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine. +// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing. +// //#define Z_MIN_PROBE_ENDSTOP // Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE. @@ -590,12 +595,6 @@ // To use a probe you must enable one of the two options above! -// This option disables the use of the Z_MIN_PROBE_PIN -// To enable the Z probe pin but disable its use, uncomment the line below. This only affects a -// Z probe switch if you have a separate Z min endstop also and have activated Z_MIN_PROBE_ENDSTOP above. -// If you're using the Z MIN endstop connector for your Z probe, this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST diff --git a/Marlin/pins.h b/Marlin/pins.h index bc1ede37f..48f3cf7eb 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -361,7 +361,7 @@ // // Disable unused endstop / probe pins // -#if ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP) || DISABLED(Z_MIN_PROBE_ENDSTOP) // Allow code to compile regardless of Z_MIN_PROBE_ENDSTOP setting. +#if DISABLED(Z_MIN_PROBE_ENDSTOP) #undef Z_MIN_PROBE_PIN #define Z_MIN_PROBE_PIN -1 #endif