Skip to content

Commit ac64d69

Browse files
committed
🐛 Fix report_a_position ABC criteria
1 parent 1bee38a commit ac64d69

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

Marlin/src/module/stepper.cpp

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2825,19 +2825,22 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
28252825
return v;
28262826
}
28272827

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
28302833
#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
28332836
#endif
28342837

28352838
void Stepper::report_a_position(const xyz_long_t &pos) {
28362839
SERIAL_ECHOLNPAIR_P(
28372840
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,
28412844
SP_I_LBL, pos.i,
28422845
SP_J_LBL, pos.j,
28432846
SP_K_LBL, pos.k

0 commit comments

Comments
 (0)