Skip to content

Commit 7d95928

Browse files
thinkyheadthinkyhead
committed
🐛 Fix auto pullup/down settings
Followup to #25748
1 parent a872232 commit 7d95928

File tree

1 file changed

+106
-120
lines changed

1 file changed

+106
-120
lines changed

‎Marlin/src/inc/Conditionals_post.h

+106-120
Original file line numberDiff line numberDiff line change
@@ -1012,126 +1012,6 @@
10121012

10131013
#endif // Z_MULTI_ENDSTOPS
10141014

1015-
/**
1016-
* Set ENDSTOPPULLUPS for active endstop switches
1017-
*/
1018-
#if ENABLED(ENDSTOPPULLUPS)
1019-
#if HAS_X_MAX
1020-
#define ENDSTOPPULLUP_XMAX
1021-
#endif
1022-
#if HAS_Y_MAX
1023-
#define ENDSTOPPULLUP_YMAX
1024-
#endif
1025-
#if HAS_Z_MAX
1026-
#define ENDSTOPPULLUP_ZMAX
1027-
#endif
1028-
#if HAS_I_MAX
1029-
#define ENDSTOPPULLUP_IMAX
1030-
#endif
1031-
#if HAS_J_MAX
1032-
#define ENDSTOPPULLUP_JMAX
1033-
#endif
1034-
#if HAS_K_MAX
1035-
#define ENDSTOPPULLUP_KMAX
1036-
#endif
1037-
#if HAS_U_MAX
1038-
#define ENDSTOPPULLUP_UMAX
1039-
#endif
1040-
#if HAS_V_MAX
1041-
#define ENDSTOPPULLUP_VMAX
1042-
#endif
1043-
#if HAS_W_MAX
1044-
#define ENDSTOPPULLUP_WMAX
1045-
#endif
1046-
#if HAS_X_MIN
1047-
#define ENDSTOPPULLUP_XMIN
1048-
#endif
1049-
#if HAS_Y_MIN
1050-
#define ENDSTOPPULLUP_YMIN
1051-
#endif
1052-
#if HAS_Z_MIN_PIN
1053-
#define ENDSTOPPULLUP_ZMIN
1054-
#endif
1055-
#if HAS_I_MIN
1056-
#define ENDSTOPPULLUP_IMIN
1057-
#endif
1058-
#if HAS_J_MIN
1059-
#define ENDSTOPPULLUP_JMIN
1060-
#endif
1061-
#if HAS_K_MIN
1062-
#define ENDSTOPPULLUP_KMIN
1063-
#endif
1064-
#if HAS_U_MIN
1065-
#define ENDSTOPPULLUP_UMIN
1066-
#endif
1067-
#if HAS_V_MIN
1068-
#define ENDSTOPPULLUP_VMIN
1069-
#endif
1070-
#if HAS_W_MIN
1071-
#define ENDSTOPPULLUP_WMIN
1072-
#endif
1073-
#endif
1074-
1075-
/**
1076-
* Set ENDSTOPPULLDOWNS for active endstop switches
1077-
*/
1078-
#if ENABLED(ENDSTOPPULLDOWNS)
1079-
#if HAS_X_MAX
1080-
#define ENDSTOPPULLDOWN_XMAX
1081-
#endif
1082-
#if HAS_Y_MAX
1083-
#define ENDSTOPPULLDOWN_YMAX
1084-
#endif
1085-
#if HAS_Z_MAX
1086-
#define ENDSTOPPULLDOWN_ZMAX
1087-
#endif
1088-
#if HAS_I_MAX
1089-
#define ENDSTOPPULLDOWN_IMAX
1090-
#endif
1091-
#if HAS_J_MAX
1092-
#define ENDSTOPPULLDOWN_JMAX
1093-
#endif
1094-
#if HAS_K_MAX
1095-
#define ENDSTOPPULLDOWN_KMAX
1096-
#endif
1097-
#if HAS_U_MAX
1098-
#define ENDSTOPPULLDOWN_UMAX
1099-
#endif
1100-
#if HAS_V_MAX
1101-
#define ENDSTOPPULLDOWN_VMAX
1102-
#endif
1103-
#if HAS_W_MAX
1104-
#define ENDSTOPPULLDOWN_WMAX
1105-
#endif
1106-
#if HAS_X_MIN
1107-
#define ENDSTOPPULLDOWN_XMIN
1108-
#endif
1109-
#if HAS_Y_MIN
1110-
#define ENDSTOPPULLDOWN_YMIN
1111-
#endif
1112-
#if HAS_Z_MIN_PIN
1113-
#define ENDSTOPPULLDOWN_ZMIN
1114-
#endif
1115-
#if HAS_I_MIN
1116-
#define ENDSTOPPULLDOWN_IMIN
1117-
#endif
1118-
#if HAS_J_MIN
1119-
#define ENDSTOPPULLDOWN_JMIN
1120-
#endif
1121-
#if HAS_K_MIN
1122-
#define ENDSTOPPULLDOWN_KMIN
1123-
#endif
1124-
#if HAS_U_MIN
1125-
#define ENDSTOPPULLDOWN_UMIN
1126-
#endif
1127-
#if HAS_V_MIN
1128-
#define ENDSTOPPULLDOWN_VMIN
1129-
#endif
1130-
#if HAS_W_MIN
1131-
#define ENDSTOPPULLDOWN_WMIN
1132-
#endif
1133-
#endif
1134-
11351015
/**
11361016
* Shorthand for pin tests, used wherever needed
11371017
*/
@@ -2207,6 +2087,112 @@
22072087

