Skip to content

Commit

Permalink
🚸 Include extra axes in position report (#23490)
Browse files Browse the repository at this point in the history
  • Loading branch information
DerAndere1 authored Jan 10, 2022
1 parent 0dfc17c commit a719020
Showing 1 changed file with 13 additions and 19 deletions.
32 changes: 13 additions & 19 deletions Marlin/src/module/motion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,7 @@ void report_real_position() {
xyze_pos_t npos = LOGICAL_AXIS_ARRAY(
planner.get_axis_position_mm(E_AXIS),
cartes.x, cartes.y, cartes.z,
planner.get_axis_position_mm(I_AXIS),
planner.get_axis_position_mm(J_AXIS),
planner.get_axis_position_mm(K_AXIS)
cartes.i, cartes.j, cartes.k
);

TERN_(HAS_POSITION_MODIFIERS, planner.unapply_modifiers(npos, true));
Expand Down Expand Up @@ -263,27 +261,23 @@ void report_current_position_projected() {
* Output the current position (processed) to serial while moving
*/
void report_current_position_moving() {

get_cartesian_from_steppers();
const xyz_pos_t lpos = cartes.asLogical();
SERIAL_ECHOPGM(
"X:", lpos.x
#if HAS_Y_AXIS
, " Y:", lpos.y
#endif
#if HAS_Z_AXIS
, " Z:", lpos.z
#endif
#if HAS_EXTRUDERS
, " E:", current_position.e
#endif

SERIAL_ECHOPGM_P(
LIST_N(DOUBLE(LOGICAL_AXES),
SP_E_LBL, current_position.e,
X_LBL, lpos.x,
SP_Y_LBL, lpos.y,
SP_Z_LBL, lpos.z,
SP_I_LBL, lpos.i,
SP_J_LBL, lpos.j,
SP_K_LBL, lpos.k
)
);

stepper.report_positions();
#if IS_SCARA
scara_report_positions();
#endif

TERN_(IS_SCARA, scara_report_positions());
report_current_grblstate_moving();
}

Expand Down

0 comments on commit a719020

Please sign in to comment.