From 0e7d638a7afee51aea7c93796724e612f456eef5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 13 Sep 2016 20:25:12 -0500 Subject: [PATCH 1/2] Revert to Probe Raise rather than Probe Height --- Marlin/Conditionals_post.h | 16 +++++----- Marlin/Configuration.h | 22 +++++++++---- Marlin/Marlin_main.cpp | 32 +++++++++---------- Marlin/SanityCheck.h | 22 +++++++------ .../Cartesio/Configuration.h | 22 +++++++++---- .../Felix/Configuration.h | 22 +++++++++---- .../Felix/DUAL/Configuration.h | 22 +++++++++---- .../Hephestos/Configuration.h | 22 +++++++++---- .../Hephestos_2/Configuration.h | 22 +++++++++---- .../K8200/Configuration.h | 22 +++++++++---- .../K8400/Configuration.h | 22 +++++++++---- .../K8400/Dual-head/Configuration.h | 22 +++++++++---- .../RepRapWorld/Megatronics/Configuration.h | 22 +++++++++---- .../RigidBot/Configuration.h | 22 +++++++++---- .../SCARA/Configuration.h | 22 +++++++++---- .../TAZ4/Configuration.h | 22 +++++++++---- .../WITBOX/Configuration.h | 22 +++++++++---- .../adafruit/ST7565/Configuration.h | 22 +++++++++---- .../delta/biv2.5/Configuration.h | 22 +++++++++---- .../delta/generic/Configuration.h | 22 +++++++++---- .../delta/kossel_mini/Configuration.h | 22 +++++++++---- .../delta/kossel_pro/Configuration.h | 22 +++++++++---- .../delta/kossel_xl/Configuration.h | 22 +++++++++---- .../makibox/Configuration.h | 22 +++++++++---- .../tvrrug/Round2/Configuration.h | 22 +++++++++---- 25 files changed, 387 insertions(+), 167 deletions(-) diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index 2614217bb..8c530395a 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -602,10 +602,10 @@ #define XY_PROBE_SPEED 4000 #endif #endif - #if Z_PROBE_TRAVEL_HEIGHT > Z_PROBE_DEPLOY_HEIGHT - #define _Z_PROBE_DEPLOY_HEIGHT Z_PROBE_TRAVEL_HEIGHT + #if Z_RAISE_BETWEEN_PROBES > Z_RAISE_DEPLOY_PROBE + #define _Z_RAISE_DEPLOY_PROBE Z_RAISE_BETWEEN_PROBES #else - #define _Z_PROBE_DEPLOY_HEIGHT Z_PROBE_DEPLOY_HEIGHT + #define _Z_RAISE_DEPLOY_PROBE Z_RAISE_DEPLOY_PROBE #endif #else #undef X_PROBE_OFFSET_FROM_EXTRUDER @@ -681,17 +681,17 @@ #endif /** - * Z_HOMING_HEIGHT / Z_PROBE_TRAVEL_HEIGHT + * Z_HOMING_HEIGHT / Z_RAISE_BETWEEN_PROBES */ #ifndef Z_HOMING_HEIGHT - #ifndef Z_PROBE_TRAVEL_HEIGHT + #ifndef Z_RAISE_BETWEEN_PROBES #define Z_HOMING_HEIGHT 0 #else - #define Z_HOMING_HEIGHT Z_PROBE_TRAVEL_HEIGHT + #define Z_HOMING_HEIGHT Z_RAISE_BETWEEN_PROBES #endif #endif - #ifndef Z_PROBE_TRAVEL_HEIGHT - #define Z_PROBE_TRAVEL_HEIGHT Z_HOMING_HEIGHT + #ifndef Z_RAISE_BETWEEN_PROBES + #define Z_RAISE_BETWEEN_PROBES Z_HOMING_HEIGHT #endif #if IS_KINEMATIC diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 0361d8eea..41774ae51 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -619,12 +619,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 10 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 63dfcf76b..b058e7bb7 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1631,7 +1631,10 @@ static void clean_up_after_endstop_or_probe_move() { SERIAL_ECHOLNPGM(")"); } #endif + float z_dest = LOGICAL_Z_POSITION(z_raise); + if (zprobe_zoffset < 0) z_dest -= zprobe_zoffset; + if (z_dest > current_position[Z_AXIS]) do_blocking_move_to_z(z_dest); } @@ -1879,7 +1882,7 @@ static void clean_up_after_endstop_or_probe_move() { if (endstops.z_probe_enabled == deploy) return false; // Make room for probe - do_probe_raise(_Z_PROBE_DEPLOY_HEIGHT); + do_probe_raise(_Z_RAISE_DEPLOY_PROBE); // Check BLTOUCH probe status for an error #if ENABLED(BLTOUCH) @@ -1988,7 +1991,7 @@ static void clean_up_after_endstop_or_probe_move() { // If the nozzle is above the travel height then // move down quickly before doing the slow probe - float z = LOGICAL_Z_POSITION(Z_PROBE_TRAVEL_HEIGHT); + float z = LOGICAL_Z_POSITION(Z_RAISE_BETWEEN_PROBES); if (z < current_position[Z_AXIS]) do_blocking_move_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)); @@ -2027,7 +2030,7 @@ static void clean_up_after_endstop_or_probe_move() { float old_feedrate_mm_s = feedrate_mm_s; // Ensure a minimum height before moving the probe - do_probe_raise(Z_PROBE_TRAVEL_HEIGHT); + do_probe_raise(Z_RAISE_BETWEEN_PROBES); // Move to the XY where we shall probe #if ENABLED(DEBUG_LEVELING_FEATURE) @@ -2047,15 +2050,10 @@ static void clean_up_after_endstop_or_probe_move() { float measured_z = run_z_probe(); - if (stow) { + if (!stow) + do_probe_raise(Z_RAISE_BETWEEN_PROBES); + else if (STOW_PROBE()) return NAN; - } - else { - #if ENABLED(DEBUG_LEVELING_FEATURE) - if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> do_probe_raise"); - #endif - do_probe_raise(Z_PROBE_TRAVEL_HEIGHT); - } if (verbose_level > 2) { SERIAL_PROTOCOLPGM("Bed X: "); @@ -3099,8 +3097,8 @@ inline void gcode_G28() { feedrate_mm_s = homing_feedrate_mm_s[X_AXIS]; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z - #if Z_PROBE_TRAVEL_HEIGHT > Z_HOMING_HEIGHT - + Z_PROBE_TRAVEL_HEIGHT + #if Z_RAISE_BETWEEN_PROBES > Z_HOMING_HEIGHT + + Z_RAISE_BETWEEN_PROBES #elif Z_HOMING_HEIGHT > 0 + Z_HOMING_HEIGHT #endif @@ -3111,7 +3109,7 @@ inline void gcode_G28() { current_position[Y_AXIS] = LOGICAL_Y_POSITION(y); line_to_current_position(); - #if Z_PROBE_TRAVEL_HEIGHT > 0 || Z_HOMING_HEIGHT > 0 + #if Z_RAISE_BETWEEN_PROBES > 0 || Z_HOMING_HEIGHT > 0 current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z); line_to_current_position(); #endif @@ -3206,8 +3204,8 @@ inline void gcode_G28() { else { // One last "return to the bed" (as originally coded) at completion current_position[Z_AXIS] = MESH_HOME_SEARCH_Z - #if Z_PROBE_TRAVEL_HEIGHT > Z_HOMING_HEIGHT - + Z_PROBE_TRAVEL_HEIGHT + #if Z_RAISE_BETWEEN_PROBES > Z_HOMING_HEIGHT + + Z_RAISE_BETWEEN_PROBES #elif Z_HOMING_HEIGHT > 0 + Z_HOMING_HEIGHT #endif @@ -3560,7 +3558,7 @@ inline void gcode_G28() { #endif // AUTO_BED_LEVELING_3POINT - // Raise to _Z_PROBE_DEPLOY_HEIGHT. Stow the probe. + // Raise to _Z_RAISE_DEPLOY_PROBE. Stow the probe. if (STOW_PROBE()) return; // Restore state after probing diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index dccf7b8ea..497409fc7 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -130,9 +130,11 @@ #elif defined(MIN_Z_HEIGHT_FOR_HOMING) #error "MIN_Z_HEIGHT_FOR_HOMING is now Z_HOMING_HEIGHT. Please update your configuration." #elif defined(Z_RAISE_BEFORE_PROBING) || defined(Z_RAISE_AFTER_PROBING) - #error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_PROBE_DEPLOY_HEIGHT instead." + #error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_RAISE_DEPLOY_PROBE instead." #elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS) - #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT Please update your configuration." + #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_RAISE_DEPLOY_PROBE and Z_RAISE_BETWEEN_PROBES. Please update your configuration." +#elif defined(Z_PROBE_DEPLOY_HEIGHT) || defined(Z_PROBE_TRAVEL_HEIGHT) + #error "Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT are now Z_RAISE_DEPLOY_PROBE and Z_RAISE_BETWEEN_PROBES. Please update your configuration." #elif !defined(MIN_STEPS_PER_SEGMENT) #error Please replace "const int dropsegments" with "#define MIN_STEPS_PER_SEGMENT" (and increase by 1) in Configuration_adv.h. #elif defined(PREVENT_DANGEROUS_EXTRUDE) @@ -425,14 +427,14 @@ /** * Make sure Z raise values are set */ - #if !defined(Z_PROBE_DEPLOY_HEIGHT) - #error "You must set Z_PROBE_DEPLOY_HEIGHT in your configuration." - #elif !defined(Z_PROBE_TRAVEL_HEIGHT) - #error "You must set Z_PROBE_TRAVEL_HEIGHT in your configuration." - #elif Z_PROBE_DEPLOY_HEIGHT < 0 - #error "Probes need Z_PROBE_DEPLOY_HEIGHT >= 0." - #elif Z_PROBE_TRAVEL_HEIGHT < 0 - #error "Probes need Z_PROBE_TRAVEL_HEIGHT >= 0." + #if !defined(Z_RAISE_DEPLOY_PROBE) + #error "You must define Z_RAISE_DEPLOY_PROBE in your configuration." + #elif !defined(Z_RAISE_BETWEEN_PROBES) + #error "You must define Z_RAISE_BETWEEN_PROBES in your configuration." + #elif Z_RAISE_DEPLOY_PROBE < 0 + #error "Probes need Z_RAISE_DEPLOY_PROBE >= 0." + #elif Z_RAISE_BETWEEN_PROBES < 0 + #error "Probes need Z_RAISE_BETWEEN_PROBES >= 0." #endif #else diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index da7161e3c..3966c2eb2 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -602,12 +602,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 16802dfd3..cba4ee8c8 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -585,12 +585,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index b8baf3c67..d17be9a9c 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -583,12 +583,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 5bac996bb..425035e88 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -594,12 +594,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index fc5a6cf92..b62ecec2c 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -596,12 +596,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 5 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 2 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 5 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 2 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 87142b70b..f08613ac5 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -619,12 +619,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index e3c7b8433..630fe90d6 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -602,12 +602,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index 27f58977d..5716bc271 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -602,12 +602,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 1755e47d3..f6a5f449c 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -602,12 +602,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 1f4cd5747..969736ab1 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -600,12 +600,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index a0bc7066d..375b5140d 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -612,12 +612,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 495e11bdf..2c9f17bf9 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -623,12 +623,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index b46ce3148..7bd102ddc 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -594,12 +594,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index fd239237e..9e504e4ca 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -602,12 +602,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index cbbe08b11..38d9c9b11 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -692,12 +692,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 50 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 50 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index f609017fe..707375d3a 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -686,12 +686,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 7bed412b1..b447e5379 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -689,12 +689,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 50 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 50 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 264077dcf..fd3edb461 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -690,12 +690,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 100 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 100 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index eddc9fbb4..a5fd2c18a 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -692,12 +692,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 20 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 10 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 20 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 10 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 9a76b77a8..b9a5dc306 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -605,12 +605,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 40c317a52..5b70e2d89 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -598,12 +598,22 @@ // Enable Z Probe Repeatability test to see how accurate your probe is //#define Z_MIN_PROBE_REPEATABILITY_TEST -// -// Minimum heights for the probe to deploy/stow and travel. -// These values specify the distance from the NOZZLE to the BED. -// -#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow -#define Z_PROBE_TRAVEL_HEIGHT 5 // Z position for travel between points +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + */ +#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow +#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points // // For M851 give a range for adjusting the Z probe offset From 01f1028510ad28c699e66b28a7eb96ecc43d20b7 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 20 Sep 2016 03:49:42 -0500 Subject: [PATCH 2/2] Try on "CLEARANCE" for size --- Marlin/Conditionals_post.h | 16 +++++++------- Marlin/Configuration.h | 8 +++---- Marlin/Marlin_main.cpp | 20 ++++++++--------- Marlin/SanityCheck.h | 22 +++++++++---------- .../Cartesio/Configuration.h | 8 +++---- .../Felix/Configuration.h | 8 +++---- .../Felix/DUAL/Configuration.h | 8 +++---- .../Hephestos/Configuration.h | 8 +++---- .../Hephestos_2/Configuration.h | 8 +++---- .../K8200/Configuration.h | 8 +++---- .../K8400/Configuration.h | 8 +++---- .../K8400/Dual-head/Configuration.h | 8 +++---- .../RepRapWorld/Megatronics/Configuration.h | 8 +++---- .../RigidBot/Configuration.h | 8 +++---- .../SCARA/Configuration.h | 8 +++---- .../TAZ4/Configuration.h | 8 +++---- .../WITBOX/Configuration.h | 8 +++---- .../adafruit/ST7565/Configuration.h | 8 +++---- .../delta/biv2.5/Configuration.h | 8 +++---- .../delta/generic/Configuration.h | 8 +++---- .../delta/kossel_mini/Configuration.h | 8 +++---- .../delta/kossel_pro/Configuration.h | 8 +++---- .../delta/kossel_xl/Configuration.h | 8 +++---- .../makibox/Configuration.h | 8 +++---- .../tvrrug/Round2/Configuration.h | 8 +++---- 25 files changed, 117 insertions(+), 117 deletions(-) diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index 8c530395a..89b8afb65 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -602,10 +602,10 @@ #define XY_PROBE_SPEED 4000 #endif #endif - #if Z_RAISE_BETWEEN_PROBES > Z_RAISE_DEPLOY_PROBE - #define _Z_RAISE_DEPLOY_PROBE Z_RAISE_BETWEEN_PROBES + #if Z_CLEARANCE_BETWEEN_PROBES > Z_CLEARANCE_DEPLOY_PROBE + #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_BETWEEN_PROBES #else - #define _Z_RAISE_DEPLOY_PROBE Z_RAISE_DEPLOY_PROBE + #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_DEPLOY_PROBE #endif #else #undef X_PROBE_OFFSET_FROM_EXTRUDER @@ -681,17 +681,17 @@ #endif /** - * Z_HOMING_HEIGHT / Z_RAISE_BETWEEN_PROBES + * Z_HOMING_HEIGHT / Z_CLEARANCE_BETWEEN_PROBES */ #ifndef Z_HOMING_HEIGHT - #ifndef Z_RAISE_BETWEEN_PROBES + #ifndef Z_CLEARANCE_BETWEEN_PROBES #define Z_HOMING_HEIGHT 0 #else - #define Z_HOMING_HEIGHT Z_RAISE_BETWEEN_PROBES + #define Z_HOMING_HEIGHT Z_CLEARANCE_BETWEEN_PROBES #endif #endif - #ifndef Z_RAISE_BETWEEN_PROBES - #define Z_RAISE_BETWEEN_PROBES Z_HOMING_HEIGHT + #ifndef Z_CLEARANCE_BETWEEN_PROBES + #define Z_CLEARANCE_BETWEEN_PROBES Z_HOMING_HEIGHT #endif #if IS_KINEMATIC diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 41774ae51..08b6b75b0 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -630,11 +630,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 10 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index b058e7bb7..9edbb389a 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1882,7 +1882,7 @@ static void clean_up_after_endstop_or_probe_move() { if (endstops.z_probe_enabled == deploy) return false; // Make room for probe - do_probe_raise(_Z_RAISE_DEPLOY_PROBE); + do_probe_raise(_Z_CLEARANCE_DEPLOY_PROBE); // Check BLTOUCH probe status for an error #if ENABLED(BLTOUCH) @@ -1991,7 +1991,7 @@ static void clean_up_after_endstop_or_probe_move() { // If the nozzle is above the travel height then // move down quickly before doing the slow probe - float z = LOGICAL_Z_POSITION(Z_RAISE_BETWEEN_PROBES); + float z = LOGICAL_Z_POSITION(Z_CLEARANCE_BETWEEN_PROBES); if (z < current_position[Z_AXIS]) do_blocking_move_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)); @@ -2030,7 +2030,7 @@ static void clean_up_after_endstop_or_probe_move() { float old_feedrate_mm_s = feedrate_mm_s; // Ensure a minimum height before moving the probe - do_probe_raise(Z_RAISE_BETWEEN_PROBES); + do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES); // Move to the XY where we shall probe #if ENABLED(DEBUG_LEVELING_FEATURE) @@ -2051,7 +2051,7 @@ static void clean_up_after_endstop_or_probe_move() { float measured_z = run_z_probe(); if (!stow) - do_probe_raise(Z_RAISE_BETWEEN_PROBES); + do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES); else if (STOW_PROBE()) return NAN; @@ -3097,8 +3097,8 @@ inline void gcode_G28() { feedrate_mm_s = homing_feedrate_mm_s[X_AXIS]; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z - #if Z_RAISE_BETWEEN_PROBES > Z_HOMING_HEIGHT - + Z_RAISE_BETWEEN_PROBES + #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT + + Z_CLEARANCE_BETWEEN_PROBES #elif Z_HOMING_HEIGHT > 0 + Z_HOMING_HEIGHT #endif @@ -3109,7 +3109,7 @@ inline void gcode_G28() { current_position[Y_AXIS] = LOGICAL_Y_POSITION(y); line_to_current_position(); - #if Z_RAISE_BETWEEN_PROBES > 0 || Z_HOMING_HEIGHT > 0 + #if Z_CLEARANCE_BETWEEN_PROBES > 0 || Z_HOMING_HEIGHT > 0 current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z); line_to_current_position(); #endif @@ -3204,8 +3204,8 @@ inline void gcode_G28() { else { // One last "return to the bed" (as originally coded) at completion current_position[Z_AXIS] = MESH_HOME_SEARCH_Z - #if Z_RAISE_BETWEEN_PROBES > Z_HOMING_HEIGHT - + Z_RAISE_BETWEEN_PROBES + #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT + + Z_CLEARANCE_BETWEEN_PROBES #elif Z_HOMING_HEIGHT > 0 + Z_HOMING_HEIGHT #endif @@ -3558,7 +3558,7 @@ inline void gcode_G28() { #endif // AUTO_BED_LEVELING_3POINT - // Raise to _Z_RAISE_DEPLOY_PROBE. Stow the probe. + // Raise to _Z_CLEARANCE_DEPLOY_PROBE. Stow the probe. if (STOW_PROBE()) return; // Restore state after probing diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 497409fc7..73fb06386 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -130,11 +130,11 @@ #elif defined(MIN_Z_HEIGHT_FOR_HOMING) #error "MIN_Z_HEIGHT_FOR_HOMING is now Z_HOMING_HEIGHT. Please update your configuration." #elif defined(Z_RAISE_BEFORE_PROBING) || defined(Z_RAISE_AFTER_PROBING) - #error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_RAISE_DEPLOY_PROBE instead." + #error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_CLEARANCE_DEPLOY_PROBE instead." #elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS) - #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_RAISE_DEPLOY_PROBE and Z_RAISE_BETWEEN_PROBES. Please update your configuration." + #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES. Please update your configuration." #elif defined(Z_PROBE_DEPLOY_HEIGHT) || defined(Z_PROBE_TRAVEL_HEIGHT) - #error "Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT are now Z_RAISE_DEPLOY_PROBE and Z_RAISE_BETWEEN_PROBES. Please update your configuration." + #error "Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES. Please update your configuration." #elif !defined(MIN_STEPS_PER_SEGMENT) #error Please replace "const int dropsegments" with "#define MIN_STEPS_PER_SEGMENT" (and increase by 1) in Configuration_adv.h. #elif defined(PREVENT_DANGEROUS_EXTRUDE) @@ -427,14 +427,14 @@ /** * Make sure Z raise values are set */ - #if !defined(Z_RAISE_DEPLOY_PROBE) - #error "You must define Z_RAISE_DEPLOY_PROBE in your configuration." - #elif !defined(Z_RAISE_BETWEEN_PROBES) - #error "You must define Z_RAISE_BETWEEN_PROBES in your configuration." - #elif Z_RAISE_DEPLOY_PROBE < 0 - #error "Probes need Z_RAISE_DEPLOY_PROBE >= 0." - #elif Z_RAISE_BETWEEN_PROBES < 0 - #error "Probes need Z_RAISE_BETWEEN_PROBES >= 0." + #if !defined(Z_CLEARANCE_DEPLOY_PROBE) + #error "You must define Z_CLEARANCE_DEPLOY_PROBE in your configuration." + #elif !defined(Z_CLEARANCE_BETWEEN_PROBES) + #error "You must define Z_CLEARANCE_BETWEEN_PROBES in your configuration." + #elif Z_CLEARANCE_DEPLOY_PROBE < 0 + #error "Probes need Z_CLEARANCE_DEPLOY_PROBE >= 0." + #elif Z_CLEARANCE_BETWEEN_PROBES < 0 + #error "Probes need Z_CLEARANCE_BETWEEN_PROBES >= 0." #endif #else diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index 3966c2eb2..434b6a16f 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -613,11 +613,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index cba4ee8c8..88e11f0f3 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -596,11 +596,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index d17be9a9c..36bcb64e0 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -594,11 +594,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 425035e88..dadaa2eb2 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -605,11 +605,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index b62ecec2c..03f3d6e46 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -607,11 +607,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 5 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 2 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index f08613ac5..08ee8676e 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -630,11 +630,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index 630fe90d6..31bef4e60 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -613,11 +613,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index 5716bc271..ac8e2c2c0 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -613,11 +613,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index f6a5f449c..928051c65 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -613,11 +613,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 969736ab1..435e018fc 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -611,11 +611,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 375b5140d..840d9ab17 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -623,11 +623,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 2c9f17bf9..3f62c57b4 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -634,11 +634,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 7bd102ddc..672b88f91 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -605,11 +605,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 9e504e4ca..2186bd7fc 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -613,11 +613,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 38d9c9b11..1795c4140 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -703,11 +703,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 50 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 50 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 707375d3a..57d30de42 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -697,11 +697,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index b447e5379..56a206a1e 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -700,11 +700,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 50 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 50 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index fd3edb461..06b2766f8 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -701,11 +701,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 100 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 100 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index a5fd2c18a..f2992d11e 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -703,11 +703,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 20 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 10 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 20 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index b9a5dc306..c80bace9e 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -616,11 +616,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 5b70e2d89..98b74a646 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -609,11 +609,11 @@ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * Only integer values >= 1 are valid here. * - * Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. - * But: `M851 Z+1` with a RAISE of 2 => 2mm from bed to nozzle. + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_RAISE_DEPLOY_PROBE 15 // Z Raise for Deploy/Stow -#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points // // For M851 give a range for adjusting the Z probe offset