Browse Source

🩹 Fix some logical axis usage

Scott Lahteine 3 years ago
parent
commit
224b6e5af9

+ 6
- 3
Marlin/src/gcode/feature/pause/G60.cpp View File

47
   SBI(saved_slots[slot >> 3], slot & 0x07);
47
   SBI(saved_slots[slot >> 3], slot & 0x07);
48
 
48
 
49
   #if ENABLED(SAVED_POSITIONS_DEBUG)
49
   #if ENABLED(SAVED_POSITIONS_DEBUG)
50
+  {
50
     DEBUG_ECHOPGM(STR_SAVED_POS " S", slot);
51
     DEBUG_ECHOPGM(STR_SAVED_POS " S", slot);
51
     const xyze_pos_t &pos = stored_position[slot];
52
     const xyze_pos_t &pos = stored_position[slot];
52
     DEBUG_ECHOLNPAIR_F_P(
53
     DEBUG_ECHOLNPAIR_F_P(
53
-      LIST_N(DOUBLE(LOGICAL_AXES), SP_E_STR, pos.e,
54
-      PSTR(" : X"), pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z,
55
-      SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k)
54
+      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)
55
+      #if HAS_EXTRUDERS
56
+        , SP_E_STR, pos.e
57
+      #endif
56
     );
58
     );
59
+  }
57
   #endif
60
   #endif
58
 }
61
 }
59
 
62
 

+ 1
- 1
Marlin/src/lcd/marlinui.cpp View File

771
       // Add a manual move to the queue?
771
       // Add a manual move to the queue?
772
       if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
772
       if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
773
 
773
 
774
-        const feedRate_t fr_mm_s = (axis <= LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
774
+        const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
775
 
775
 
776
         #if IS_KINEMATIC
776
         #if IS_KINEMATIC
777
 
777
 

+ 4
- 2
Marlin/src/module/motion.cpp View File

265
     const xyz_pos_t lpos = cartes.asLogical();
265
     const xyz_pos_t lpos = cartes.asLogical();
266
 
266
 
267
     SERIAL_ECHOPGM_P(
267
     SERIAL_ECHOPGM_P(
268
-      LIST_N(DOUBLE(LOGICAL_AXES),
269
-        SP_E_LBL, current_position.e,
268
+      LIST_N(DOUBLE(LINEAR_AXES),
270
            X_LBL, lpos.x,
269
            X_LBL, lpos.x,
271
         SP_Y_LBL, lpos.y,
270
         SP_Y_LBL, lpos.y,
272
         SP_Z_LBL, lpos.z,
271
         SP_Z_LBL, lpos.z,
274
         SP_J_LBL, lpos.j,
273
         SP_J_LBL, lpos.j,
275
         SP_K_LBL, lpos.k
274
         SP_K_LBL, lpos.k
276
       )
275
       )
276
+      #if HAS_EXTRUDERS
277
+        , SP_E_LBL, current_position.e
278
+      #endif
277
     );
279
     );
278
 
280
 
279
     stepper.report_positions();
281
     stepper.report_positions();

Loading…
Cancel
Save