MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't do_probe_raise with MIN_Z_HEIGHT_FOR_HOMING

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-05 18:32:24 -07:00
parent 7735ec5e7a
commit e0a6b978f5
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Marlin/Marlin_main.cpp
View File

@ -1728,10 +1728,9 @@ static void clean_up_after_endstop_or_probe_move() {
if ((Z_HOME_DIR) < 0 && zprobe_zoffset < 0) if ((Z_HOME_DIR) < 0 && zprobe_zoffset < 0)
z_dest -= zprobe_zoffset; z_dest -= zprobe_zoffset;
if (z_dest > current_position[Z_AXIS]) { if (z_dest > current_position[Z_AXIS])
do_blocking_move_to_z(z_dest); do_blocking_move_to_z(z_dest);
} }
}
#endif //HAS_BED_PROBE #endif //HAS_BED_PROBE
@ -2860,6 +2859,8 @@ inline void gcode_G28() {
home_all_axis = (!homeX && !homeY && !homeZ) || (homeX && homeY && homeZ); home_all_axis = (!homeX && !homeY && !homeZ) || (homeX && homeY && homeZ);
set_destination_to_current();
#if Z_HOME_DIR > 0 // If homing away from BED do Z first #if Z_HOME_DIR > 0 // If homing away from BED do Z first
if (home_all_axis || homeZ) { if (home_all_axis || homeZ) {
@ -2871,35 +2872,26 @@ 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
#if HAS_BED_PROBE
do_probe_raise(MIN_Z_HEIGHT_FOR_HOMING);
destination[Z_AXIS] = current_position[Z_AXIS];
#else
// 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)
if (current_position[Z_AXIS] <= MIN_Z_HEIGHT_FOR_HOMING) { float z_dest = (current_position[Z_AXIS] += MIN_Z_HEIGHT_FOR_HOMING);
destination[Z_AXIS] = MIN_Z_HEIGHT_FOR_HOMING;
feedrate = planner.max_feedrate[Z_AXIS] * 60; // feedrate (mm/m) = max_feedrate (mm/s)
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("Raise Z (before homing) to ", (MIN_Z_HEIGHT_FOR_HOMING)); SERIAL_ECHOPAIR("Raise Z (before homing) to ", z_dest);
SERIAL_EOL; SERIAL_EOL;
DEBUG_POS("> (home_all_axis || homeZ)", current_position);
DEBUG_POS("> (home_all_axis || homeZ)", destination);
} }
#endif #endif
line_to_destination();
stepper.synchronize();
/** feedrate = homing_feedrate[Z_AXIS];
* Update the current Z position even if it currently not real from
* Z-home otherwise each call to line_to_destination() will want to #if HAS_BED_PROBE
* move Z-axis by MIN_Z_HEIGHT_FOR_HOMING. do_blocking_move_to_z(z_dest);
*/ #else
current_position[Z_AXIS] = destination[Z_AXIS]; line_to_z(z_dest);
} stepper.synchronize();
#endif
#endif #endif
#endif // MIN_Z_HEIGHT_FOR_HOMING
#if ENABLED(QUICK_HOME) #if ENABLED(QUICK_HOME)
if (home_all_axis || (homeX && homeY)) { // First diagonal move if (home_all_axis || (homeX && homeY)) { // First diagonal move