Browse Source

Pins cleanup

Scott Lahteine 5 years ago
parent
commit
b2b7c583eb

+ 0
- 4
Marlin/src/pins/stm32/pins_BEAST.h View File

@@ -284,7 +284,3 @@
284 284
   #endif // NEWPANEL
285 285
 
286 286
 #endif // HAS_SPI_LCD
287
-
288
-#define U_MIN_PIN          -1
289
-#define V_MIN_PIN          -1
290
-#define W_MIN_PIN          -1

+ 0
- 4
Marlin/src/pins/stm32/pins_CHITU3D.h View File

@@ -282,7 +282,3 @@
282 282
   #endif // NEWPANEL
283 283
 
284 284
 #endif // HAS_SPI_LCD
285
-
286
-#define U_MIN_PIN          -1
287
-#define V_MIN_PIN          -1
288
-#define W_MIN_PIN          -1

+ 0
- 3
Marlin/src/pins/stm32/pins_STM32F1R.h View File

@@ -38,9 +38,6 @@
38 38
 //
39 39
 // Limit Switches
40 40
 //
41
-#define U_MIN_PIN          -1
42
-#define V_MIN_PIN          -1
43
-#define W_MIN_PIN          -1
44 41
 #define X_STOP_PIN         PB3
45 42
 #define Y_STOP_PIN         PB4
46 43
 #define Z_STOP_PIN         PB5

+ 77
- 80
Marlin/src/pins/stm32/pins_STM3R_MINI.h View File

@@ -41,9 +41,6 @@
41 41
 //
42 42
 // Limit Switches
43 43
 //
44
-#define U_MIN_PIN          -1
45
-#define V_MIN_PIN          -1
46
-#define W_MIN_PIN          -1
47 44
 #define X_STOP_PIN         PD0
48 45
 #define Y_STOP_PIN         PD1
49 46
 #define Z_STOP_PIN         PD4
@@ -118,31 +115,31 @@
118 115
 #if HAS_SPI_LCD
119 116
 
120 117
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
121
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
122
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
123
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
118
+    #define LCD_PINS_RS    49   // CS chip select /SS chip slave select
119
+    #define LCD_PINS_ENABLE 51  // SID (MOSI)
120
+    #define LCD_PINS_D4    52   // SCK (CLK) clock
124 121
   #elif BOTH(NEWPANEL, PANEL_ONE)
125
-    #define LCD_PINS_RS         PB8
126
-    #define LCD_PINS_ENABLE     PD2
127
-    #define LCD_PINS_D4         PB12
128
-    #define LCD_PINS_D5         PB13
129
-    #define LCD_PINS_D6         PB14
130
-    #define LCD_PINS_D7         PB15
122
+    #define LCD_PINS_RS    PB8
123
+    #define LCD_PINS_ENABLE PD2
124
+    #define LCD_PINS_D4    PB12
125
+    #define LCD_PINS_D5    PB13
126
+    #define LCD_PINS_D6    PB14
127
+    #define LCD_PINS_D7    PB15
131 128
   #else
132
-    #define LCD_PINS_RS         PB8
133
-    #define LCD_PINS_ENABLE     PD2
134
-    #define LCD_PINS_D4         PB12
135
-    #define LCD_PINS_D5         PB13
136
-    #define LCD_PINS_D6         PB14
137
-    #define LCD_PINS_D7         PB15
129
+    #define LCD_PINS_RS    PB8
130
+    #define LCD_PINS_ENABLE PD2ins
131
+    #define LCD_PINS_D4    PB12
132
+    #define LCD_PINS_D5    PB13
133
+    #define LCD_PINS_D6    PB14
134
+    #define LCD_PINS_D7    PB15
138 135
     #if DISABLED(NEWPANEL)
139
-      #define BEEPER_PIN        33
136
+      #define BEEPER_PIN   33
140 137
       // Buttons are attached to a shift register
141 138
       // Not wired yet
142
-      //#define SHIFT_CLK 38
143
-      //#define SHIFT_LD 42
144
-      //#define SHIFT_OUT 40
145
-      //#define SHIFT_EN 17
139
+      //#define SHIFT_CLK  38
140
+      //#define SHIFT_LD   42
141
+      //#define SHIFT_OUT  40
142
+      //#define SHIFT_EN   17
146 143
     #endif
147 144
   #endif
148 145
 
@@ -165,111 +162,111 @@
165 162
 
166 163
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
167 164
 
168
-      #define BTN_EN1           64
169
-      #define BTN_EN2           59
170
-      #define BTN_ENC           63
171
-      #define SD_DETECT_PIN     42
165
+      #define BTN_EN1      64
166
+      #define BTN_EN2      59
167
+      #define BTN_ENC      63
168
+      #define SD_DETECT_PIN 42
172 169
 
173 170
     #elif ENABLED(LCD_I2C_PANELOLU2)
174 171
 
175
-      #define BTN_EN1           47
176
-      #define BTN_EN2           43
177
-      #define BTN_ENC           32
178
-      #define LCD_SDSS          53
179
-      #define SD_DETECT_PIN     -1
180
-      #define KILL_PIN          41
172
+      #define BTN_EN1      47
173
+      #define BTN_EN2      43
174
+      #define BTN_ENC      32
175
+      #define LCD_SDSS     53
176
+      #define SD_DETECT_PIN -1
177
+      #define KILL_PIN     41
181 178
 
182 179
     #elif ENABLED(LCD_I2C_VIKI)
183 180
 
184
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
185
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
181
+      #define BTN_EN1      22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
182
+      #define BTN_EN2       7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
186 183
 
