bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT

Browse Source
This commit is contained in:
Scott Lahteine
2016-08-03 20:51:05 -07:00
parent 445458c221
commit 7e2bd9a233
26 changed files with 133 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Marlin/Marlin_main.cpp
View File

@@ -2050,7 +2050,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_PROBE_DEPLOY_STOW);
do_probe_raise(_Z_PROBE_DEPLOY_HEIGHT);
#if ENABLED(Z_PROBE_SLED)
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;
// 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
#if ENABLED(DEBUG_LEVELING_FEATURE)
@@ -2189,7 +2189,7 @@ static void clean_up_after_endstop_or_probe_move() {
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> do_probe_raise");
#endif
do_probe_raise(Z_RAISE_BETWEEN_PROBINGS);
do_probe_raise(Z_PROBE_TRAVEL_HEIGHT);
}
if (verbose_level > 2) {
@@ -2967,7 +2967,7 @@ inline void gcode_G28() {
if (home_all_axis || homeX || homeY) {
// 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 ENABLED(DEBUG_LEVELING_FEATURE)
@@ -3048,7 +3048,7 @@ inline void gcode_G28() {
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
* enough to reach Z_SAFE_HOMING XY positions.
* 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];
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
#if Z_RAISE_BETWEEN_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING
+ Z_RAISE_BETWEEN_PROBINGS
#elif MIN_Z_HEIGHT_FOR_HOMING > 0
+ MIN_Z_HEIGHT_FOR_HOMING
#if Z_PROBE_TRAVEL_HEIGHT > Z_HOMING_HEIGHT
+ Z_PROBE_TRAVEL_HEIGHT
#elif Z_HOMING_HEIGHT > 0
+ Z_HOMING_HEIGHT
#endif
;
line_to_current_position();
@@ -3224,7 +3224,7 @@ inline void gcode_G28() {
current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
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);
line_to_current_position();
#endif
@@ -3320,10 +3320,10 @@ 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_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING
+ Z_RAISE_BETWEEN_PROBINGS
#elif MIN_Z_HEIGHT_FOR_HOMING > 0
+ MIN_Z_HEIGHT_FOR_HOMING
#if Z_PROBE_TRAVEL_HEIGHT > Z_HOMING_HEIGHT
+ Z_PROBE_TRAVEL_HEIGHT
#elif Z_HOMING_HEIGHT > 0
+ Z_HOMING_HEIGHT
#endif
;
line_to_current_position();
@@ -3657,7 +3657,7 @@ inline void gcode_G28() {
#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;
// Restore state after probing