From 10da7ac86c30321880e9ac8f2028b7e9035bc208 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 26 Jun 2016 13:56:30 -0700 Subject: [PATCH] Combine Z raise before/after options --- Marlin/Conditionals.h | 8 ++++++++ Marlin/Configuration.h | 7 ++----- Marlin/Marlin_main.cpp | 20 +++++++++---------- .../Cartesio/Configuration.h | 7 ++----- .../Felix/Configuration.h | 7 ++----- .../Felix/DUAL/Configuration.h | 7 ++----- .../Hephestos/Configuration.h | 7 ++----- .../Hephestos_2/Configuration.h | 7 ++----- .../K8200/Configuration.h | 7 ++----- .../RepRapWorld/Megatronics/Configuration.h | 7 ++----- .../RigidBot/Configuration.h | 7 ++----- .../SCARA/Configuration.h | 7 ++----- .../TAZ4/Configuration.h | 7 ++----- .../WITBOX/Configuration.h | 7 ++----- .../adafruit/ST7565/Configuration.h | 7 ++----- .../delta/biv2.5/Configuration.h | 7 ++----- .../delta/generic/Configuration.h | 7 ++----- .../delta/kossel_mini/Configuration.h | 7 ++----- .../delta/kossel_pro/Configuration.h | 7 ++----- .../delta/kossel_xl/Configuration.h | 7 ++----- .../makibox/Configuration.h | 7 ++----- .../tvrrug/Round2/Configuration.h | 7 ++----- 22 files changed, 58 insertions(+), 110 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index c1db34cb19..f88b41d8b6 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -796,6 +796,14 @@ #define XY_PROBE_SPEED 4000 #endif #endif + #ifndef Z_RAISE_PROBE_DEPLOY_STOW + #if defined(Z_RAISE_BEFORE_PROBING) && defined(Z_RAISE_AFTER_PROBING) + #define Z_RAISE_PROBE_DEPLOY_STOW (max(Z_RAISE_BEFORE_PROBING, Z_RAISE_AFTER_PROBING)) + #else + #error "You must set Z_RAISE_PROBE_DEPLOY_STOW in your configuration." + #endif + #endif + #define _Z_RAISE_PROBE_DEPLOY_STOW (max(Z_RAISE_PROBE_DEPLOY_STOW, Z_RAISE_BETWEEN_PROBINGS)) #endif /** diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index ce046ca647..01c10530a7 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -509,12 +509,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 271fda4d3e..b41065bb44 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1767,8 +1767,8 @@ static void clean_up_after_endstop_or_probe_move() { float oldXpos = current_position[X_AXIS]; // save x position float old_feedrate = feedrate; if (dock) { - #if Z_RAISE_AFTER_PROBING > 0 - do_probe_raise(Z_RAISE_AFTER_PROBING); + #if _Z_RAISE_PROBE_DEPLOY_STOW > 0 + do_probe_raise(_Z_RAISE_PROBE_DEPLOY_STOW); #endif // Dock sled a bit closer to ensure proper capturing feedrate = XY_PROBE_FEEDRATE; @@ -1778,7 +1778,7 @@ static void clean_up_after_endstop_or_probe_move() { else { feedrate = XY_PROBE_FEEDRATE; float z_loc = current_position[Z_AXIS]; - if (z_loc < Z_RAISE_BEFORE_PROBING + 5) z_loc = Z_RAISE_BEFORE_PROBING; + if (z_loc < _Z_RAISE_PROBE_DEPLOY_STOW + 5) z_loc = _Z_RAISE_PROBE_DEPLOY_STOW; do_blocking_move_to(X_MAX_POS + SLED_DOCKING_OFFSET + offset, current_position[Y_AXIS], z_loc); // this also updates current_position digitalWrite(SLED_PIN, HIGH); // turn on magnet } @@ -1800,8 +1800,8 @@ static void clean_up_after_endstop_or_probe_move() { if (endstops.z_probe_enabled) return; // Make room for probe - #if Z_RAISE_BEFORE_PROBING > 0 - do_probe_raise(Z_RAISE_BEFORE_PROBING); + #if _Z_RAISE_PROBE_DEPLOY_STOW > 0 + do_probe_raise(_Z_RAISE_PROBE_DEPLOY_STOW); #endif #if ENABLED(Z_PROBE_SLED) @@ -1904,8 +1904,8 @@ static void clean_up_after_endstop_or_probe_move() { if (!endstops.z_probe_enabled) return; // Make more room for the servo - #if Z_RAISE_AFTER_PROBING > 0 - do_probe_raise(Z_RAISE_AFTER_PROBING); + #if _Z_RAISE_PROBE_DEPLOY_STOW > 0 + do_probe_raise(_Z_RAISE_PROBE_DEPLOY_STOW); #endif #if ENABLED(Z_PROBE_SLED) @@ -1924,8 +1924,8 @@ static void clean_up_after_endstop_or_probe_move() { // Move up for safety feedrate = Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE; - #if Z_RAISE_AFTER_PROBING > 0 - destination[Z_AXIS] = current_position[Z_AXIS] + Z_RAISE_AFTER_PROBING; + #if _Z_RAISE_PROBE_DEPLOY_STOW > 0 + destination[Z_AXIS] = current_position[Z_AXIS] + _Z_RAISE_PROBE_DEPLOY_STOW; prepare_move_to_destination_raw(); // this will also set_current_to_destination #endif @@ -3596,7 +3596,7 @@ inline void gcode_G28() { #endif // !AUTO_BED_LEVELING_GRID - // Raise to Z_RAISE_AFTER_PROBING. Stow the probe. + // Raise to _Z_RAISE_PROBE_DEPLOY_STOW. Stow the probe. stow_z_probe(); // Restore state after probing diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index 69997fbab7..915be5b55a 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -508,12 +508,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 9acb21c1c3..62aa357f8c 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -491,12 +491,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index 9431c20845..e20fa12118 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -489,12 +489,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index fd98445be6..a1995b3b35 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -501,12 +501,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 78ec36f713..f15ad7a489 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -503,12 +503,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 5 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 5 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 5 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 2 // Raise between probing points. // diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 115e69d618..54362c2506 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -526,12 +526,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index a0445647f1..356c706c89 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -509,12 +509,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 5f069bac50..91e5dba800 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -503,12 +503,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index ee7a0e0f8f..cc10ca773f 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -517,12 +517,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 043ebb3f38..77a5b1d96c 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -530,12 +530,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index a15f582e0b..b560808722 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -501,12 +501,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index e56c6b3274..5039f64e93 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -509,12 +509,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index f4147a0cca..aca16d02d6 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -588,12 +588,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 50 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 50 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index f84451d8ea..5e2afed027 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -582,12 +582,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 50 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index d6b6405af0..f27d377109 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -585,12 +585,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 50 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 50 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index d6572bb973..36fbd8e1a1 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -579,12 +579,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 100 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 100 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 49dc554033..48cc54ffff 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -580,12 +580,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 20 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 20 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 20 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 10 // Raise between probing points. // diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 444c46e236..f1b0c813d2 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -512,12 +512,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. // diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 5d46e05e90..b693cb22bc 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -499,12 +499,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define Z_MIN_PROBE_REPEATABILITY_TEST // -// Probe Raise options provide clearance for the probe to deploy and stow. +// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // -// For G28 these apply when the probe deploys and stows. -// For G29 these apply before and after the full procedure. -#define Z_RAISE_BEFORE_PROBING 15 // Raise before probe deploy (e.g., the first probe). -#define Z_RAISE_AFTER_PROBING 15 // Raise before probe stow (e.g., the last probe). +#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. //