🚸 Include extra axes in position report (#23490)

Marlin/src/gcode/feature/pause/G60.cpp

@@ -47,13 +47,16 @@ void GcodeSuite::G60() {
   SBI(saved_slots[slot >> 3], slot & 0x07);
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
+  {
     DEBUG_ECHOPGM(STR_SAVED_POS " S", slot);
     const xyze_pos_t &pos = stored_position[slot];
     DEBUG_ECHOLNPAIR_F_P(
-      LIST_N(DOUBLE(LOGICAL_AXES), SP_E_STR, pos.e,
+      LIST_N(DOUBLE(LINEAR_AXES), PSTR(" : X"), pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z, SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k)
-      PSTR(" : X"), pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z,
+      #if HAS_EXTRUDERS
-      SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k)
+        , SP_E_STR, pos.e
+      #endif
     );
+  }
   #endif
 }
 

Marlin/src/lcd/marlinui.cpp

@@ -771,7 +771,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       // Add a manual move to the queue?
       if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
 
-        const feedRate_t fr_mm_s = (axis <= LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
+        const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
 
         #if IS_KINEMATIC
 

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),
+    cartes.i, cartes.j, cartes.k
-    planner.get_axis_position_mm(J_AXIS),
-    planner.get_axis_position_mm(K_AXIS)
   );
 
   TERN_(HAS_POSITION_MODIFIERS, planner.unapply_modifiers(npos, true));
@@ -263,27 +261,25 @@ 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
+    SERIAL_ECHOPGM_P(
-      #if HAS_Y_AXIS
+      LIST_N(DOUBLE(LINEAR_AXES),
-        , " Y:", lpos.y
+           X_LBL, lpos.x,
-      #endif
+        SP_Y_LBL, lpos.y,
-      #if HAS_Z_AXIS
+        SP_Z_LBL, lpos.z,
-        , " Z:", lpos.z
+        SP_I_LBL, lpos.i,
-      #endif
+        SP_J_LBL, lpos.j,
+        SP_K_LBL, lpos.k
+      )
       #if HAS_EXTRUDERS
-        , " E:", current_position.e
+        , SP_E_LBL, current_position.e
       #endif
     );
 
     stepper.report_positions();
-    #if IS_SCARA
+    TERN_(IS_SCARA, scara_report_positions());
-      scara_report_positions();
-    #endif
-
     report_current_grblstate_moving();
   }