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

Simplify initial raise in M48

Browse Source
This commit is contained in:
Scott Lahteine 2016-06-22 16:53:04 -07:00
parent 3763d45656
commit 2640d13a9f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View File

@ -4207,8 +4207,7 @@ inline void gcode_M42() {
} }
float X_current = current_position[X_AXIS], float X_current = current_position[X_AXIS],
Y_current = current_position[Y_AXIS], Y_current = current_position[Y_AXIS];
Z_start_location = current_position[Z_AXIS] + Z_RAISE_BEFORE_PROBING;
#if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY) #if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
const bool deploy_probe_for_each_reading = false; const bool deploy_probe_for_each_reading = false;
@ -4266,10 +4265,7 @@ inline void gcode_M42() {
setup_for_endstop_or_probe_move(); setup_for_endstop_or_probe_move();
if (Z_start_location < Z_RAISE_BEFORE_PROBING * 2.0) { do_probe_raise(Z_RAISE_BEFORE_PROBING);
feedrate = homing_feedrate[Z_AXIS];
do_blocking_move_to_z(Z_start_location);
}
feedrate = XY_PROBE_FEEDRATE; 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)); do_blocking_move_to_xy(X_probe_location - (X_PROBE_OFFSET_FROM_EXTRUDER), Y_probe_location - (Y_PROBE_OFFSET_FROM_EXTRUDER));