From ce2b4bc20c20f5a85a7d3ac5942b1134695a9944 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 2 Jul 2019 20:06:43 -0500 Subject: [PATCH] Conditionals tweak --- Marlin/src/inc/Conditionals_post.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index f6dac7ce49..36b4fd7e0c 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -920,13 +920,13 @@ #endif // Endstops and bed probe -#define HAS_STOP_TEST(A,M) (PIN_EXISTS(A##_##M) && !IS_X2_ENDSTOP(A,M) && !IS_Y2_ENDSTOP(A,M) && !IS_Z2_OR_PROBE(A,M)) -#define HAS_X_MIN HAS_STOP_TEST(X,MIN) -#define HAS_X_MAX HAS_STOP_TEST(X,MAX) -#define HAS_Y_MIN HAS_STOP_TEST(Y,MIN) -#define HAS_Y_MAX HAS_STOP_TEST(Y,MAX) -#define HAS_Z_MIN HAS_STOP_TEST(Z,MIN) -#define HAS_Z_MAX HAS_STOP_TEST(Z,MAX) +#define _HAS_STOP(A,M) (PIN_EXISTS(A##_##M) && !IS_X2_ENDSTOP(A,M) && !IS_Y2_ENDSTOP(A,M) && !IS_Z2_OR_PROBE(A,M)) +#define HAS_X_MIN _HAS_STOP(X,MIN) +#define HAS_X_MAX _HAS_STOP(X,MAX) +#define HAS_Y_MIN _HAS_STOP(Y,MIN) +#define HAS_Y_MAX _HAS_STOP(Y,MAX) +#define HAS_Z_MIN _HAS_STOP(Z,MIN) +#define HAS_Z_MAX _HAS_STOP(Z,MAX) #define HAS_X2_MIN (PIN_EXISTS(X2_MIN)) #define HAS_X2_MAX (PIN_EXISTS(X2_MAX)) #define HAS_Y2_MIN (PIN_EXISTS(Y2_MIN))