CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply MIN_Z_HEIGHT_FOR_HOMING raise literally

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-07 12:14:54 -07:00
parent 177ec20bf0
commit 0b6f8f8244
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/Marlin_main.cpp
View File

@ -2915,10 +2915,12 @@ inline void gcode_G28() {
#elif defined(MIN_Z_HEIGHT_FOR_HOMING) && MIN_Z_HEIGHT_FOR_HOMING > 0 #elif defined(MIN_Z_HEIGHT_FOR_HOMING) && MIN_Z_HEIGHT_FOR_HOMING > 0
// Raise Z before homing, if specified // Raise Z before homing, if specified
destination[Z_AXIS] = (current_position[Z_AXIS] += MIN_Z_HEIGHT_FOR_HOMING); float z_dest = home_offset[Z_AXIS] + MIN_Z_HEIGHT_FOR_HOMING;
if (z_dest > current_position[Z_AXIS]) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("Raise Z (before homing) to ", destination[Z_AXIS]); SERIAL_ECHOPAIR("Raise Z (before homing) to ", z_dest);
SERIAL_EOL; SERIAL_EOL;
} }
#endif #endif
@ -2926,12 +2928,15 @@ inline void gcode_G28() {
feedrate = homing_feedrate[Z_AXIS]; feedrate = homing_feedrate[Z_AXIS];
#if HAS_BED_PROBE #if HAS_BED_PROBE
do_blocking_move_to_z(destination[Z_AXIS]); do_blocking_move_to_z(z_dest);
#else #else
line_to_z(destination[Z_AXIS]); line_to_z(z_dest);
stepper.synchronize(); stepper.synchronize();
#endif #endif
destination[Z_AXIS] = current_position[Z_AXIS] = z_dest;
}
#endif // MIN_Z_HEIGHT_FOR_HOMING #endif // MIN_Z_HEIGHT_FOR_HOMING
#if ENABLED(QUICK_HOME) #if ENABLED(QUICK_HOME)