|
@@ -217,9 +217,7 @@ void report_real_position() {
|
217
|
217
|
xyze_pos_t npos = LOGICAL_AXIS_ARRAY(
|
218
|
218
|
planner.get_axis_position_mm(E_AXIS),
|
219
|
219
|
cartes.x, cartes.y, cartes.z,
|
220
|
|
- planner.get_axis_position_mm(I_AXIS),
|
221
|
|
- planner.get_axis_position_mm(J_AXIS),
|
222
|
|
- planner.get_axis_position_mm(K_AXIS)
|
|
220
|
+ cartes.i, cartes.j, cartes.k
|
223
|
221
|
);
|
224
|
222
|
|
225
|
223
|
TERN_(HAS_POSITION_MODIFIERS, planner.unapply_modifiers(npos, true));
|
|
@@ -263,27 +261,23 @@ void report_current_position_projected() {
|
263
|
261
|
* Output the current position (processed) to serial while moving
|
264
|
262
|
*/
|
265
|
263
|
void report_current_position_moving() {
|
266
|
|
-
|
267
|
264
|
get_cartesian_from_steppers();
|
268
|
265
|
const xyz_pos_t lpos = cartes.asLogical();
|
269
|
|
- SERIAL_ECHOPGM(
|
270
|
|
- "X:", lpos.x
|
271
|
|
- #if HAS_Y_AXIS
|
272
|
|
- , " Y:", lpos.y
|
273
|
|
- #endif
|
274
|
|
- #if HAS_Z_AXIS
|
275
|
|
- , " Z:", lpos.z
|
276
|
|
- #endif
|
277
|
|
- #if HAS_EXTRUDERS
|
278
|
|
- , " E:", current_position.e
|
279
|
|
- #endif
|
|
266
|
+
|
|
267
|
+ SERIAL_ECHOPGM_P(
|
|
268
|
+ LIST_N(DOUBLE(LOGICAL_AXES),
|
|
269
|
+ SP_E_LBL, current_position.e,
|
|
270
|
+ X_LBL, lpos.x,
|
|
271
|
+ SP_Y_LBL, lpos.y,
|
|
272
|
+ SP_Z_LBL, lpos.z,
|
|
273
|
+ SP_I_LBL, lpos.i,
|
|
274
|
+ SP_J_LBL, lpos.j,
|
|
275
|
+ SP_K_LBL, lpos.k
|
|
276
|
+ )
|
280
|
277
|
);
|
281
|
278
|
|
282
|
279
|
stepper.report_positions();
|
283
|
|
- #if IS_SCARA
|
284
|
|
- scara_report_positions();
|
285
|
|
- #endif
|
286
|
|
-
|
|
280
|
+ TERN_(IS_SCARA, scara_report_positions());
|
287
|
281
|
report_current_grblstate_moving();
|
288
|
282
|
}
|
289
|
283
|
|