Merge pull request #3089 from thinkyhead/rc_apply_2924

Correct raise_z_for_servo for Z offsets below the nozzle
MarlinFirmware · Mar 6, 2016 · aa0b048 · aa0b048
2 parents 04a0d45 + 0fb507a
commit aa0b048
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
@@ -1751,7 +1751,9 @@ static void setup_for_endstop_move() {
 
     void raise_z_for_servo() {
       float zpos = current_position[Z_AXIS], z_dest = Z_RAISE_BEFORE_PROBING;
-      z_dest += axis_known_position[Z_AXIS] ? zprobe_zoffset : zpos;
+      // The zprobe_zoffset is negative any switch below the nozzle, so
+      // multiply by Z_HOME_DIR (-1) to move enough away from bed for the probe
+      z_dest += axis_known_position[Z_AXIS] ? zprobe_zoffset * Z_HOME_DIR : zpos;
       if (zpos < z_dest) do_blocking_move_to_z(z_dest); // also updates current_position
     }