From c2c7a03706e54d1ce4441a39ca8343755bceac06 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 4 Aug 2021 17:01:42 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20report=5Fa=5Fposition=20AB?=
=?UTF-8?q?C=20criteria?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/module/stepper.cpp | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 0ff909d7cca..b8fdaa5f760 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2825,19 +2825,22 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
return v;
}
-#if ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)
- #define USES_ABC 1
+#if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, IS_SCARA, DELTA)
+ #define SAYS_A 1
#endif
-#if ANY(USES_ABC, MARKFORGED_XY, IS_SCARA)
- #define USES_AB 1
+#if ANY(CORE_IS_XY, CORE_IS_YZ, MARKFORGED_XY, IS_SCARA, DELTA)
+ #define SAYS_B 1
+#endif
+#if ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)
+ #define SAYS_C 1
#endif
void Stepper::report_a_position(const xyz_long_t &pos) {
SERIAL_ECHOLNPAIR_P(
LIST_N(DOUBLE(LINEAR_AXES),
- TERN(USES_AB, PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
- TERN(USES_AB, PSTR("B:"), SP_Y_LBL), pos.y,
- TERN(USES_ABC, PSTR("C:"), SP_Z_LBL), pos.z,
+ TERN(SAYS_A, PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
+ TERN(SAYS_B, PSTR("B:"), SP_Y_LBL), pos.y,
+ TERN(SAYS_C, PSTR("C:"), SP_Z_LBL), pos.z,
SP_I_LBL, pos.i,
SP_J_LBL, pos.j,
SP_K_LBL, pos.k