From 5198a554574300857bfad9a2e761b9a7b197fa08 Mon Sep 17 00:00:00 2001 From: ils15 Date: Fri, 16 Dec 2022 17:37:56 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Use=20multi-XYZ=20'STOP'=20pins?= =?UTF-8?q?=20for=20MIN/MAX=20(#24855)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Scott Lahteine --- Marlin/src/inc/Conditionals_post.h | 60 ++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index f6e76d1a6e..9e26137198 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -930,6 +930,12 @@ #define X2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(X2_MAX) + #undef X2_MAX_PIN + #if PIN_EXISTS(X2_STOP) + #define X2_MAX_PIN X2_STOP_PIN + #endif + #endif #else #ifndef X2_MIN_ENDSTOP_INVERTING #if X2_USE_ENDSTOP == _XMIN_ @@ -946,6 +952,12 @@ #define X2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(X2_MIN) + #undef X2_MIN_PIN + #if PIN_EXISTS(X2_STOP) + #define X2_MIN_PIN X2_STOP_PIN + #endif + #endif #endif #ifndef X2_MAX_ENDSTOP_INVERTING #define X2_MAX_ENDSTOP_INVERTING false @@ -975,6 +987,12 @@ #define Y2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(Y2_MAX) + #undef Y2_MAX_PIN + #if PIN_EXISTS(Y2_STOP) + #define Y2_MAX_PIN Y2_STOP_PIN + #endif + #endif #else #ifndef Y2_MIN_ENDSTOP_INVERTING #if Y2_USE_ENDSTOP == _XMIN_ @@ -991,6 +1009,12 @@ #define Y2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(Y2_MIN) + #undef Y2_MIN_PIN + #if PIN_EXISTS(Y2_STOP) + #define Y2_MIN_PIN Y2_STOP_PIN + #endif + #endif #endif #ifndef Y2_MAX_ENDSTOP_INVERTING #define Y2_MAX_ENDSTOP_INVERTING false @@ -1021,6 +1045,12 @@ #define Z2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(Z2_MAX) + #undef Z2_MAX_PIN + #if PIN_EXISTS(Z2_STOP) + #define Z2_MAX_PIN Z2_STOP_PIN + #endif + #endif #else #ifndef Z2_MIN_ENDSTOP_INVERTING #if Z2_USE_ENDSTOP == _XMIN_ @@ -1037,6 +1067,12 @@ #define Z2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(Z2_MIN) + #undef Z2_MIN_PIN + #if PIN_EXISTS(Z2_STOP) + #define Z2_MIN_PIN Z2_STOP_PIN + #endif + #endif #endif #ifndef Z2_MAX_ENDSTOP_INVERTING #define Z2_MAX_ENDSTOP_INVERTING false @@ -1062,6 +1098,12 @@ #define Z3_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(Z3_MAX) + #undef Z3_MAX_PIN + #if PIN_EXISTS(Z3_STOP) + #define Z3_MAX_PIN Z3_STOP_PIN + #endif + #endif #else #ifndef Z3_MIN_ENDSTOP_INVERTING #if Z3_USE_ENDSTOP == _XMIN_ @@ -1078,6 +1120,12 @@ #define Z3_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(Z3_MIN) + #undef Z3_MIN_PIN + #if PIN_EXISTS(Z3_STOP) + #define Z3_MIN_PIN Z3_STOP_PIN + #endif + #endif #endif #ifndef Z3_MAX_ENDSTOP_INVERTING #define Z3_MAX_ENDSTOP_INVERTING false @@ -1104,6 +1152,12 @@ #define Z4_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(Z4_MAX) + #undef Z4_MAX_PIN + #if PIN_EXISTS(Z4_STOP) + #define Z4_MAX_PIN Z4_STOP_PIN + #endif + #endif #else #ifndef Z4_MIN_ENDSTOP_INVERTING #if Z4_USE_ENDSTOP == _XMIN_ @@ -1120,6 +1174,12 @@ #define Z4_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING #endif #endif + #if !PIN_EXISTS(Z4_MIN) + #undef Z4_MIN_PIN + #if PIN_EXISTS(Z4_STOP) + #define Z4_MIN_PIN Z4_STOP_PIN + #endif + #endif #endif #ifndef Z4_MAX_ENDSTOP_INVERTING #define Z4_MAX_ENDSTOP_INVERTING false