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

Merge pull request #5070 from gcormier/rcbugfix

Browse Source 
Fix #4995 - M48/G29 on CoreXY maybe others?
This commit is contained in:
Scott Lahteine 2016-10-24 00:56:36 -05:00 committed by GitHub
commit 1097a50694
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/Marlin_main.cpp
View File

@ -2082,12 +2082,13 @@ static void clean_up_after_endstop_or_probe_move() {
// Clear endstop flags // Clear endstop flags
endstops.hit_on_purpose(); endstops.hit_on_purpose();
// Tell the planner where we actually are
planner.sync_from_steppers();
// Get Z where the steppers were interrupted // Get Z where the steppers were interrupted
set_current_from_steppers_for_axis(Z_AXIS); set_current_from_steppers_for_axis(Z_AXIS);
// Tell the planner where we actually are
SYNC_PLAN_POSITION_KINEMATIC();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS("<<< do_probe_move", current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("<<< do_probe_move", current_position);
#endif #endif
@ -3819,7 +3820,7 @@ inline void gcode_G28() {
set_current_from_steppers_for_axis(ALL_AXES); set_current_from_steppers_for_axis(ALL_AXES);
// Sync the planner to where the steppers stopped // Sync the planner to where the steppers stopped
planner.sync_from_steppers(); SYNC_PLAN_POSITION_KINEMATIC();
} }
setup_for_endstop_or_probe_move(); setup_for_endstop_or_probe_move();