melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always disable probe at the end of G29

Browse Source
This commit is contained in:
Scott Lahteine 2016-06-20 16:40:28 -07:00
parent 6aba98e470
commit 2530371516
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/Marlin_main.cpp
View File

@ -3814,6 +3814,8 @@ inline void gcode_G28() {
#if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(MECHANICAL_PROBE) #if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(MECHANICAL_PROBE)
stow_z_probe(); stow_z_probe();
#else
endstops.enable_z_probe(false);
#endif #endif
#ifdef Z_PROBE_END_SCRIPT #ifdef Z_PROBE_END_SCRIPT
@ -3824,9 +3826,6 @@ inline void gcode_G28() {
} }
#endif #endif
enqueue_and_echo_commands_P(PSTR(Z_PROBE_END_SCRIPT)); enqueue_and_echo_commands_P(PSTR(Z_PROBE_END_SCRIPT));
#if HAS_BED_PROBE
endstops.enable_z_probe(false);
#endif
stepper.synchronize(); stepper.synchronize();
#endif #endif
@ -3857,9 +3856,9 @@ inline void gcode_G28() {
deploy_z_probe(); deploy_z_probe();
stepper.synchronize(); stepper.synchronize();
// TODO: clear the leveling matrix or the planner will be set incorrectly
run_z_probe(); // TODO: clear the leveling matrix or the planner will be set incorrectly
run_z_probe(); // clears the ABL non-delta matrix only
SERIAL_PROTOCOLPGM("Bed X: "); SERIAL_PROTOCOLPGM("Bed X: ");
SERIAL_PROTOCOL(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER + 0.0001); SERIAL_PROTOCOL(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER + 0.0001);