Browse Source

Simplify initial raise in M48

Scott Lahteine 8 years ago
parent
commit
2640d13a9f
1 changed files with 2 additions and 6 deletions
  1. 2
    6
      Marlin/Marlin_main.cpp

+ 2
- 6
Marlin/Marlin_main.cpp View File

@@ -4207,8 +4207,7 @@ inline void gcode_M42() {
4207 4207
     }
4208 4208
 
4209 4209
     float  X_current = current_position[X_AXIS],
4210
-           Y_current = current_position[Y_AXIS],
4211
-           Z_start_location = current_position[Z_AXIS] + Z_RAISE_BEFORE_PROBING;
4210
+           Y_current = current_position[Y_AXIS];
4212 4211
 
4213 4212
     #if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
4214 4213
       const bool deploy_probe_for_each_reading = false;
@@ -4266,10 +4265,7 @@ inline void gcode_M42() {
4266 4265
 
4267 4266
     setup_for_endstop_or_probe_move();
4268 4267
 
4269
-    if (Z_start_location < Z_RAISE_BEFORE_PROBING * 2.0) {
4270
-      feedrate = homing_feedrate[Z_AXIS];
4271
-      do_blocking_move_to_z(Z_start_location);
4272
-    }
4268
+    do_probe_raise(Z_RAISE_BEFORE_PROBING);
4273 4269
 
4274 4270
     feedrate = XY_PROBE_FEEDRATE;
4275 4271
     do_blocking_move_to_xy(X_probe_location - (X_PROBE_OFFSET_FROM_EXTRUDER), Y_probe_location - (Y_PROBE_OFFSET_FROM_EXTRUDER));

Loading…
Cancel
Save