Browse Source

32 bit boards classification cleanup (#10818)

- Ordering and match classification between `boards.h` and `pins.h`
- Check `pins.h` environments
Axel 7 years ago
parent
commit
bbd09a99f1
2 changed files with 44 additions and 23 deletions
  1. 4
    0
      Marlin/src/core/boards.h
  2. 40
    23
      Marlin/src/pins/pins.h

+ 4
- 0
Marlin/src/core/boards.h View File

176
 //
176
 //
177
 // SAM3X8E ARM Cortex M3
177
 // SAM3X8E ARM Cortex M3
178
 //
178
 //
179
+
179
 #define BOARD_DUE3DOM          1411   // DUE3DOM for Arduino DUE
180
 #define BOARD_DUE3DOM          1411   // DUE3DOM for Arduino DUE
180
 #define BOARD_DUE3DOM_MINI     1412   // DUE3DOM MINI for Arduino DUE
181
 #define BOARD_DUE3DOM_MINI     1412   // DUE3DOM MINI for Arduino DUE
181
 #define BOARD_RADDS            1502   // RADDS
182
 #define BOARD_RADDS            1502   // RADDS
204
 //
205
 //
205
 // STM32 ARM Cortex-M3
206
 // STM32 ARM Cortex-M3
206
 //
207
 //
208
+
207
 #define BOARD_STM32F1R         1800   // STM3R Libmaple based STM32F1 controller
209
 #define BOARD_STM32F1R         1800   // STM3R Libmaple based STM32F1 controller
208
 #define BOARD_MALYAN_M200      1801   // STM32C8T6 Libmaple based stm32f1 controller
210
 #define BOARD_MALYAN_M200      1801   // STM32C8T6 Libmaple based stm32f1 controller
209
 #define BOARD_STM3R_MINI       1803   // STM32 Libmaple based stm32f1 controller
211
 #define BOARD_STM3R_MINI       1803   // STM32 Libmaple based stm32f1 controller
211
 //
213
 //
212
 // STM32 ARM Cortex-M4F
214
 // STM32 ARM Cortex-M4F
213
 //
215
 //
216
+
214
 #define BOARD_TEENSY35_36       841   // Teensy3.5 and Teensy3.6
217
 #define BOARD_TEENSY35_36       841   // Teensy3.5 and Teensy3.6
215
 #define BOARD_BEAST            1802   // STM32FxxxVxT6 Libmaple based stm32f4 controller
218
 #define BOARD_BEAST            1802   // STM32FxxxVxT6 Libmaple based stm32f4 controller
216
 #define BOARD_STM32F4          1804   // STM32 STM32GENERIC based STM32F4 controller
219
 #define BOARD_STM32F4          1804   // STM32 STM32GENERIC based STM32F4 controller
218
 //
221
 //
219
 // ARM Cortex M7
222
 // ARM Cortex M7
220
 //
223
 //
224
+
221
 #define BOARD_THE_BORG         1860   // THE-BORG (Power outputs: Hotend0, Hotend1, Bed, Fan)
225
 #define BOARD_THE_BORG         1860   // THE-BORG (Power outputs: Hotend0, Hotend1, Bed, Fan)
222
 
226
 
223
 
227
 

+ 40
- 23
Marlin/src/pins/pins.h View File

269
   #include "pins_5DPRINT.h"           // AT90USB1286                                ?env:at90USB1286_DFU
269
   #include "pins_5DPRINT.h"           // AT90USB1286                                ?env:at90USB1286_DFU
270
 
270
 
271
 //
271
 //
272
-// Re-ARM - LPC1768
272
+// LPC1768 ARM Cortex M3
273
 //
273
 //
274
 
274
 
275
 #elif MB(RAMPS_14_RE_ARM_EFB)
275
 #elif MB(RAMPS_14_RE_ARM_EFB)
282
   #include "pins_RAMPS_RE_ARM.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
282
   #include "pins_RAMPS_RE_ARM.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
283
 #elif MB(RAMPS_14_RE_ARM_SF)
283
 #elif MB(RAMPS_14_RE_ARM_SF)
284
   #include "pins_RAMPS_RE_ARM.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
284
   #include "pins_RAMPS_RE_ARM.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
285
-
285
+#elif MB(MKS_SBASE)
286
+  #include "pins_MKS_SBASE.h"         // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
287
+#elif MB(AZSMZ_MINI)
288
+  #include "pins_AZSMZ_MINI.h"        // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
289
+#elif MB(AZTEEG_X5_GT)
290
+  #include "pins_AZTEEG_X5_GT.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
291
+#elif MB(BIQU_BQ111_A4)
292
+  #include "pins_BIQU_BQ111_A4.h"     // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
293
+#elif MB(SELENA_COMPACT)
294
+  #include "pins_SELENA_COMPACT.h"    // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
295
+#elif MB(COHESION3D_REMIX)
296
+  #include "pins_COHESION3D_REMIX.h"  // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
297
+#elif MB(COHESION3D_MINI)
298
+  #include "pins_COHESION3D_MINI.h"   // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
299
+  
300
+  
286
 //
301
 //
287
 // Other 32-bit Boards
302
 // Other 32-bit Boards
288
 //
303
 //
289
 
304
 
290
-#elif MB(TEENSY35_36)
291
-  #include "pins_TEENSY35_36.h"       // TEENSY35_36                                env:teensy35
292
 #elif MB(DUE3DOM)
305
 #elif MB(DUE3DOM)
293
   #include "pins_DUE3DOM.h"           // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
306
   #include "pins_DUE3DOM.h"           // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
294
 #elif MB(DUE3DOM_MINI)
307
 #elif MB(DUE3DOM_MINI)
337
   #include "pins_ARCHIM2.h"           // SAM3X8E                                    env:DUE env:DUE_debug
350
   #include "pins_ARCHIM2.h"           // SAM3X8E                                    env:DUE env:DUE_debug
338
 #elif MB(ALLIGATOR)
351
 #elif MB(ALLIGATOR)
339
   #include "pins_ALLIGATOR_R2.h"      // SAM3X8E                                    env:DUE env:DUE_debug
352
   #include "pins_ALLIGATOR_R2.h"      // SAM3X8E                                    env:DUE env:DUE_debug
353
+
354
+//
355
+// STM32 ARM Cortex-M3
356
+//  
357
+  
340
 #elif MB(STM32F1R)
358
 #elif MB(STM32F1R)
341
   #include "pins_STM32F1R.h"          // STM32F1                                    env:STM32F1
359
   #include "pins_STM32F1R.h"          // STM32F1                                    env:STM32F1
342
 #elif MB(STM3R_MINI)
360
 #elif MB(STM3R_MINI)
343
   #include "pins_STM3R_MINI.h"        // STM32F1                                    env:STM32F1
361
   #include "pins_STM3R_MINI.h"        // STM32F1                                    env:STM32F1
344
 #elif MB(MALYAN_M200)
362
 #elif MB(MALYAN_M200)
345
   #include "pins_MALYAN_M200.h"       // STM32F1                                    env:malyanm200
363
   #include "pins_MALYAN_M200.h"       // STM32F1                                    env:malyanm200
346
-#elif MB(BEAST)
347
-  #include "pins_BEAST.h"             // STM32F4                                    env:STM32F1
348
 #elif MB(CHITU3D)
364
 #elif MB(CHITU3D)
349
   #include "pins_CHITU3D.h"           // STM32F1                                    env:STM32F1
365
   #include "pins_CHITU3D.h"           // STM32F1                                    env:STM32F1
350
-#elif MB(MKS_SBASE)
351
-  #include "pins_MKS_SBASE.h"         // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
352
-#elif MB(AZSMZ_MINI)
353
-  #include "pins_AZSMZ_MINI.h"        // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
354
-#elif MB(AZTEEG_X5_GT)
355
-  #include "pins_AZTEEG_X5_GT.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
356
-#elif MB(BIQU_BQ111_A4)
357
-  #include "pins_BIQU_BQ111_A4.h"     // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
358
-#elif MB(THE_BORG)
359
-  #include "pins_THE_BORG.h"          // STM32F7                                    env:STM32F1
360
-#elif MB(SELENA_COMPACT)
361
-  #include "pins_SELENA_COMPACT.h"    // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
362
-#elif MB(COHESION3D_REMIX)
363
-  #include "pins_COHESION3D_REMIX.h"  // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
364
-#elif MB(COHESION3D_MINI)
365
-  #include "pins_COHESION3D_MINI.h"   // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
366
+  
367
+//
368
+// STM32 ARM Cortex-M4F
369
+//  
370
+
371
+#elif MB(TEENSY35_36)
372
+  #include "pins_TEENSY35_36.h"       // TEENSY35_36                                env:teensy35  
373
+#elif MB(BEAST)
374
+  #include "pins_BEAST.h"             // STM32F4                                    env:STM32F4
366
 #elif MB(STM32F4)
375
 #elif MB(STM32F4)
367
-  #include "pins_STM32F4.h"           // STM32F4                                    env:STM32F1
376
+  #include "pins_STM32F4.h"           // STM32F4                                    env:STM32F4
377
+
378
+//
379
+// ARM Cortex M7
380
+//  
381
+  
382
+#elif MB(THE_BORG)
383
+  #include "pins_THE_BORG.h"          // STM32F7                                    env:STM32F7  
384
+  
368
 #else
385
 #else
369
   #error "Unknown MOTHERBOARD value set in Configuration.h"
386
   #error "Unknown MOTHERBOARD value set in Configuration.h"
370
 #endif
387
 #endif

Loading…
Cancel
Save