22082088
#undef _HAS_STOP
22092089

2090+
/**
2091+
* Set ENDSTOPPULLUPS for active endstop switches
2092+
*/
2093+
#if ENABLED(ENDSTOPPULLUPS)
2094+
#if HAS_X_MIN
2095+
#define ENDSTOPPULLUP_XMIN
2096+
#endif
2097+
#if HAS_X_MAX
2098+
#define ENDSTOPPULLUP_XMAX
2099+
#endif
2100+
#if HAS_Y_MIN
2101+
#define ENDSTOPPULLUP_YMIN
2102+
#elif HAS_Y_MAX
2103+
#define ENDSTOPPULLUP_YMAX
2104+
#endif
2105+
#if HAS_Z_MIN_PIN
2106+
#define ENDSTOPPULLUP_ZMIN
2107+
#endif
2108+
#if HAS_Z_MAX
2109+
#define ENDSTOPPULLUP_ZMAX
2110+
#endif
2111+
#if HAS_I_MIN
2112+
#define ENDSTOPPULLUP_IMIN
2113+
#elif HAS_I_MAX
2114+
#define ENDSTOPPULLUP_IMAX
2115+
#endif
2116+
#if HAS_J_MIN
2117+
#define ENDSTOPPULLUP_JMIN
2118+
#elif HAS_J_MAX
2119+
#define ENDSTOPPULLUP_JMAX
2120+
#endif
2121+
#if HAS_K_MIN
2122+
#define ENDSTOPPULLUP_KMIN
2123+
#elif HAS_K_MAX
2124+
#define ENDSTOPPULLUP_KMAX
2125+
#endif
2126+
#if HAS_U_MIN
2127+
#define ENDSTOPPULLUP_UMIN
2128+
#elif HAS_U_MAX
2129+
#define ENDSTOPPULLUP_UMAX
2130+
#endif
2131+
#if HAS_V_MIN
2132+
#define ENDSTOPPULLUP_VMIN
2133+
#elif HAS_V_MAX
2134+
#define ENDSTOPPULLUP_VMAX
2135+
#endif
2136+
#if HAS_W_MIN
2137+
#define ENDSTOPPULLUP_WMIN
2138+
#elif HAS_W_MAX
2139+
#define ENDSTOPPULLUP_WMAX
2140+
#endif
2141+
#endif
2142+
2143+
/**
2144+
* Set ENDSTOPPULLDOWNS for active endstop switches
2145+
*/
2146+
#if ENABLED(ENDSTOPPULLDOWNS)
2147+
#if HAS_X_MIN
2148+
#define ENDSTOPPULLDOWN_XMIN
2149+
#endif
2150+
#if HAS_X_MAX
2151+
#define ENDSTOPPULLDOWN_XMAX
2152+
#endif
2153+
#if HAS_Y_MIN
2154+
#define ENDSTOPPULLDOWN_YMIN
2155+
#elif HAS_Y_MAX
2156+
#define ENDSTOPPULLDOWN_YMAX
2157+
#endif
2158+
#if HAS_Z_MIN_PIN
2159+
#define ENDSTOPPULLDOWN_ZMIN
2160+
#endif
2161+
#if HAS_Z_MAX
2162+
#define ENDSTOPPULLDOWN_ZMAX
2163+
#endif
2164+
#if HAS_I_MIN
2165+
#define ENDSTOPPULLDOWN_IMIN
2166+
#elif HAS_I_MAX
2167+
#define ENDSTOPPULLDOWN_IMAX
2168+
#endif
2169+
#if HAS_J_MIN
2170+
#define ENDSTOPPULLDOWN_JMIN
2171+
#elif HAS_J_MAX
2172+
#define ENDSTOPPULLDOWN_JMAX
2173+
#endif
2174+
#if HAS_K_MIN
2175+
#define ENDSTOPPULLDOWN_KMIN
2176+
#elif HAS_K_MAX
2177+
#define ENDSTOPPULLDOWN_KMAX
2178+
#endif
2179+
#if HAS_U_MIN
2180+
#define ENDSTOPPULLDOWN_UMIN
2181+
#elif HAS_U_MAX
2182+
#define ENDSTOPPULLDOWN_UMAX
2183+
#endif
2184+
#if HAS_V_MIN
2185+
#define ENDSTOPPULLDOWN_VMIN
2186+
#elif HAS_V_MAX
2187+
#define ENDSTOPPULLDOWN_VMAX
2188+
#endif
2189+
#if HAS_W_MIN
2190+
#define ENDSTOPPULLDOWN_WMIN
2191+
#elif HAS_W_MAX
2192+
#define ENDSTOPPULLDOWN_WMAX
2193+
#endif
2194+
#endif
2195+
22102196
//
22112197
// ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
22122198
//

0 commit comments

Comments
 (0)