Explorar el Código

Consolidate common pin includes

Scott Lahteine hace 3 años
padre
commit
a1f319d5b6
Se han modificado 1 ficheros con 10 adiciones y 74 borrados
  1. 10
    74
      Marlin/src/pins/pins.h

+ 10
- 74
Marlin/src/pins/pins.h Ver fichero

@@ -71,35 +71,11 @@
71 71
 
72 72
 #if MB(RAMPS_OLD)
73 73
   #include "ramps/pins_RAMPS_OLD.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
74
-#elif MB(RAMPS_13_EFB)
74
+#elif MB(RAMPS_13_EFB, RAMPS_13_EEB, RAMPS_13_EFF, RAMPS_13_EEF, RAMPS_13_SF)
75 75
   #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
76
-#elif MB(RAMPS_13_EEB)
77
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
78
-#elif MB(RAMPS_13_EFF)
79
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
80
-#elif MB(RAMPS_13_EEF)
81
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
82
-#elif MB(RAMPS_13_SF)
83
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
84
-#elif MB(RAMPS_14_EFB)
85
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
86
-#elif MB(RAMPS_14_EEB)
87
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
88
-#elif MB(RAMPS_14_EFF)
89
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
90
-#elif MB(RAMPS_14_EEF)
91
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
92
-#elif MB(RAMPS_14_SF)
76
+#elif MB(RAMPS_14_EFB, RAMPS_14_EEB, RAMPS_14_EFF, RAMPS_14_EEF, RAMPS_14_SF)
93 77
   #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
94
-#elif MB(RAMPS_PLUS_EFB)
95
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
96
-#elif MB(RAMPS_PLUS_EEB)
97
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
98
-#elif MB(RAMPS_PLUS_EFF)
99
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
100
-#elif MB(RAMPS_PLUS_EEF)
101
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
102
-#elif MB(RAMPS_PLUS_SF)
78
+#elif MB(RAMPS_PLUS_EFB, RAMPS_PLUS_EEB, RAMPS_PLUS_EFF, RAMPS_PLUS_EEF, RAMPS_PLUS_SF)
103 79
   #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
104 80
 
105 81
 //
@@ -178,9 +154,7 @@
178 154
   #include "ramps/pins_MAKEBOARD_MINI.h"        // ATmega2560                             env:mega2560
179 155
 #elif MB(TRIGORILLA_13)
180 156
   #include "ramps/pins_TRIGORILLA_13.h"         // ATmega2560                             env:mega2560
181
-#elif MB(TRIGORILLA_14)
182
-  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560
183
-#elif MB(TRIGORILLA_14_11)
157
+#elif MB(TRIGORILLA_14, TRIGORILLA_14_11)
184 158
   #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560
185 159
 #elif MB(RAMPS_ENDER_4)
186 160
   #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:mega2560
@@ -214,11 +188,7 @@
214 188
   #include "ramps/pins_TENLOG_D3_HERO.h"        // ATmega2560                             env:mega2560
215 189
 #elif MB(MKS_GEN_L_V21)
216 190
   #include "ramps/pins_MKS_GEN_L_V21.h"         // ATmega2560                             env:mega2560
217
-#elif MB(RAMPS_S_12_EEFB)
218
-  #include "ramps/pins_RAMPS_S_12.h"            // ATmega2560                             env:mega2560
219
-#elif MB(RAMPS_S_12_EEEB)
220
-  #include "ramps/pins_RAMPS_S_12.h"            // ATmega2560                             env:mega2560
221
-#elif MB(RAMPS_S_12_EFFB)
191
+#elif MB(RAMPS_S_12_EEFB, RAMPS_S_12_EEEB, RAMPS_S_12_EFFB)
222 192
   #include "ramps/pins_RAMPS_S_12.h"            // ATmega2560                             env:mega2560
223 193
 #elif MB(RAMPS_LONGER3D_LKPRO)
224 194
   #include "ramps/pins_LONGER3D_LK4PRO.h"       // ATmega2560                             env:mega2560
@@ -383,15 +353,7 @@
383 353
 // LPC1768 ARM Cortex M3
384 354
 //
385 355
 
386
-#elif MB(RAMPS_14_RE_ARM_EFB)
387
-  #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
388
-#elif MB(RAMPS_14_RE_ARM_EEB)
389
-  #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
390
-#elif MB(RAMPS_14_RE_ARM_EFF)
391
-  #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
392
-#elif MB(RAMPS_14_RE_ARM_EEF)
393
-  #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
394
-#elif MB(RAMPS_14_RE_ARM_SF)
356
+#elif MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
395 357
   #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
396 358
 #elif MB(MKS_SBASE)
397 359
   #include "lpc1768/pins_MKS_SBASE.h"           // LPC1768                                env:LPC1768
@@ -461,35 +423,11 @@
461 423
   #include "sam/pins_RAMPS_FD_V1.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
462 424
 #elif MB(RAMPS_FD_V2)
463 425
   #include "sam/pins_RAMPS_FD_V2.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
464
-#elif MB(RAMPS_SMART_EFB)
465
-  #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
466
-#elif MB(RAMPS_SMART_EEB)
426
+#elif MB(RAMPS_SMART_EFB, RAMPS_SMART_EEB, RAMPS_SMART_EFF, RAMPS_SMART_EEF, RAMPS_SMART_SF)
467 427
   #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
468
-#elif MB(RAMPS_SMART_EFF)
469
-  #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
470
-#elif MB(RAMPS_SMART_EEF)
471
-  #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
472
-#elif MB(RAMPS_SMART_SF)
473
-  #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
474
-#elif MB(RAMPS_DUO_EFB)
475
-  #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
476
-#elif MB(RAMPS_DUO_EEB)
428
+#elif MB(RAMPS_DUO_EFB, RAMPS_DUO_EEB, RAMPS_DUO_EFF, RAMPS_DUO_EEF, RAMPS_DUO_SF)
477 429
   #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
478
-#elif MB(RAMPS_DUO_EFF)
479
-  #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
480
-#elif MB(RAMPS_DUO_EEF)
481
-  #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
482
-#elif MB(RAMPS_DUO_SF)
483
-  #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
484
-#elif MB(RAMPS4DUE_EFB)
485
-  #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
486
-#elif MB(RAMPS4DUE_EEB)
487
-  #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
488
-#elif MB(RAMPS4DUE_EFF)
489
-  #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
490
-#elif MB(RAMPS4DUE_EEF)
491
-  #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
492
-#elif MB(RAMPS4DUE_SF)
430
+#elif MB(RAMPS4DUE_EFB, RAMPS4DUE_EEB, RAMPS4DUE_EFF, RAMPS4DUE_EEF, RAMPS4DUE_SF)
493 431
   #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
494 432
 #elif MB(ULTRATRONICS_PRO)
495 433
   #include "sam/pins_ULTRATRONICS_PRO.h"        // SAM3X8E                                env:DUE env:DUE_debug
@@ -616,9 +554,7 @@
616 554
 
617 555
 #elif MB(ARMED)
618 556
   #include "stm32f4/pins_ARMED.h"               // STM32F4                                env:ARMED
619
-#elif MB(RUMBA32_V1_0)
620
-  #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32
621
-#elif MB(RUMBA32_V1_1)
557
+#elif MB(RUMBA32_V1_0, RUMBA32_V1_1)
622 558
   #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32
623 559
 #elif MB(RUMBA32_MKS)
624 560
   #include "stm32f4/pins_RUMBA32_MKS.h"         // STM32F4                                env:rumba32

Loading…
Cancelar
Guardar