Browse Source

🎨 Misc. boards/pins cleanup

Scott Lahteine 2 years ago
parent
commit
26f5c32872
3 changed files with 24 additions and 31 deletions
  1. 19
    19
      Marlin/src/core/boards.h
  2. 4
    4
      Marlin/src/pins/pins.h
  3. 1
    8
      Marlin/src/pins/sam/pins_RURAMPS4D_11.h

+ 19
- 19
Marlin/src/core/boards.h View File

@@ -228,33 +228,33 @@
228 228
 #define BOARD_RAMPS_14_RE_ARM_EFF     2002  // Re-ARM with RAMPS 1.4 (Power outputs: Hotend, Fan0, Fan1)
229 229
 #define BOARD_RAMPS_14_RE_ARM_EEF     2003  // Re-ARM with RAMPS 1.4 (Power outputs: Hotend0, Hotend1, Fan)
230 230
 #define BOARD_RAMPS_14_RE_ARM_SF      2004  // Re-ARM with RAMPS 1.4 (Power outputs: Spindle, Controller Fan)
231
-#define BOARD_MKS_SBASE               2005  // MKS-Sbase (Power outputs: Hotend0, Hotend1, Bed, Fan)
231
+#define BOARD_MKS_SBASE               2005  // MKS-Sbase
232 232
 #define BOARD_AZSMZ_MINI              2006  // AZSMZ Mini
233
-#define BOARD_BIQU_BQ111_A4           2007  // BIQU BQ111-A4 (Power outputs: Hotend, Fan, Bed)
234
-#define BOARD_SELENA_COMPACT          2008  // Selena Compact (Power outputs: Hotend0, Hotend1, Bed0, Bed1, Fan0, Fan1)
235
-#define BOARD_BIQU_B300_V1_0          2009  // BIQU B300_V1.0 (Power outputs: Hotend0, Fan, Bed, SPI Driver)
236
-#define BOARD_MKS_SGEN_L              2010  // MKS-SGen-L (Power outputs: Hotend0, Hotend1, Bed, Fan)
233
+#define BOARD_BIQU_BQ111_A4           2007  // BIQU BQ111-A4
234
+#define BOARD_SELENA_COMPACT          2008  // Selena Compact
235
+#define BOARD_BIQU_B300_V1_0          2009  // BIQU B300_V1.0
236
+#define BOARD_MKS_SGEN_L              2010  // MKS-SGen-L
237 237
 #define BOARD_GMARSH_X6_REV1          2011  // GMARSH X6, revision 1 prototype
238
-#define BOARD_BTT_SKR_V1_1            2012  // BigTreeTech SKR v1.1 (Power outputs: Hotend0, Hotend1, Fan, Bed)
239
-#define BOARD_BTT_SKR_V1_3            2013  // BigTreeTech SKR v1.3 (Power outputs: Hotend0, Hotend1, Fan, Bed)
240
-#define BOARD_BTT_SKR_V1_4            2014  // BigTreeTech SKR v1.4 (Power outputs: Hotend0, Hotend1, Fan, Bed)
238
+#define BOARD_BTT_SKR_V1_1            2012  // BigTreeTech SKR v1.1
239
+#define BOARD_BTT_SKR_V1_3            2013  // BigTreeTech SKR v1.3
240
+#define BOARD_BTT_SKR_V1_4            2014  // BigTreeTech SKR v1.4
241 241
 
242 242
 //
243 243
 // LPC1769 ARM Cortex M3
244 244
 //
245 245
 
246
-#define BOARD_MKS_SGEN                2500  // MKS-SGen (Power outputs: Hotend0, Hotend1, Bed, Fan)
247
-#define BOARD_AZTEEG_X5_GT            2501  // Azteeg X5 GT (Power outputs: Hotend0, Hotend1, Bed, Fan)
248
-#define BOARD_AZTEEG_X5_MINI          2502  // Azteeg X5 Mini (Power outputs: Hotend0, Bed, Fan)
249
-#define BOARD_AZTEEG_X5_MINI_WIFI     2503  // Azteeg X5 Mini Wifi (Power outputs: Hotend0, Bed, Fan)
246
+#define BOARD_MKS_SGEN                2500  // MKS-SGen
247
+#define BOARD_AZTEEG_X5_GT            2501  // Azteeg X5 GT
248
+#define BOARD_AZTEEG_X5_MINI          2502  // Azteeg X5 Mini
249
+#define BOARD_AZTEEG_X5_MINI_WIFI     2503  // Azteeg X5 Mini Wifi
250 250
 #define BOARD_COHESION3D_REMIX        2504  // Cohesion3D ReMix
251 251
 #define BOARD_COHESION3D_MINI         2505  // Cohesion3D Mini
252 252
 #define BOARD_SMOOTHIEBOARD           2506  // Smoothieboard
253 253
 #define BOARD_TH3D_EZBOARD            2507  // TH3D EZBoard v1.0
