|
@@ -2825,19 +2825,22 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
|
2825
|
2825
|
return v;
|
2826
|
2826
|
}
|
2827
|
2827
|
|
2828
|
|
-#if ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)
|
2829
|
|
- #define USES_ABC 1
|
|
2828
|
+#if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, IS_SCARA, DELTA)
|
|
2829
|
+ #define SAYS_A 1
|
|
2830
|
+#endif
|
|
2831
|
+#if ANY(CORE_IS_XY, CORE_IS_YZ, MARKFORGED_XY, IS_SCARA, DELTA)
|
|
2832
|
+ #define SAYS_B 1
|
2830
|
2833
|
#endif
|
2831
|
|
-#if ANY(USES_ABC, MARKFORGED_XY, IS_SCARA)
|
2832
|
|
- #define USES_AB 1
|
|
2834
|
+#if ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)
|
|
2835
|
+ #define SAYS_C 1
|
2833
|
2836
|
#endif
|
2834
|
2837
|
|
2835
|
2838
|
void Stepper::report_a_position(const xyz_long_t &pos) {
|
2836
|
2839
|
SERIAL_ECHOLNPAIR_P(
|
2837
|
2840
|
LIST_N(DOUBLE(LINEAR_AXES),
|
2838
|
|
- TERN(USES_AB, PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
|
2839
|
|
- TERN(USES_AB, PSTR("B:"), SP_Y_LBL), pos.y,
|
2840
|
|
- TERN(USES_ABC, PSTR("C:"), SP_Z_LBL), pos.z,
|
|
2841
|
+ TERN(SAYS_A, PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
|
|
2842
|
+ TERN(SAYS_B, PSTR("B:"), SP_Y_LBL), pos.y,
|
|
2843
|
+ TERN(SAYS_C, PSTR("C:"), SP_Z_LBL), pos.z,
|
2841
|
2844
|
SP_I_LBL, pos.i,
|
2842
|
2845
|
SP_J_LBL, pos.j,
|
2843
|
2846
|
SP_K_LBL, pos.k
|