microlab
/
scube
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Try on "CLEARANCE" for size

Browse Source
2.0.x
Scott Lahteine 8 years ago
parent 0e7d638a7a
commit 01f1028510
25 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File

16
Marlin/Conditionals_post.h
Unescape Escape View File

@ -602,10 +602,10 @@
#define XY_PROBE_SPEED 4000 #define XY_PROBE_SPEED 4000
#endif #endif
#endif #endif
#if Z_RAISE_BETWEEN_PROBES > Z_RAISE_DEPLOY_PROBE #if Z_CLEARANCE_BETWEEN_PROBES > Z_CLEARANCE_DEPLOY_PROBE
#define _Z_RAISE_DEPLOY_PROBE Z_RAISE_BETWEEN_PROBES #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_BETWEEN_PROBES
#else #else
#define _Z_RAISE_DEPLOY_PROBE Z_RAISE_DEPLOY_PROBE #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_DEPLOY_PROBE
#endif #endif
#else #else
#undef X_PROBE_OFFSET_FROM_EXTRUDER #undef X_PROBE_OFFSET_FROM_EXTRUDER
@ -681,17 +681,17 @@
#endif #endif
/** /**
* Z_HOMING_HEIGHT / Z_RAISE_BETWEEN_PROBES * Z_HOMING_HEIGHT / Z_CLEARANCE_BETWEEN_PROBES
*/ */
#ifndef Z_HOMING_HEIGHT #ifndef Z_HOMING_HEIGHT
#ifndef Z_RAISE_BETWEEN_PROBES #ifndef Z_CLEARANCE_BETWEEN_PROBES
#define Z_HOMING_HEIGHT 0 #define Z_HOMING_HEIGHT 0
#else #else
#define Z_HOMING_HEIGHT Z_RAISE_BETWEEN_PROBES #define Z_HOMING_HEIGHT Z_CLEARANCE_BETWEEN_PROBES
#endif #endif
#endif #endif
#ifndef Z_RAISE_BETWEEN_PROBES #ifndef Z_CLEARANCE_BETWEEN_PROBES
#define Z_RAISE_BETWEEN_PROBES Z_HOMING_HEIGHT #define Z_CLEARANCE_BETWEEN_PROBES Z_HOMING_HEIGHT
#endif #endif
#if IS_KINEMATIC #if IS_KINEMATIC

8
Marlin/Configuration.h
Unescape Escape View File

@ -630,11 +630,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

20
Marlin/Marlin_main.cpp
Unescape Escape View File