254
-#define BOARD_BTT_SKR_V1_4_TURBO      2508  // BigTreeTech SKR v1.4 TURBO (Power outputs: Hotend0, Hotend1, Fan, Bed)
255
-#define BOARD_MKS_SGEN_L_V2           2509  // MKS SGEN_L V2 (Power outputs: Hotend0, Hotend1, Bed, Fan)
256
-#define BOARD_BTT_SKR_E3_TURBO        2510  // BigTreeTech SKR E3 Turbo (Power outputs: Hotend0, Hotend1, Bed, Fan0, Fan1)
257
-#define BOARD_FLY_CDY                 2511  // FLYmaker FLY CDY (Power outputs: Hotend0, Hotend1, Hotend2, Bed, Fan0, Fan1, Fan2)
254
+#define BOARD_BTT_SKR_V1_4_TURBO      2508  // BigTreeTech SKR v1.4 TURBO
255
+#define BOARD_MKS_SGEN_L_V2           2509  // MKS SGEN_L V2
256
+#define BOARD_BTT_SKR_E3_TURBO        2510  // BigTreeTech SKR E3 Turbo
257
+#define BOARD_FLY_CDY                 2511  // FLYmaker FLY CDY
258 258
 
259 259
 //
260 260
 // SAM3X8E ARM Cortex M3
@@ -280,8 +280,8 @@
280 280
 #define BOARD_RAMPS4DUE_EFF           3017  // RAMPS4DUE (Power outputs: Hotend, Fan0, Fan1)
281 281
 #define BOARD_RAMPS4DUE_EEF           3018  // RAMPS4DUE (Power outputs: Hotend0, Hotend1, Fan)
282 282
 #define BOARD_RAMPS4DUE_SF            3019  // RAMPS4DUE (Power outputs: Spindle, Controller Fan)
283
-#define BOARD_RURAMPS4D_11            3020  // RuRAMPS4Duo v1.1 (Power outputs: Hotend0, Hotend1, Hotend2, Fan0, Fan1, Bed)
284
-#define BOARD_RURAMPS4D_13            3021  // RuRAMPS4Duo v1.3 (Power outputs: Hotend0, Hotend1, Hotend2, Fan0, Fan1, Bed)
283
+#define BOARD_RURAMPS4D_11            3020  // RuRAMPS4Duo v1.1
284
+#define BOARD_RURAMPS4D_13            3021  // RuRAMPS4Duo v1.3
285 285
 #define BOARD_ULTRATRONICS_PRO        3022  // ReprapWorld Ultratronics Pro V1.0
286 286
 #define BOARD_ARCHIM1                 3023  // UltiMachine Archim1 (with DRV8825 drivers)
287 287
 #define BOARD_ARCHIM2                 3024  // UltiMachine Archim2 (with TMC2130 drivers)
@@ -293,7 +293,7 @@
293 293
 // SAM3X8C ARM Cortex M3
294 294
 //
295 295
 
296
-#define BOARD_PRINTRBOARD_G2          3100  // PRINTRBOARD G2
296
+#define BOARD_PRINTRBOARD_G2          3100  // Printrboard G2
297 297
 #define BOARD_ADSK                    3101  // Arduino DUE Shield Kit (ADSK)
298 298
 
299 299
 //

+ 4
- 4
Marlin/src/pins/pins.h View File

@@ -464,14 +464,14 @@
464 464
   #include "sam/pins_ARCHIM2.h"                 // SAM3X8E                                env:DUE_archim env:DUE_archim_debug
465 465
 #elif MB(ALLIGATOR)
466 466
   #include "sam/pins_ALLIGATOR_R2.h"            // SAM3X8E                                env:DUE env:DUE_debug
467
-#elif MB(ADSK)
468
-  #include "sam/pins_ADSK.h"                    // SAM3X8E                                env:DUE env:DUE_debug
469
-#elif MB(PRINTRBOARD_G2)
470
-  #include "sam/pins_PRINTRBOARD_G2.h"          // SAM3X8C                                env:DUE_USB
471 467
 #elif MB(CNCONTROLS_15D)
472 468
   #include "sam/pins_CNCONTROLS_15D.h"          // SAM3X8E                                env:DUE env:DUE_USB
473 469
 #elif MB(KRATOS32)
474 470
   #include "sam/pins_KRATOS32.h"                // SAM3X8E                                env:DUE env:DUE_USB
471
+#elif MB(PRINTRBOARD_G2)
472
+  #include "sam/pins_PRINTRBOARD_G2.h"          // SAM3X8C                                env:DUE_USB
473
+#elif MB(ADSK)
474
+  #include "sam/pins_ADSK.h"                    // SAM3X8C                                env:DUE env:DUE_debug
475 475
 
476 476
 //
477 477
 // STM32 ARM Cortex-M0

+ 1
- 8
Marlin/src/pins/sam/pins_RURAMPS4D_11.h View File

@@ -18,19 +18,12 @@
18 18
  * You should have received a copy of the GNU General Public License
19 19
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20 20
  *
21
- * Ported sys0724 & Vynt
22 21
  */
23 22
 #pragma once
24 23
 
25 24
 /**
26 25
  * Arduino Mega? or Due with RuRAMPS4DUE pin assignments
27
- *
28
- * Applies to the following boards:
29
- *  RURAMPS4DUE      (Hotend0, Hotend1, Hotend2, Fan0, Fan1, Bed)
30
- *
31
- *  Differences between
32
- *     RADDS | RuRAMPS4DUE
33
- *           |
26
+ * Ported by sys0724 & Vynt
34 27
  */
35 28
 
36 29
 #include "env_validate.h"

Loading…
Cancel
Save