Browse Source

🎨 Define Octopus allocated endstop pins (#22882)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
ellensp 3 years ago
parent
commit
f79d1f114c
No account linked to committer's email address
1 changed files with 26 additions and 3 deletions
  1. 26
    3
      Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h

+ 26
- 3
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h View File

37
 
37
 
38
 //
38
 //
39
 // Servos
39
 // Servos
40
+//
40
 #define SERVO0_PIN                          PB6
41
 #define SERVO0_PIN                          PB6
41
 
42
 
42
 //
43
 //
56
 #define E2_DIAG_PIN                         PG14  // E2DET
57
 #define E2_DIAG_PIN                         PG14  // E2DET
57
 #define E3_DIAG_PIN                         PG15  // E3DET
58
 #define E3_DIAG_PIN                         PG15  // E3DET
58
 
59
 
60
+//
59
 // Z Probe (when not Z_MIN_PIN)
61
 // Z Probe (when not Z_MIN_PIN)
60
 //
62
 //
61
 #ifndef Z_MIN_PROBE_PIN
63
 #ifndef Z_MIN_PROBE_PIN
63
 #endif
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
 // Limit Switches
85
 // Limit Switches
67
 //
86
 //
68
 #ifdef X_STALL_SENSITIVITY
87
 #ifdef X_STALL_SENSITIVITY
72
   #else
91
   #else
73
     #define X_MIN_PIN                E0_DIAG_PIN  // E0DET
92
     #define X_MIN_PIN                E0_DIAG_PIN  // E0DET
74
   #endif
93
   #endif
75
-#elif EITHER(X_DUAL_ENDSTOPS, DUAL_X_CARRIAGE)
94
+#elif EITHER(DUAL_X_CARRIAGE, NEEDS_X_MINMAX)
76
   #ifndef X_MIN_PIN
95
   #ifndef X_MIN_PIN
77
     #define X_MIN_PIN                 X_DIAG_PIN  // X-STOP
96
     #define X_MIN_PIN                 X_DIAG_PIN  // X-STOP
78
   #endif
97
   #endif
90
   #else
109
   #else
91
     #define Y_MIN_PIN                E1_DIAG_PIN  // E1DET
110
     #define Y_MIN_PIN                E1_DIAG_PIN  // E1DET
92
   #endif
111
   #endif
93
-#elif ENABLED(Y_DUAL_ENDSTOPS)
112
+#elif NEEDS_Y_MINMAX
94
   #ifndef Y_MIN_PIN
113
   #ifndef Y_MIN_PIN
95
     #define Y_MIN_PIN                 Y_DIAG_PIN  // Y-STOP
114
     #define Y_MIN_PIN                 Y_DIAG_PIN  // Y-STOP
96
   #endif
115
   #endif
108
   #else
127
   #else
109
     #define Z_MIN_PIN                E2_DIAG_PIN  // PWRDET
128
     #define Z_MIN_PIN                E2_DIAG_PIN  // PWRDET
110
   #endif
129
   #endif
111
-#elif ENABLED(Z_MULTI_ENDSTOPS)
130
+#elif NEEDS_Z_MINMAX
112
   #ifndef Z_MIN_PIN
131
   #ifndef Z_MIN_PIN
113
     #define Z_MIN_PIN                 Z_DIAG_PIN  // Z-STOP
132
     #define Z_MIN_PIN                 Z_DIAG_PIN  // Z-STOP
114
   #endif
133
   #endif
119
   #define Z_STOP_PIN                  Z_DIAG_PIN  // Z-STOP
138
   #define Z_STOP_PIN                  Z_DIAG_PIN  // Z-STOP
120
 #endif
139
 #endif
121
 
140
 
141
+#undef NEEDS_X_MINMAX
142
+#undef NEEDS_Y_MINMAX
143
+#undef NEEDS_Z_MINMAX
144
+
122
 //
145
 //
123
 // Filament Runout Sensor
146
 // Filament Runout Sensor
124
 //
147
 //

Loading…
Cancel
Save