SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clear up ordering in G30

Browse source
This commit is contained in:
Scott Lahteine 2016-06-20 16:18:30 -07:00
parent ed75b0ea11
commit 04e88d008e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View file

@ -3839,11 +3839,13 @@ inline void gcode_G28() {
* G30: Do a single Z probe at the current XY * G30: Do a single Z probe at the current XY
*/ */
inline void gcode_G30() { inline void gcode_G30() {
setup_for_endstop_move();
deploy_z_probe(); deploy_z_probe();
stepper.synchronize(); stepper.synchronize();
// TODO: clear the leveling matrix or the planner will be set incorrectly // TODO: clear the leveling matrix or the planner will be set incorrectly
setup_for_endstop_move(); // Too late. Must be done before deploying.
run_z_probe(); run_z_probe();
@ -3855,10 +3857,10 @@ inline void gcode_G28() {
SERIAL_PROTOCOL(current_position[Z_AXIS] + 0.0001); SERIAL_PROTOCOL(current_position[Z_AXIS] + 0.0001);
SERIAL_EOL; SERIAL_EOL;
clean_up_after_endstop_move(); // Too early. must be done after the stowing.
stow_z_probe(); stow_z_probe();
clean_up_after_endstop_move();
report_current_position(); report_current_position();
} }