@ -1882,7 +1882,7 @@ static void clean_up_after_endstop_or_probe_move() {
if (endstops.z_probe_enabled == deploy) return false; if (endstops.z_probe_enabled == deploy) return false;
// Make room for probe // 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 // Check BLTOUCH probe status for an error
#if ENABLED(BLTOUCH) #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 // If the nozzle is above the travel height then
// move down quickly before doing the slow probe // 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]) if (z < current_position[Z_AXIS])
do_blocking_move_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)); 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; float old_feedrate_mm_s = feedrate_mm_s;
// Ensure a minimum height before moving the probe // 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 // Move to the XY where we shall probe
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
@ -2051,7 +2051,7 @@ static void clean_up_after_endstop_or_probe_move() {
float measured_z = run_z_probe(); float measured_z = run_z_probe();
if (!stow) if (!stow)
do_probe_raise(Z_RAISE_BETWEEN_PROBES); do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES);
else else
if (STOW_PROBE()) return NAN; if (STOW_PROBE()) return NAN;
@ -3097,8 +3097,8 @@ inline void gcode_G28() {
feedrate_mm_s = homing_feedrate_mm_s[X_AXIS]; feedrate_mm_s = homing_feedrate_mm_s[X_AXIS];
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
#if Z_RAISE_BETWEEN_PROBES > Z_HOMING_HEIGHT #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
+ Z_RAISE_BETWEEN_PROBES + Z_CLEARANCE_BETWEEN_PROBES
#elif Z_HOMING_HEIGHT > 0 #elif Z_HOMING_HEIGHT > 0
+ Z_HOMING_HEIGHT + Z_HOMING_HEIGHT
#endif #endif
@ -3109,7 +3109,7 @@ inline void gcode_G28() {
current_position[Y_AXIS] = LOGICAL_Y_POSITION(y); current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
line_to_current_position(); 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); current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
line_to_current_position(); line_to_current_position();
#endif #endif
@ -3204,8 +3204,8 @@ inline void gcode_G28() {
else { else {
// One last "return to the bed" (as originally coded) at completion // One last "return to the bed" (as originally coded) at completion
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
#if Z_RAISE_BETWEEN_PROBES > Z_HOMING_HEIGHT #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
+ Z_RAISE_BETWEEN_PROBES + Z_CLEARANCE_BETWEEN_PROBES
#elif Z_HOMING_HEIGHT > 0 #elif Z_HOMING_HEIGHT > 0
+ Z_HOMING_HEIGHT + Z_HOMING_HEIGHT
#endif #endif
@ -3558,7 +3558,7 @@ inline void gcode_G28() {
#endif // AUTO_BED_LEVELING_3POINT #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; if (STOW_PROBE()) return;
// Restore state after probing // Restore state after probing

22
Marlin/SanityCheck.h
Unescape Escape View File

@ -130,11 +130,11 @@
#elif defined(MIN_Z_HEIGHT_FOR_HOMING) #elif defined(MIN_Z_HEIGHT_FOR_HOMING)
#error "MIN_Z_HEIGHT_FOR_HOMING is now Z_HOMING_HEIGHT. Please update your configuration." #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) #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) #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) #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) #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. #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) #elif defined(PREVENT_DANGEROUS_EXTRUDE)
@ -427,14 +427,14 @@
/** /**
* Make sure Z raise values are set * Make sure Z raise values are set
*/ */
#if !defined(Z_RAISE_DEPLOY_PROBE) #if !defined(Z_CLEARANCE_DEPLOY_PROBE)
#error "You must define Z_RAISE_DEPLOY_PROBE in your configuration." #error "You must define Z_CLEARANCE_DEPLOY_PROBE in your configuration."
#elif !defined(Z_RAISE_BETWEEN_PROBES) #elif !defined(Z_CLEARANCE_BETWEEN_PROBES)
#error "You must define Z_RAISE_BETWEEN_PROBES in your configuration." #error "You must define Z_CLEARANCE_BETWEEN_PROBES in your configuration."
#elif Z_RAISE_DEPLOY_PROBE < 0 #elif Z_CLEARANCE_DEPLOY_PROBE < 0
#error "Probes need Z_RAISE_DEPLOY_PROBE >= 0." #error "Probes need Z_CLEARANCE_DEPLOY_PROBE >= 0."
#elif Z_RAISE_BETWEEN_PROBES < 0 #elif Z_CLEARANCE_BETWEEN_PROBES < 0
#error "Probes need Z_RAISE_BETWEEN_PROBES >= 0." #error "Probes need Z_CLEARANCE_BETWEEN_PROBES >= 0."
#endif #endif
#else #else

8
Marlin/example_configurations/Cartesio/Configuration.h
Unescape Escape View File

@ -613,11 +613,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/Felix/Configuration.h
Unescape Escape View File

@ -596,11 +596,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/Felix/DUAL/Configuration.h
Unescape Escape View File

@ -594,11 +594,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/Hephestos/Configuration.h
Unescape Escape View File

@ -605,11 +605,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/Hephestos_2/Configuration.h
Unescape Escape View File

@ -607,11 +607,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 2 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/K8200/Configuration.h
Unescape Escape View File

@ -630,11 +630,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/K8400/Configuration.h
Unescape Escape View File

@ -613,11 +613,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/K8400/Dual-head/Configuration.h
Unescape Escape View File

@ -613,11 +613,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
Unescape Escape View File

@ -613,11 +613,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/RigidBot/Configuration.h
Unescape Escape View File

@ -611,11 +611,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/SCARA/Configuration.h
Unescape Escape View File

@ -623,11 +623,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/TAZ4/Configuration.h
Unescape Escape View File

@ -634,11 +634,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/WITBOX/Configuration.h
Unescape Escape View File

@ -605,11 +605,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/adafruit/ST7565/Configuration.h
Unescape Escape View File

@ -613,11 +613,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/delta/biv2.5/Configuration.h
Unescape Escape View File

@ -703,11 +703,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 50 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/delta/generic/Configuration.h
Unescape Escape View File

@ -697,11 +697,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Unescape Escape View File

@ -700,11 +700,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 50 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/delta/kossel_pro/Configuration.h
Unescape Escape View File

@ -701,11 +701,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 100 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/delta/kossel_xl/Configuration.h
Unescape Escape View File

@ -703,11 +703,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 20 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 10 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/makibox/Configuration.h
Unescape Escape View File

@ -616,11 +616,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

8
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape Escape View File

@ -609,11 +609,11 @@
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a RAISE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a RAISE of 2 => 2mm 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_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_RAISE_BETWEEN_PROBES 5 // Z Raise between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset

Write Preview
Loading…
Cancel
Save