Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

report_current_position_moving() with LINEAR_AXES >= 4 #23490

Merged
merged 3 commits into from
Jan 10, 2022
Merged

report_current_position_moving() with LINEAR_AXES >= 4 #23490

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fa17f0
report_current_position_moving() with extra axes
DerAndere1 Jan 9, 2022
0f2070a
one less change
thinkyhead Jan 10, 2022
de201b6
Use LOGICAL_AXES
thinkyhead Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Marlin/src/core/language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,6 @@
#define STR_X "X"
#define STR_Y "Y"
#define STR_Z "Z"
#define STR_I AXIS4_STR
#define STR_J AXIS5_STR
#define STR_K AXIS6_STR
#define STR_E "E"
#if IS_KINEMATIC
#define STR_A "A"
Expand Down Expand Up @@ -471,6 +468,10 @@
#define AXIS6_STR ""
#endif

#define STR_I AXIS4_STR
#define STR_J AXIS5_STR
#define STR_K AXIS6_STR
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved

#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)

// Custom characters defined in the first 8 characters of the LCD
Expand Down
23 changes: 11 additions & 12 deletions Marlin/src/module/motion.cpp
View file
Open in desktop
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 @@ -266,16 +264,17 @@ void report_current_position_projected() {

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
SERIAL_ECHOPGM_P(
LIST_N(DOUBLE(LINEAR_AXES),
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
)
#if HAS_EXTRUDERS
, " E:", current_position.e
, SP_E_LBL, current_position.e
#endif
);

Expand Down