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

Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT

Browse Source
2.0.x
Scott Lahteine 9 years ago
parent 445458c221
commit 7e2bd9a233
26 changed files with 133 additions and 129 deletions
Show Stats Download Patch File Download Diff File

20
Marlin/Conditionals_post.h
Unescape Escape View File

@ -575,10 +575,10 @@
#define XY_PROBE_SPEED 4000 #define XY_PROBE_SPEED 4000
#endif #endif
#endif #endif
#if Z_RAISE_BETWEEN_PROBINGS > Z_RAISE_PROBE_DEPLOY_STOW #if Z_PROBE_TRAVEL_HEIGHT > Z_PROBE_DEPLOY_HEIGHT
#define _Z_RAISE_PROBE_DEPLOY_STOW Z_RAISE_BETWEEN_PROBINGS #define _Z_PROBE_DEPLOY_HEIGHT Z_PROBE_TRAVEL_HEIGHT
#else #else
#define _Z_RAISE_PROBE_DEPLOY_STOW Z_RAISE_PROBE_DEPLOY_STOW #define _Z_PROBE_DEPLOY_HEIGHT Z_PROBE_DEPLOY_HEIGHT
#endif #endif
#else #else
#undef X_PROBE_OFFSET_FROM_EXTRUDER #undef X_PROBE_OFFSET_FROM_EXTRUDER
@ -647,17 +647,17 @@
#endif #endif
/** /**
* MIN_Z_HEIGHT_FOR_HOMING / Z_RAISE_BETWEEN_PROBINGS * Z_HOMING_HEIGHT / Z_PROBE_TRAVEL_HEIGHT
*/ */
#ifndef MIN_Z_HEIGHT_FOR_HOMING #ifndef Z_HOMING_HEIGHT
#ifndef Z_RAISE_BETWEEN_PROBINGS #ifndef Z_PROBE_TRAVEL_HEIGHT
#define MIN_Z_HEIGHT_FOR_HOMING 0 #define Z_HOMING_HEIGHT 0
#else #else
#define MIN_Z_HEIGHT_FOR_HOMING Z_RAISE_BETWEEN_PROBINGS #define Z_HOMING_HEIGHT Z_PROBE_TRAVEL_HEIGHT
#endif #endif
#endif #endif
#ifndef Z_RAISE_BETWEEN_PROBINGS #ifndef Z_PROBE_TRAVEL_HEIGHT
#define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING #define Z_PROBE_TRAVEL_HEIGHT Z_HOMING_HEIGHT
#endif #endif
#endif // CONDITIONALS_POST_H #endif // CONDITIONALS_POST_H

6
Marlin/Configuration.h
Unescape Escape View File

@ -543,8 +543,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -589,7 +589,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

30
Marlin/Marlin_main.cpp
Unescape Escape View File