187
-      #define BTN_ENC           -1
188
-      #define LCD_SDSS          53
189
-      #define SD_DETECT_PIN     49
184
+      #define BTN_ENC      -1
185
+      #define LCD_SDSS     53
186
+      #define SD_DETECT_PIN 49
190 187
 
191 188
     #elif ANY(VIKI2, miniVIKI)
192 189
 
193
-      #define BEEPER_PIN        33
190
+      #define BEEPER_PIN   33
194 191
 
195 192
       // Pins for DOGM SPI LCD Support
196
-      #define DOGLCD_A0         44
197
-      #define DOGLCD_CS         45
193
+      #define DOGLCD_A0    44
194
+      #define DOGLCD_CS    45
198 195
       #define LCD_SCREEN_ROT_180
199 196
 
200
-      #define BTN_EN1           22
201
-      #define BTN_EN2            7
202
-      #define BTN_ENC           39
197
+      #define BTN_EN1      22
198
+      #define BTN_EN2       7
199
+      #define BTN_ENC      39
203 200
 
204
-      #define SDSS              53
205
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
201
+      #define SDSS         53
202
+      #define SD_DETECT_PIN -1   // Pin 49 for display sd interface, 72 for easy adapter board
206 203
 
207
-      #define KILL_PIN          31
204
+      #define KILL_PIN     31
208 205
 
209 206
       #define STAT_LED_RED_PIN  32
210 207
       #define STAT_LED_BLUE_PIN 35
211 208
 
212 209
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
213 210
 
214
-      #define BTN_EN1           35
215
-      #define BTN_EN2           37
216
-      #define BTN_ENC           31
217
-      #define SD_DETECT_PIN     49
218
-      #define LCD_SDSS          53
219
-      #define KILL_PIN          41
220
-      #define BEEPER_PIN        23
221
-      #define DOGLCD_CS         29
222
-      #define DOGLCD_A0         27
211
+      #define BTN_EN1      35
212
+      #define BTN_EN2      37
213
+      #define BTN_ENC      31
214
+      #define SD_DETECT_PIN 49
215
+      #define LCD_SDSS     53
216
+      #define KILL_PIN     41
217
+      #define BEEPER_PIN   23
218
+      #define DOGLCD_CS    29
219
+      #define DOGLCD_A0    27
223 220
       #define LCD_BACKLIGHT_PIN 33
224 221
 
225 222
     #elif ENABLED(MINIPANEL)
226 223
 
227
-      #define BEEPER_PIN        42
224
+      #define BEEPER_PIN   42
228 225
       // Pins for DOGM SPI LCD Support
229
-      #define DOGLCD_A0         44
230
-      #define DOGLCD_CS         66
226
+      #define DOGLCD_A0    44
227
+      #define DOGLCD_CS    66
231 228
       #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
232
-      #define SDSS              53
229
+      #define SDSS         53
233 230
 
234
-      #define KILL_PIN          64
231
+      #define KILL_PIN     64
235 232
       // GLCD features
236 233
       // Uncomment screen orientation
237 234
       //#define LCD_SCREEN_ROT_90
238 235
       //#define LCD_SCREEN_ROT_180
239 236
       //#define LCD_SCREEN_ROT_270
240 237
       // The encoder and click button
241
-      #define BTN_EN1           40
242
-      #define BTN_EN2           63
243
-      #define BTN_ENC           59
238
+      #define BTN_EN1      40
239
+      #define BTN_EN2      63
240
+      #define BTN_ENC      59
244 241
       // not connected to a pin
245
-      #define SD_DETECT_PIN     49
242
+      #define SD_DETECT_PIN 49
246 243
 
247 244
     #else
248 245
 
249 246
       // Beeper on AUX-4
250
-      #define BEEPER_PIN        33
247
+      #define BEEPER_PIN   33
251 248
 
252 249
       // buttons are directly attached to AUX-2
253 250
       #if ENABLED(REPRAPWORLD_KEYPAD)
254
-        #define BTN_EN1         64
255
-        #define BTN_EN2         59
256
-        #define BTN_ENC         63
257
-        #define SHIFT_OUT       40
258
-        #define SHIFT_CLK       44
259
-        #define SHIFT_LD        42
251
+        #define BTN_EN1    64
252
+        #define BTN_EN2    59
253
+        #define BTN_ENC    63
254
+        #define SHIFT_OUT  40
255
+        #define SHIFT_CLK  44
256
+        #define SHIFT_LD   42
260 257
       #elif ENABLED(PANEL_ONE)
261
-        #define BTN_EN1         59   // AUX2 PIN 3
262
-        #define BTN_EN2         63   // AUX2 PIN 4
263
-        #define BTN_ENC         49   // AUX3 PIN 7
258
+        #define BTN_EN1    59   // AUX2 PIN 3
259
+        #define BTN_EN2    63   // AUX2 PIN 4
260
+        #define BTN_ENC    49   // AUX3 PIN 7
264 261
       #else
265
-        #define BTN_EN1         37
266
-        #define BTN_EN2         35
267
-        #define BTN_ENC         31
262
+        #define BTN_EN1    37
263
+        #define BTN_EN2    35
264
+        #define BTN_ENC    31
268 265
       #endif
269 266
 
270 267
       #if ENABLED(G3D_PANEL)
271
-        #define SD_DETECT_PIN   49
272
-        #define KILL_PIN        41
268
+        #define SD_DETECT_PIN 49
269
+        #define KILL_PIN   41
273 270
       #else
274 271
         //#define SD_DETECT_PIN -1   // Ramps doesn't use this
275 272
       #endif

Loading…
Cancel
Save