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

Simplified probe_pt (in G30)

Browse Source
This commit is contained in:
Scott Lahteine 2016-06-23 20:25:46 -07:00
parent 6a7045b9bf
commit 15a6b49f37
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/Marlin_main.cpp
View File

@ -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();