report_current_position_moving() with extra axes

MarlinFirmware · Jan 9, 2022 · 3426f08 · 3426f08
1 parent 80128ae
commit 3426f08
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
@@ -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"
@@ -471,6 +468,10 @@
   #define AXIS6_STR   ""
 #endif
 
+#define STR_I AXIS4_STR
+#define STR_J AXIS5_STR
+#define STR_K AXIS6_STR
+
 #if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
 
   // Custom characters defined in the first 8 characters of the LCD

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
@@ -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));
@@ -267,15 +265,16 @@ 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
+      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
     );