@ -2050,7 +2050,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_PROBE_DEPLOY_STOW); do_probe_raise(_Z_PROBE_DEPLOY_HEIGHT);
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
if (axis_unhomed_error(true, false, false)) { stop(); return true; } if (axis_unhomed_error(true, false, false)) { stop(); return true; }
@ -2159,7 +2159,7 @@ static void clean_up_after_endstop_or_probe_move() {
float old_feedrate_mm_m = feedrate_mm_m; float old_feedrate_mm_m = feedrate_mm_m;
// Ensure a minimum height before moving the probe // Ensure a minimum height before moving the probe
do_probe_raise(Z_RAISE_BETWEEN_PROBINGS); do_probe_raise(Z_PROBE_TRAVEL_HEIGHT);
// 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)
@ -2189,7 +2189,7 @@ static void clean_up_after_endstop_or_probe_move() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> do_probe_raise"); if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> do_probe_raise");
#endif #endif
do_probe_raise(Z_RAISE_BETWEEN_PROBINGS); do_probe_raise(Z_PROBE_TRAVEL_HEIGHT);
} }
if (verbose_level > 2) { if (verbose_level > 2) {
@ -2967,7 +2967,7 @@ inline void gcode_G28() {
if (home_all_axis || homeX || homeY) { if (home_all_axis || homeX || homeY) {
// Raise Z before homing any other axes and z is not already high enough (never lower z) // Raise Z before homing any other axes and z is not already high enough (never lower z)
destination[Z_AXIS] = LOGICAL_Z_POSITION(MIN_Z_HEIGHT_FOR_HOMING); destination[Z_AXIS] = LOGICAL_Z_POSITION(Z_HOMING_HEIGHT);
if (destination[Z_AXIS] > current_position[Z_AXIS]) { if (destination[Z_AXIS] > current_position[Z_AXIS]) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
@ -3048,7 +3048,7 @@ inline void gcode_G28() {
if (home_all_axis) { if (home_all_axis) {
/** /**
* At this point we already have Z at MIN_Z_HEIGHT_FOR_HOMING height * At this point we already have Z at Z_HOMING_HEIGHT height
* No need to move Z any more as this height should already be safe * No need to move Z any more as this height should already be safe
* enough to reach Z_SAFE_HOMING XY positions. * enough to reach Z_SAFE_HOMING XY positions.
* Just make sure the planner is in sync. * Just make sure the planner is in sync.
@ -3212,10 +3212,10 @@ inline void gcode_G28() {
feedrate_mm_m = homing_feedrate_mm_m[X_AXIS]; feedrate_mm_m = homing_feedrate_mm_m[X_AXIS];
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
#if Z_RAISE_BETWEEN_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING #if Z_PROBE_TRAVEL_HEIGHT > Z_HOMING_HEIGHT
+ Z_RAISE_BETWEEN_PROBINGS + Z_PROBE_TRAVEL_HEIGHT
#elif MIN_Z_HEIGHT_FOR_HOMING > 0 #elif Z_HOMING_HEIGHT > 0
+ MIN_Z_HEIGHT_FOR_HOMING + Z_HOMING_HEIGHT
#endif #endif
; ;
line_to_current_position(); line_to_current_position();
@ -3224,7 +3224,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_PROBINGS > 0 || MIN_Z_HEIGHT_FOR_HOMING > 0 #if Z_PROBE_TRAVEL_HEIGHT > 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
@ -3320,10 +3320,10 @@ 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_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING #if Z_PROBE_TRAVEL_HEIGHT > Z_HOMING_HEIGHT
+ Z_RAISE_BETWEEN_PROBINGS + Z_PROBE_TRAVEL_HEIGHT
#elif MIN_Z_HEIGHT_FOR_HOMING > 0 #elif Z_HOMING_HEIGHT > 0
+ MIN_Z_HEIGHT_FOR_HOMING + Z_HOMING_HEIGHT
#endif #endif
; ;
line_to_current_position(); line_to_current_position();
@ -3657,7 +3657,7 @@ inline void gcode_G28() {
#endif // !AUTO_BED_LEVELING_GRID #endif // !AUTO_BED_LEVELING_GRID
// Raise to _Z_RAISE_PROBE_DEPLOY_STOW. Stow the probe. // Raise to _Z_PROBE_DEPLOY_HEIGHT. Stow the probe.
if (STOW_PROBE()) return; if (STOW_PROBE()) return;
// Restore state after probing // Restore state after probing

28
Marlin/SanityCheck.h
Unescape Escape View File

@ -334,16 +334,14 @@
/** /**
* Make sure Z raise values are set * Make sure Z raise values are set
*/ */
#if defined(Z_RAISE_BEFORE_PROBING) || defined(Z_RAISE_AFTER_PROBING) #if !defined(Z_PROBE_DEPLOY_HEIGHT)
#error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_RAISE_PROBE_DEPLOY_STOW instead." #error "You must set Z_PROBE_DEPLOY_HEIGHT in your configuration."
#elif !defined(Z_RAISE_PROBE_DEPLOY_STOW) #elif !defined(Z_PROBE_TRAVEL_HEIGHT)
#error "You must set Z_RAISE_PROBE_DEPLOY_STOW in your configuration." #error "You must set Z_PROBE_TRAVEL_HEIGHT in your configuration."
#elif !defined(Z_RAISE_BETWEEN_PROBINGS) #elif Z_PROBE_DEPLOY_HEIGHT < 0
#error "You must set Z_RAISE_BETWEEN_PROBINGS in your configuration." #error "Probes need Z_PROBE_DEPLOY_HEIGHT >= 0."
#elif Z_RAISE_PROBE_DEPLOY_STOW < 0 #elif Z_PROBE_TRAVEL_HEIGHT < 0
#error "Probes need Z_RAISE_PROBE_DEPLOY_STOW >= 0." #error "Probes need Z_PROBE_TRAVEL_HEIGHT >= 0."
#elif Z_RAISE_BETWEEN_PROBINGS < 0
#error "Probes need Z_RAISE_BETWEEN_PROBINGS >= 0."
#endif #endif
#else #else
@ -681,8 +679,6 @@
#error "SDSLOW deprecated. Set SPI_SPEED to SPI_HALF_SPEED instead." #error "SDSLOW deprecated. Set SPI_SPEED to SPI_HALF_SPEED instead."
#elif defined(SDEXTRASLOW) #elif defined(SDEXTRASLOW)
#error "SDEXTRASLOW deprecated. Set SPI_SPEED to SPI_QUARTER_SPEED instead." #error "SDEXTRASLOW deprecated. Set SPI_SPEED to SPI_QUARTER_SPEED instead."
#elif defined(Z_RAISE_BEFORE_HOMING)
#error "Z_RAISE_BEFORE_HOMING is deprecated. Use MIN_Z_HEIGHT_FOR_HOMING instead."
#elif defined(FILAMENT_SENSOR) #elif defined(FILAMENT_SENSOR)
#error "FILAMENT_SENSOR is deprecated. Use FILAMENT_WIDTH_SENSOR instead." #error "FILAMENT_SENSOR is deprecated. Use FILAMENT_WIDTH_SENSOR instead."
#elif defined(DISABLE_MAX_ENDSTOPS) || defined(DISABLE_MIN_ENDSTOPS) #elif defined(DISABLE_MAX_ENDSTOPS) || defined(DISABLE_MIN_ENDSTOPS)
@ -729,4 +725,12 @@
#error "MANUAL_HOME_POSITIONS is deprecated. Set MANUAL_[XYZ]_HOME_POS as-needed instead." #error "MANUAL_HOME_POSITIONS is deprecated. Set MANUAL_[XYZ]_HOME_POS as-needed instead."
#elif defined(PID_ADD_EXTRUSION_RATE) #elif defined(PID_ADD_EXTRUSION_RATE)
#error "PID_ADD_EXTRUSION_RATE is now PID_EXTRUSION_SCALING and is DISABLED by default. Are you sure you want to use this option? Please update your configuration." #error "PID_ADD_EXTRUSION_RATE is now PID_EXTRUSION_SCALING and is DISABLED by default. Are you sure you want to use this option? Please update your configuration."
#elif defined(Z_RAISE_BEFORE_HOMING)
#error "Z_RAISE_BEFORE_HOMING is now Z_HOMING_HEIGHT. Please update your configuration."
#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."
#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."
#endif #endif

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

@ -543,8 +543,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -589,7 +589,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -525,8 +525,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -571,7 +571,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -523,8 +523,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -569,7 +569,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -535,8 +535,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -581,7 +581,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -537,8 +537,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 5 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 5 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 2 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 2 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -583,7 +583,7 @@
// @section homing // @section homing
#define MIN_Z_HEIGHT_FOR_HOMING 5 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... #define Z_HOMING_HEIGHT 5 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -560,8 +560,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -606,7 +606,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -543,8 +543,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -589,7 +589,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -543,8 +543,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -589,7 +589,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -543,8 +543,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -589,7 +589,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -540,8 +540,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -586,7 +586,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -551,8 +551,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -597,7 +597,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -564,8 +564,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -610,7 +610,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -535,8 +535,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -581,7 +581,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -543,8 +543,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -589,7 +589,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -632,8 +632,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 50 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 50 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -678,7 +678,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -626,8 +626,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -672,7 +672,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -629,8 +629,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 50 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 50 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -675,7 +675,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 15// (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 15 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -623,8 +623,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 100 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 100 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -669,7 +669,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -624,8 +624,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 20 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 20 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 10 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 10 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -670,7 +670,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -546,8 +546,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -592,7 +592,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

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

@ -533,8 +533,8 @@
// //
// Probe Raise options provide clearance for the probe to deploy, stow, and travel. // Probe Raise options provide clearance for the probe to deploy, stow, and travel.
// //
#define Z_RAISE_PROBE_DEPLOY_STOW 15 // Raise to make room for the probe to deploy / stow #define Z_PROBE_DEPLOY_HEIGHT 15 // Raise to make room for the probe to deploy / stow
#define Z_RAISE_BETWEEN_PROBINGS 5 // Raise between probing points. #define Z_PROBE_TRAVEL_HEIGHT 5 // Raise between probing points.
// //
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
@ -579,7 +579,7 @@
// @section homing // @section homing
//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... //#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case. // Be sure you have this distance over your Z_MAX_POS in case.
// ENDSTOP SETTINGS: // ENDSTOP SETTINGS:

8
Marlin/ultralcd.cpp
Unescape Escape View File

@ -985,16 +985,16 @@ void kill_screen(const char* lcd_msg) {
static uint8_t _lcd_level_bed_position; static uint8_t _lcd_level_bed_position;
// Utility to go to the next mesh point // Utility to go to the next mesh point
// A raise is added between points if MIN_Z_HEIGHT_FOR_HOMING is in use // A raise is added between points if Z_HOMING_HEIGHT is in use
// Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z // Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z
// Z position will be restored with the final action, a G28 // Z position will be restored with the final action, a G28
inline void _mbl_goto_xy(float x, float y) { inline void _mbl_goto_xy(float x, float y) {
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + MIN_Z_HEIGHT_FOR_HOMING; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT;
line_to_current(Z_AXIS); line_to_current(Z_AXIS);
current_position[X_AXIS] = x + home_offset[X_AXIS]; current_position[X_AXIS] = x + home_offset[X_AXIS];
current_position[Y_AXIS] = y + home_offset[Y_AXIS]; current_position[Y_AXIS] = y + home_offset[Y_AXIS];
line_to_current(manual_feedrate_mm_m[X_AXIS] <= manual_feedrate_mm_m[Y_AXIS] ? X_AXIS : Y_AXIS); line_to_current(manual_feedrate_mm_m[X_AXIS] <= manual_feedrate_mm_m[Y_AXIS] ? X_AXIS : Y_AXIS);
#if MIN_Z_HEIGHT_FOR_HOMING > 0 #if Z_HOMING_HEIGHT > 0
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; // How do condition and action match? current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; // How do condition and action match?
line_to_current(Z_AXIS); line_to_current(Z_AXIS);
#endif #endif
@ -1045,7 +1045,7 @@ void kill_screen(const char* lcd_msg) {
if (_lcd_level_bed_position == (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) { if (_lcd_level_bed_position == (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) {
lcd_goto_screen(_lcd_level_bed_done, true); lcd_goto_screen(_lcd_level_bed_done, true);
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + MIN_Z_HEIGHT_FOR_HOMING; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT;
line_to_current(Z_AXIS); line_to_current(Z_AXIS);
stepper.synchronize(); stepper.synchronize();

Write Preview
Loading…
Cancel
Save