josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PFW-1386 Address TODO 

We want to move the Z-axis after the XY move is done.

raise_z cannot be used here because it relies
on current_position[] for all axis.

It is actually 10 bytes cheaper to use the previous method
because syncing current_position with lastpos is surprisingly expensive
This commit is contained in:
Guðni Már Gilbert 2022-09-04 12:49:34 +00:00 committed by D.R.racer
parent 27ff01cf91
commit 04a1a67b05
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/Marlin_main.cpp
View File

@ -3544,7 +3544,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
st_synchronize(); st_synchronize();
// Raise the Z axis // Raise the Z axis
float delta = raise_z(z_shift); raise_z(z_shift);
// Move XY to side // Move XY to side
current_position[X_AXIS] = x_position; current_position[X_AXIS] = x_position;
@ -3611,15 +3611,14 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
plan_buffer_line_curposXYZE(FILAMENTCHANGE_EXFEED); plan_buffer_line_curposXYZE(FILAMENTCHANGE_EXFEED);
} }
// TODO: Move the Z-axis after XY, not before. Currently this does not work
// and raise_z seems to have no affect after XY move for unknown reasons.
// This needs to be looked into.
// Recover Z axis
raise_z(-delta);
// Move XY back // Move XY back
plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_XYFEED, active_extruder); plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_XYFEED, active_extruder);
st_synchronize(); st_synchronize();
// Move Z back
plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], lastpos[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_ZFEED, active_extruder);
st_synchronize();
// Set E position to original // Set E position to original
plan_set_e_position(lastpos[E_AXIS]); plan_set_e_position(lastpos[E_AXIS]);