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

Fix set_current_from_steppers_for_axis(E_AXIS) bug

Browse Source
This commit is contained in:
Scott Lahteine 2020-03-01 10:41:14 -06:00
parent c4db8e49a7
commit edd1b76a9a
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/src/module/motion.cpp
View File

@ -272,20 +272,21 @@ void get_cartesian_from_steppers() {
*/ */
void set_current_from_steppers_for_axis(const AxisEnum axis) { void set_current_from_steppers_for_axis(const AxisEnum axis) {
get_cartesian_from_steppers(); get_cartesian_from_steppers();
xyze_pos_t pos = cartes;
pos.e = planner.get_axis_position_mm(E_AXIS);
#if HAS_POSITION_MODIFIERS #if HAS_POSITION_MODIFIERS
xyze_pos_t pos = { cartes.x, cartes.y, cartes.z, current_position.e };
planner.unapply_modifiers(pos planner.unapply_modifiers(pos
#if HAS_LEVELING #if HAS_LEVELING
, true , true
#endif #endif
); );
const xyze_pos_t &cartes = pos;
#endif #endif
if (axis == ALL_AXES) if (axis == ALL_AXES)
current_position = cartes; current_position = pos;
else else
current_position[axis] = cartes[axis]; current_position[axis] = pos[axis];
} }
/** /**