From 15a6b49f37124c493c46d076b70a78f9e28f3814 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 23 Jun 2016 20:25:46 -0700 Subject: [PATCH] Simplified probe_pt (in G30) --- Marlin/Marlin_main.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 3093c64c0..343173807 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2079,10 +2079,6 @@ static void clean_up_after_endstop_or_probe_move() { return current_position[Z_AXIS]; } -#endif // HAS_BED_PROBE - -#if HAS_PROBING_PROCEDURE - inline void do_blocking_move_to_xy(float x, float y) { do_blocking_move_to(x, y, current_position[Z_AXIS]); } @@ -3774,12 +3770,10 @@ inline void gcode_G28() { setup_for_endstop_or_probe_move(); - deploy_z_probe(); - - stepper.synchronize(); - // TODO: clear the leveling matrix or the planner will be set incorrectly - float measured_z = run_z_probe(); // clears the ABL non-delta matrix only + float measured_z = probe_pt(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER, + current_position[Y_AXIS] + Y_PROBE_OFFSET_FROM_EXTRUDER, + true, 1); SERIAL_PROTOCOLPGM("Bed X: "); SERIAL_PROTOCOL(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER + 0.0001); @@ -3789,8 +3783,6 @@ inline void gcode_G28() { SERIAL_PROTOCOL(measured_z + 0.0001); SERIAL_EOL; - stow_z_probe(); - clean_up_after_endstop_or_probe_move(); report_current_position();