|
@@ -37,6 +37,7 @@
|
37
|
37
|
|
38
|
38
|
//
|
39
|
39
|
// Servos
|
|
40
|
+//
|
40
|
41
|
#define SERVO0_PIN PB6
|
41
|
42
|
|
42
|
43
|
//
|
|
@@ -56,6 +57,7 @@
|
56
|
57
|
#define E2_DIAG_PIN PG14 // E2DET
|
57
|
58
|
#define E3_DIAG_PIN PG15 // E3DET
|
58
|
59
|
|
|
60
|
+//
|
59
|
61
|
// Z Probe (when not Z_MIN_PIN)
|
60
|
62
|
//
|
61
|
63
|
#ifndef Z_MIN_PROBE_PIN
|
|
@@ -63,6 +65,23 @@
|
63
|
65
|
#endif
|
64
|
66
|
|
65
|
67
|
//
|
|
68
|
+// Check for additional used endstop pins
|
|
69
|
+//
|
|
70
|
+#if HAS_EXTRA_ENDSTOPS
|
|
71
|
+ #define _ENDSTOP_IS_ANY(ES) X2_USE_ENDSTOP == ES || Y2_USE_ENDSTOP == ES || Z2_USE_ENDSTOP == ES || Z3_USE_ENDSTOP == ES || Z4_USE_ENDSTOP == ES
|
|
72
|
+ #if _ENDSTOP_IS_ANY(_XMIN_) || _ENDSTOP_IS_ANY(_XMAX_)
|
|
73
|
+ #define NEEDS_X_MINMAX 1
|
|
74
|
+ #endif
|
|
75
|
+ #if _ENDSTOP_IS_ANY(_YMIN_) || _ENDSTOP_IS_ANY(_YMAX_)
|
|
76
|
+ #define NEEDS_Y_MINMAX 1
|
|
77
|
+ #endif
|
|
78
|
+ #if _ENDSTOP_IS_ANY(_ZMIN_) || _ENDSTOP_IS_ANY(_ZMAX_)
|
|
79
|
+ #define NEEDS_Z_MINMAX 1
|
|
80
|
+ #endif
|
|
81
|
+ #undef _ENDSTOP_IS_ANY
|
|
82
|
+#endif
|
|
83
|
+
|
|
84
|
+//
|
66
|
85
|
// Limit Switches
|
67
|
86
|
//
|
68
|
87
|
#ifdef X_STALL_SENSITIVITY
|
|
@@ -72,7 +91,7 @@
|
72
|
91
|
#else
|
73
|
92
|
#define X_MIN_PIN E0_DIAG_PIN // E0DET
|
74
|
93
|
#endif
|
75
|
|
-#elif EITHER(X_DUAL_ENDSTOPS, DUAL_X_CARRIAGE)
|
|
94
|
+#elif EITHER(DUAL_X_CARRIAGE, NEEDS_X_MINMAX)
|
76
|
95
|
#ifndef X_MIN_PIN
|
77
|
96
|
#define X_MIN_PIN X_DIAG_PIN // X-STOP
|
78
|
97
|
#endif
|
|
@@ -90,7 +109,7 @@
|
90
|
109
|
#else
|
91
|
110
|
#define Y_MIN_PIN E1_DIAG_PIN // E1DET
|
92
|
111
|
#endif
|
93
|
|
-#elif ENABLED(Y_DUAL_ENDSTOPS)
|
|
112
|
+#elif NEEDS_Y_MINMAX
|
94
|
113
|
#ifndef Y_MIN_PIN
|
95
|
114
|
#define Y_MIN_PIN Y_DIAG_PIN // Y-STOP
|
96
|
115
|
#endif
|
|
@@ -108,7 +127,7 @@
|
108
|
127
|
#else
|
109
|
128
|
#define Z_MIN_PIN E2_DIAG_PIN // PWRDET
|
110
|
129
|
#endif
|
111
|
|
-#elif ENABLED(Z_MULTI_ENDSTOPS)
|
|
130
|
+#elif NEEDS_Z_MINMAX
|
112
|
131
|
#ifndef Z_MIN_PIN
|
113
|
132
|
#define Z_MIN_PIN Z_DIAG_PIN // Z-STOP
|
114
|
133
|
#endif
|
|
@@ -119,6 +138,10 @@
|
119
|
138
|
#define Z_STOP_PIN Z_DIAG_PIN // Z-STOP
|
120
|
139
|
#endif
|
121
|
140
|
|
|
141
|
+#undef NEEDS_X_MINMAX
|
|
142
|
+#undef NEEDS_Y_MINMAX
|
|
143
|
+#undef NEEDS_Z_MINMAX
|
|
144
|
+
|
122
|
145
|
//
|
123
|
146
|
// Filament Runout Sensor
|
124
|
147
|
//
|