Skip to content

Commit cbf17a8

Browse files
ils15thinkyhead
authored andcommitted
🔧 Use multi-XYZ 'STOP' pins for MIN/MAX (MarlinFirmware#24855)
Co-authored-by: Scott Lahteine <[email protected]>
1 parent 2fd730d commit cbf17a8

File tree

1 file changed

+60
-0
lines changed

1 file changed

+60
-0
lines changed

Marlin/src/inc/Conditionals_post.h

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -930,6 +930,12 @@
930930
#define X2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
931931
#endif
932932
#endif
933+
#if !PIN_EXISTS(X2_MAX)
934+
#undef X2_MAX_PIN
935+
#if PIN_EXISTS(X2_STOP)
936+
#define X2_MAX_PIN X2_STOP_PIN
937+
#endif
938+
#endif
933939
#else
934940
#ifndef X2_MIN_ENDSTOP_INVERTING
935941
#if X2_USE_ENDSTOP == _XMIN_
@@ -946,6 +952,12 @@
946952
#define X2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
947953
#endif
948954
#endif
955+
#if !PIN_EXISTS(X2_MIN)
956+
#undef X2_MIN_PIN
957+
#if PIN_EXISTS(X2_STOP)
958+
#define X2_MIN_PIN X2_STOP_PIN
959+
#endif
960+
#endif
949961
#endif
950962
#ifndef X2_MAX_ENDSTOP_INVERTING
951963
#define X2_MAX_ENDSTOP_INVERTING false
@@ -975,6 +987,12 @@
975987
#define Y2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
976988
#endif
977989
#endif
990+
#if !PIN_EXISTS(Y2_MAX)
991+
#undef Y2_MAX_PIN
992+
#if PIN_EXISTS(Y2_STOP)
993+
#define Y2_MAX_PIN Y2_STOP_PIN
994+
#endif
995+
#endif
978996
#else
979997
#ifndef Y2_MIN_ENDSTOP_INVERTING
980998
#if Y2_USE_ENDSTOP == _XMIN_
@@ -991,6 +1009,12 @@
9911009
#define Y2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
9921010
#endif
9931011
#endif
1012+
#if !PIN_EXISTS(Y2_MIN)
1013+
#undef Y2_MIN_PIN
1014+
#if PIN_EXISTS(Y2_STOP)
1015+
#define Y2_MIN_PIN Y2_STOP_PIN
1016+
#endif
1017+
#endif
9941018
#endif
9951019
#ifndef Y2_MAX_ENDSTOP_INVERTING
9961020
#define Y2_MAX_ENDSTOP_INVERTING false
@@ -1021,6 +1045,12 @@
10211045
#define Z2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
10221046
#endif
10231047
#endif
1048+
#if !PIN_EXISTS(Z2_MAX)
1049+
#undef Z2_MAX_PIN
1050+
#if PIN_EXISTS(Z2_STOP)
1051+
#define Z2_MAX_PIN Z2_STOP_PIN
1052+
#endif
1053+
#endif
10241054
#else
10251055
#ifndef Z2_MIN_ENDSTOP_INVERTING
10261056
#if Z2_USE_ENDSTOP == _XMIN_
@@ -1037,6 +1067,12 @@
10371067
#define Z2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
10381068
#endif
10391069
#endif
1070+
#if !PIN_EXISTS(Z2_MIN)
1071+
#undef Z2_MIN_PIN
1072+
#if PIN_EXISTS(Z2_STOP)
1073+
#define Z2_MIN_PIN Z2_STOP_PIN
1074+
#endif
1075+
#endif
10401076
#endif
10411077
#ifndef Z2_MAX_ENDSTOP_INVERTING
10421078
#define Z2_MAX_ENDSTOP_INVERTING false
@@ -1062,6 +1098,12 @@
10621098
#define Z3_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
10631099
#endif
10641100
#endif
1101+
#if !PIN_EXISTS(Z3_MAX)
1102+
#undef Z3_MAX_PIN
1103+
#if PIN_EXISTS(Z3_STOP)
1104+
#define Z3_MAX_PIN Z3_STOP_PIN
1105+
#endif
1106+
#endif
10651107
#else
10661108
#ifndef Z3_MIN_ENDSTOP_INVERTING
10671109
#if Z3_USE_ENDSTOP == _XMIN_
@@ -1078,6 +1120,12 @@
10781120
#define Z3_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
10791121
#endif
10801122
#endif
1123+
#if !PIN_EXISTS(Z3_MIN)
1124+
#undef Z3_MIN_PIN
1125+
#if PIN_EXISTS(Z3_STOP)
1126+
#define Z3_MIN_PIN Z3_STOP_PIN
1127+
#endif
1128+
#endif
10811129
#endif
10821130
#ifndef Z3_MAX_ENDSTOP_INVERTING
10831131
#define Z3_MAX_ENDSTOP_INVERTING false
@@ -1104,6 +1152,12 @@
11041152
#define Z4_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
11051153
#endif
11061154
#endif
1155+
#if !PIN_EXISTS(Z4_MAX)
1156+
#undef Z4_MAX_PIN
1157+
#if PIN_EXISTS(Z4_STOP)
1158+
#define Z4_MAX_PIN Z4_STOP_PIN
1159+
#endif
1160+
#endif
11071161
#else
11081162
#ifndef Z4_MIN_ENDSTOP_INVERTING
11091163
#if Z4_USE_ENDSTOP == _XMIN_
@@ -1120,6 +1174,12 @@
11201174
#define Z4_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
11211175
#endif
11221176
#endif
1177+
#if !PIN_EXISTS(Z4_MIN)
1178+
#undef Z4_MIN_PIN
1179+
#if PIN_EXISTS(Z4_STOP)
1180+
#define Z4_MIN_PIN Z4_STOP_PIN
1181+
#endif
1182+
#endif
11231183
#endif
11241184
#ifndef Z4_MAX_ENDSTOP_INVERTING
11251185
#define Z4_MAX_ENDSTOP_INVERTING false

0 commit comments

Comments
 (0)