From 2640d13a9f4ff8b64759c6708640c2dde5b66f7c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Wed, 22 Jun 2016 16:53:04 -0700
Subject: [PATCH] Simplify initial raise in M48
---
Marlin/Marlin_main.cpp | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index dc8b651ed5..715a6db34b 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4207,8 +4207,7 @@ inline void gcode_M42() {
}
float X_current = current_position[X_AXIS],
- Y_current = current_position[Y_AXIS],
- Z_start_location = current_position[Z_AXIS] + Z_RAISE_BEFORE_PROBING;
+ Y_current = current_position[Y_AXIS];
#if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
const bool deploy_probe_for_each_reading = false;
@@ -4266,10 +4265,7 @@ inline void gcode_M42() {
setup_for_endstop_or_probe_move();
- if (Z_start_location < Z_RAISE_BEFORE_PROBING * 2.0) {
- feedrate = homing_feedrate[Z_AXIS];
- do_blocking_move_to_z(Z_start_location);
- }
+ do_probe_raise(Z_RAISE_BEFORE_PROBING);
feedrate = XY_PROBE_FEEDRATE;
do_blocking_move_to_xy(X_probe_location - (X_PROBE_OFFSET_FROM_EXTRUDER), Y_probe_location - (Y_PROBE_OFFSET_FROM_EXTRUDER));