Move pins files to subfolders #14573

.circleci/config.yml

@@ -54,10 +54,9 @@ jobs:
             generate_version ./Marlin/src/inc
             cat ./Marlin/src/inc/_Version.h
             #
-            # Backup pins_RAMPS.h
-            #
-            cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
+            # Back up pins_RAMPS.h
             #
+            backup_ramps
 
             env_backup
 

Marlin/Makefile

@@ -249,67 +249,72 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1140)
 else ifeq ($(HARDWARE_MOTHERBOARD),1141)
 
 #
+# RAMBo and derivatives
+#
+
+# Rambo
+else ifeq ($(HARDWARE_MOTHERBOARD),1200)
+# Mini-Rambo
+else ifeq ($(HARDWARE_MOTHERBOARD),1201)
+# Mini-Rambo 1.0a
+else ifeq ($(HARDWARE_MOTHERBOARD),1202)
+# Einsy Rambo
+else ifeq ($(HARDWARE_MOTHERBOARD),1203)
+# Einsy Retro
+else ifeq ($(HARDWARE_MOTHERBOARD),1204)
+# abee Scoovo X9H
+else ifeq ($(HARDWARE_MOTHERBOARD),1205)
+
+#
 # Other ATmega1280, ATmega2560
 #
 
 # Cartesio CN Controls V11
-else ifeq ($(HARDWARE_MOTHERBOARD),1200)
+else ifeq ($(HARDWARE_MOTHERBOARD),1300)
 # Cartesio CN Controls V12
-else ifeq ($(HARDWARE_MOTHERBOARD),1201)
+else ifeq ($(HARDWARE_MOTHERBOARD),1301)
 # Cheaptronic v1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1202)
+else ifeq ($(HARDWARE_MOTHERBOARD),1302)
 # Cheaptronic v2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1203)
+else ifeq ($(HARDWARE_MOTHERBOARD),1303)
 # Makerbot Mightyboard Revision E
-else ifeq ($(HARDWARE_MOTHERBOARD),1204)
+else ifeq ($(HARDWARE_MOTHERBOARD),1304)
 # Megatronics
-else ifeq ($(HARDWARE_MOTHERBOARD),1205)
+else ifeq ($(HARDWARE_MOTHERBOARD),1305)
 # Megatronics v2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1206)
+else ifeq ($(HARDWARE_MOTHERBOARD),1306)
 # Megatronics v3.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1207)
+else ifeq ($(HARDWARE_MOTHERBOARD),1307)
 # Megatronics v3.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1208)
+else ifeq ($(HARDWARE_MOTHERBOARD),1308)
 # Megatronics v3.2
-else ifeq ($(HARDWARE_MOTHERBOARD),1209)
-# Rambo
-else ifeq ($(HARDWARE_MOTHERBOARD),1210)
-# Mini-Rambo
-else ifeq ($(HARDWARE_MOTHERBOARD),1211)
-# Mini-Rambo 1.0a
-else ifeq ($(HARDWARE_MOTHERBOARD),1212)
-# Einsy Rambo
-else ifeq ($(HARDWARE_MOTHERBOARD),1213)
-# Einsy Retro
-else ifeq ($(HARDWARE_MOTHERBOARD),1214)
+else ifeq ($(HARDWARE_MOTHERBOARD),1309)
 # Elefu Ra Board (v3)
-else ifeq ($(HARDWARE_MOTHERBOARD),1215)
+else ifeq ($(HARDWARE_MOTHERBOARD),1310)
 # Leapfrog
-else ifeq ($(HARDWARE_MOTHERBOARD),1216)
+else ifeq ($(HARDWARE_MOTHERBOARD),1311)
 # Mega controller
-else ifeq ($(HARDWARE_MOTHERBOARD),1217)
-# abee Scoovo X9H
-else ifeq ($(HARDWARE_MOTHERBOARD),1218)
+else ifeq ($(HARDWARE_MOTHERBOARD),1312)
 # Geeetech GT2560 Rev B for Mecreator2
-else ifeq ($(HARDWARE_MOTHERBOARD),1219)
+else ifeq ($(HARDWARE_MOTHERBOARD),1313)
 # Geeetech GT2560 Rev. A
-else ifeq ($(HARDWARE_MOTHERBOARD),1220)
+else ifeq ($(HARDWARE_MOTHERBOARD),1314)
 # Geeetech GT2560 Rev. A+ (with auto level probe)
-else ifeq ($(HARDWARE_MOTHERBOARD),1221)
+else ifeq ($(HARDWARE_MOTHERBOARD),1315)
 # Geeetech GT2560 Rev B for A10(M/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1222)
+else ifeq ($(HARDWARE_MOTHERBOARD),1316)
 # Geeetech GT2560 Rev B for A20(M/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1223)
+else ifeq ($(HARDWARE_MOTHERBOARD),1317)
 # Einstart retrofit
-else ifeq ($(HARDWARE_MOTHERBOARD),1224)
+else ifeq ($(HARDWARE_MOTHERBOARD),1318)
 
 #
 # ATmega1281, ATmega2561
 #
 
-else ifeq ($(HARDWARE_MOTHERBOARD),1300)
+else ifeq ($(HARDWARE_MOTHERBOARD),1400)
   MCU              ?= atmega1281
-else ifeq ($(HARDWARE_MOTHERBOARD),1310)
+else ifeq ($(HARDWARE_MOTHERBOARD),1410)
   MCU              ?= atmega1281
 
 #
@@ -317,43 +322,43 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1310)
 #
 
 # Sanguinololu < 1.2
-else ifeq ($(HARDWARE_MOTHERBOARD),1400)
+else ifeq ($(HARDWARE_MOTHERBOARD),1500)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
 # Sanguinololu 1.2 and above
-else ifeq ($(HARDWARE_MOTHERBOARD),1401)
+else ifeq ($(HARDWARE_MOTHERBOARD),1501)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
 # Melzi
-else ifeq ($(HARDWARE_MOTHERBOARD),1402)
+else ifeq ($(HARDWARE_MOTHERBOARD),1502)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
 # Melzi with ATmega1284 (MaKr3d version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1403)
+else ifeq ($(HARDWARE_MOTHERBOARD),1503)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
 # Melzi Creality3D board (for CR-10 etc)
-else ifeq ($(HARDWARE_MOTHERBOARD),1404)
+else ifeq ($(HARDWARE_MOTHERBOARD),1504)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
 # Melzi Malyan M150 board
-else ifeq ($(HARDWARE_MOTHERBOARD),1405)
+else ifeq ($(HARDWARE_MOTHERBOARD),1505)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
 # Tronxy X5S
-else ifeq ($(HARDWARE_MOTHERBOARD),1406)
+else ifeq ($(HARDWARE_MOTHERBOARD),1506)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
 # STB V1.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1407)
+else ifeq ($(HARDWARE_MOTHERBOARD),1507)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
 # Azteeg X1
-else ifeq ($(HARDWARE_MOTHERBOARD),1408)
+else ifeq ($(HARDWARE_MOTHERBOARD),1508)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
 # Anet 1.0 (Melzi clone)
-else ifeq ($(HARDWARE_MOTHERBOARD),1409)
+else ifeq ($(HARDWARE_MOTHERBOARD),1509)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
 
@@ -362,51 +367,51 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1409)
 #
 
 # Gen3 Monolithic Electronics
-else ifeq ($(HARDWARE_MOTHERBOARD),1500)
+else ifeq ($(HARDWARE_MOTHERBOARD),1600)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
 # Gen3+
-else ifeq ($(HARDWARE_MOTHERBOARD),1501)
+else ifeq ($(HARDWARE_MOTHERBOARD),1601)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
 # Gen6
-else ifeq ($(HARDWARE_MOTHERBOARD),1502)
+else ifeq ($(HARDWARE_MOTHERBOARD),1602)
   HARDWARE_VARIANT ?= Gen6
   MCU              ?= atmega644p
 # Gen6 deluxe
-else ifeq ($(HARDWARE_MOTHERBOARD),1503)
+else ifeq ($(HARDWARE_MOTHERBOARD),1603)
   HARDWARE_VARIANT ?= Gen6
   MCU              ?= atmega644p
 # Gen7 custom (Alfons3 Version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1504)
+else ifeq ($(HARDWARE_MOTHERBOARD),1604)
   HARDWARE_VARIANT ?= Gen7
   MCU              ?= atmega644
   F_CPU            ?= 20000000
 # Gen7 v1.1, v1.2
-else ifeq ($(HARDWARE_MOTHERBOARD),1505)
+else ifeq ($(HARDWARE_MOTHERBOARD),1605)
   HARDWARE_VARIANT ?= Gen7
   MCU              ?= atmega644p
   F_CPU            ?= 20000000
 # Gen7 v1.3
-else ifeq ($(HARDWARE_MOTHERBOARD),1506)
+else ifeq ($(HARDWARE_MOTHERBOARD),1606)
   HARDWARE_VARIANT ?= Gen7
   MCU              ?= atmega644p
   F_CPU            ?= 20000000
 # Gen7 v1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1507)
+else ifeq ($(HARDWARE_MOTHERBOARD),1607)
   HARDWARE_VARIANT ?= Gen7
   MCU              ?= atmega1284p
   F_CPU            ?= 20000000
 # Alpha OMCA board
-else ifeq ($(HARDWARE_MOTHERBOARD),1508)
+else ifeq ($(HARDWARE_MOTHERBOARD),1608)
   HARDWARE_VARIANT ?= SanguinoA
   MCU              ?= atmega644
 # Final OMCA board
-else ifeq ($(HARDWARE_MOTHERBOARD),1509)
+else ifeq ($(HARDWARE_MOTHERBOARD),1609)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
 # Sethi 3D_1
-else ifeq ($(HARDWARE_MOTHERBOARD),1510)
+else ifeq ($(HARDWARE_MOTHERBOARD),1610)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
 
@@ -415,35 +420,35 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1510)
 #
 
 # Teensylu
-else ifeq ($(HARDWARE_MOTHERBOARD),1600)
+else ifeq ($(HARDWARE_MOTHERBOARD),1700)
   HARDWARE_VARIANT ?= Teensy
   MCU              ?= at90usb1286
 # Printrboard (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1601)
+else ifeq ($(HARDWARE_MOTHERBOARD),1701)
   HARDWARE_VARIANT ?= Teensy
   MCU              ?= at90usb1286
 # Printrboard Revision F (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1602)
+else ifeq ($(HARDWARE_MOTHERBOARD),1702)
   HARDWARE_VARIANT ?= Teensy
   MCU              ?= at90usb1286
 # Brainwave (AT90USB646)
-else ifeq ($(HARDWARE_MOTHERBOARD),1603)
+else ifeq ($(HARDWARE_MOTHERBOARD),1703)
   HARDWARE_VARIANT ?= Teensy
   MCU              ?= at90usb646
 # Brainwave Pro (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1604)
+else ifeq ($(HARDWARE_MOTHERBOARD),1704)
   HARDWARE_VARIANT ?= Teensy
   MCU              ?= at90usb1286
 # SAV Mk-I (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1605)
+else ifeq ($(HARDWARE_MOTHERBOARD),1705)
   HARDWARE_VARIANT ?= Teensy
   MCU              ?= at90usb1286
 # Teensy++2.0 (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1606)
+else ifeq ($(HARDWARE_MOTHERBOARD),1706)
   HARDWARE_VARIANT ?= Teensy
   MCU              ?= at90usb1286
 # 5DPrint D8 Driver Board
-else ifeq ($(HARDWARE_MOTHERBOARD),1607)
+else ifeq ($(HARDWARE_MOTHERBOARD),1707)
   HARDWARE_VARIANT ?= Teensy
   MCU              ?= at90usb1286
 

Marlin/src/core/boards.h

@@ -95,85 +95,90 @@
 #define BOARD_Z_BOLT_X_SERIES         1141  // Z-Bolt X Series
 
 //
+// RAMBo and derivatives
+//
+
+#define BOARD_RAMBO                   1200  // Rambo
+#define BOARD_MINIRAMBO               1201  // Mini-Rambo
+#define BOARD_MINIRAMBO_10A           1202  // Mini-Rambo 1.0a
+#define BOARD_EINSY_RAMBO             1203  // Einsy Rambo
+#define BOARD_EINSY_RETRO             1204  // Einsy Retro
+#define BOARD_SCOOVO_X9H              1205  // abee Scoovo X9H
+
+//
 // Other ATmega1280, ATmega2560
 //
 
-#define BOARD_CNCONTROLS_11           1200  // Cartesio CN Controls V11
-#define BOARD_CNCONTROLS_12           1201  // Cartesio CN Controls V12
-#define BOARD_CHEAPTRONIC             1202  // Cheaptronic v1.0
-#define BOARD_CHEAPTRONIC_V2          1203  // Cheaptronic v2.0
-#define BOARD_MIGHTYBOARD_REVE        1204  // Makerbot Mightyboard Revision E
-#define BOARD_MEGATRONICS             1205  // Megatronics
-#define BOARD_MEGATRONICS_2           1206  // Megatronics v2.0
-#define BOARD_MEGATRONICS_3           1207  // Megatronics v3.0
-#define BOARD_MEGATRONICS_31          1208  // Megatronics v3.1
-#define BOARD_MEGATRONICS_32          1209  // Megatronics v3.2
-#define BOARD_RAMBO                   1210  // Rambo
-#define BOARD_MINIRAMBO               1211  // Mini-Rambo
-#define BOARD_MINIRAMBO_10A           1212  // Mini-Rambo 1.0a
-#define BOARD_EINSY_RAMBO             1213  // Einsy Rambo
-#define BOARD_EINSY_RETRO             1214  // Einsy Retro
-#define BOARD_ELEFU_3                 1215  // Elefu Ra Board (v3)
-#define BOARD_LEAPFROG                1216  // Leapfrog
-#define BOARD_MEGACONTROLLER          1217  // Mega controller
-#define BOARD_SCOOVO_X9H              1218  // abee Scoovo X9H
-#define BOARD_GT2560_REV_A            1219  // Geeetech GT2560 Rev. A
-#define BOARD_GT2560_REV_A_PLUS       1220  // Geeetech GT2560 Rev. A+ (with auto level probe)
-#define BOARD_GT2560_V3               1221  // Geeetech GT2560 Rev B for A10(M/D)
-#define BOARD_GT2560_V3_MC2           1222  // Geeetech GT2560 Rev B for Mecreator2
-#define BOARD_GT2560_V3_A20           1223  // Geeetech GT2560 Rev B for A20(M/D)
-#define BOARD_EINSTART_S              1224  // Einstart retrofit
+#define BOARD_CNCONTROLS_11           1300  // Cartesio CN Controls V11
+#define BOARD_CNCONTROLS_12           1301  // Cartesio CN Controls V12
+#define BOARD_CHEAPTRONIC             1302  // Cheaptronic v1.0
+#define BOARD_CHEAPTRONIC_V2          1303  // Cheaptronic v2.0
+#define BOARD_MIGHTYBOARD_REVE        1304  // Makerbot Mightyboard Revision E
+#define BOARD_MEGATRONICS             1305  // Megatronics
+#define BOARD_MEGATRONICS_2           1306  // Megatronics v2.0
+#define BOARD_MEGATRONICS_3           1307  // Megatronics v3.0
+#define BOARD_MEGATRONICS_31          1308  // Megatronics v3.1
+#define BOARD_MEGATRONICS_32          1309  // Megatronics v3.2
+#define BOARD_ELEFU_3                 1310  // Elefu Ra Board (v3)
+#define BOARD_LEAPFROG                1311  // Leapfrog
+#define BOARD_MEGACONTROLLER          1312  // Mega controller
+#define BOARD_GT2560_REV_A            1313  // Geeetech GT2560 Rev. A
+#define BOARD_GT2560_REV_A_PLUS       1314  // Geeetech GT2560 Rev. A+ (with auto level probe)
+#define BOARD_GT2560_V3               1315  // Geeetech GT2560 Rev B for A10(M/D)
+#define BOARD_GT2560_V3_MC2           1316  // Geeetech GT2560 Rev B for Mecreator2
+#define BOARD_GT2560_V3_A20           1317  // Geeetech GT2560 Rev B for A20(M/D)
+#define BOARD_EINSTART_S              1318  // Einstart retrofit
 
 //
 // ATmega1281, ATmega2561
 //
 
-#define BOARD_MINITRONICS             1300  // Minitronics v1.0/1.1
-#define BOARD_SILVER_GATE             1301  // Silvergate v1.0
+#define BOARD_MINITRONICS             1400  // Minitronics v1.0/1.1
+#define BOARD_SILVER_GATE             1401  // Silvergate v1.0
 
 //
 // Sanguinololu and Derivatives - ATmega644P, ATmega1284P
 //
 
-#define BOARD_SANGUINOLOLU_11         1400  // Sanguinololu < 1.2
-#define BOARD_SANGUINOLOLU_12         1401  // Sanguinololu 1.2 and above
-#define BOARD_MELZI                   1402  // Melzi
-#define BOARD_MELZI_MAKR3D            1403  // Melzi with ATmega1284 (MaKr3d version)
-#define BOARD_MELZI_CREALITY          1404  // Melzi Creality3D board (for CR-10 etc)
-#define BOARD_MELZI_MALYAN            1405  // Melzi Malyan M150 board
-#define BOARD_MELZI_TRONXY            1406  // Tronxy X5S
-#define BOARD_STB_11                  1407  // STB V1.1
-#define BOARD_AZTEEG_X1               1408  // Azteeg X1
-#define BOARD_ANET_10                 1409  // Anet 1.0 (Melzi clone)
+#define BOARD_SANGUINOLOLU_11         1500  // Sanguinololu < 1.2
+#define BOARD_SANGUINOLOLU_12         1501  // Sanguinololu 1.2 and above
+#define BOARD_MELZI                   1502  // Melzi
+#define BOARD_MELZI_MAKR3D            1503  // Melzi with ATmega1284 (MaKr3d version)
+#define BOARD_MELZI_CREALITY          1504  // Melzi Creality3D board (for CR-10 etc)
+#define BOARD_MELZI_MALYAN            1505  // Melzi Malyan M150 board
+#define BOARD_MELZI_TRONXY            1506  // Tronxy X5S
+#define BOARD_STB_11                  1507  // STB V1.1
+#define BOARD_AZTEEG_X1               1508  // Azteeg X1
+#define BOARD_ANET_10                 1509  // Anet 1.0 (Melzi clone)
 
 //
 // Other ATmega644P, ATmega644, ATmega1284P
 //
 
-#define BOARD_GEN3_MONOLITHIC         1500  // Gen3 Monolithic Electronics
-#define BOARD_GEN3_PLUS               1501  // Gen3+
-#define BOARD_GEN6                    1502  // Gen6
-#define BOARD_GEN6_DELUXE             1503  // Gen6 deluxe
-#define BOARD_GEN7_CUSTOM             1504  // Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics"
-#define BOARD_GEN7_12                 1505  // Gen7 v1.1, v1.2
-#define BOARD_GEN7_13                 1506  // Gen7 v1.3
-#define BOARD_GEN7_14                 1507  // Gen7 v1.4
-#define BOARD_OMCA_A                  1508  // Alpha OMCA board
-#define BOARD_OMCA                    1509  // Final OMCA board
-#define BOARD_SETHI                   1510  // Sethi 3D_1
+#define BOARD_GEN3_MONOLITHIC         1600  // Gen3 Monolithic Electronics
+#define BOARD_GEN3_PLUS               1601  // Gen3+
+#define BOARD_GEN6                    1602  // Gen6
+#define BOARD_GEN6_DELUXE             1603  // Gen6 deluxe
+#define BOARD_GEN7_CUSTOM             1604  // Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics"
+#define BOARD_GEN7_12                 1605  // Gen7 v1.1, v1.2
+#define BOARD_GEN7_13                 1606  // Gen7 v1.3
+#define BOARD_GEN7_14                 1607  // Gen7 v1.4
+#define BOARD_OMCA_A                  1608  // Alpha OMCA board
+#define BOARD_OMCA                    1609  // Final OMCA board
+#define BOARD_SETHI                   1610  // Sethi 3D_1
 
 //
 // Teensyduino - AT90USB1286, AT90USB1286P
 //
 
-#define BOARD_TEENSYLU                1600  // Teensylu
-#define BOARD_PRINTRBOARD             1601  // Printrboard (AT90USB1286)
-#define BOARD_PRINTRBOARD_REVF        1602  // Printrboard Revision F (AT90USB1286)
-#define BOARD_BRAINWAVE               1603  // Brainwave (AT90USB646)
-#define BOARD_BRAINWAVE_PRO           1604  // Brainwave Pro (AT90USB1286)
-#define BOARD_SAV_MKI                 1605  // SAV Mk-I (AT90USB1286)
-#define BOARD_TEENSY2                 1606  // Teensy++2.0 (AT90USB1286)
-#define BOARD_5DPRINT                 1607  // 5DPrint D8 Driver Board
+#define BOARD_TEENSYLU                1700  // Teensylu
+#define BOARD_PRINTRBOARD             1701  // Printrboard (AT90USB1286)
+#define BOARD_PRINTRBOARD_REVF        1702  // Printrboard Revision F (AT90USB1286)
+#define BOARD_BRAINWAVE               1703  // Brainwave (AT90USB646)
+#define BOARD_BRAINWAVE_PRO           1704  // Brainwave Pro (AT90USB1286)
+#define BOARD_SAV_MKI                 1705  // SAV Mk-I (AT90USB1286)
+#define BOARD_TEENSY2                 1706  // Teensy++2.0 (AT90USB1286)
+#define BOARD_5DPRINT                 1707  // 5DPrint D8 Driver Board
 
 //
 // LPC1768 ARM Cortex M3
@@ -259,19 +264,24 @@
 #define BOARD_FYSETC_CHEETAH          4012  // FYSETC CHEETAH
 
 //
-// STM32 ARM Cortex-M4F
+// ARM Cortex-M4F
 //
 
 #define BOARD_TEENSY31_32             4100  // Teensy3.1 and Teensy3.2
 #define BOARD_TEENSY35_36             4101  // Teensy3.5 and Teensy3.6
-#define BOARD_BEAST                   4102  // STM32F4xxVxT6 Libmaple-based STM32F4 controller
-#define BOARD_STM32F4                 4103  // STM32 STM32GENERIC-based STM32F4 controller
-#define BOARD_ARMED                   4104  // Arm'ed STM32F4-based controller
-#define BOARD_RUMBA32                 4105  // RUMBA32 STM32F4-based controller
-#define BOARD_BLACK_STM32F407VE       4106  // BLACK_STM32F407VE
-#define BOARD_BLACK_STM32F407ZE       4107  // BLACK_STM32F407ZE
-#define BOARD_STEVAL                  4108  // STEVAL-3DP001V1 3D PRINTER BOARD
-#define BOARD_BIGTREE_SKR_PRO_V1_1    4109  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
+
+//
+// STM32 ARM Cortex-M4F
+//
+
+#define BOARD_BEAST                   4200  // STM32F4xxVxT6 Libmaple-based STM32F4 controller
+#define BOARD_STM32F4                 4201  // STM32 STM32GENERIC-based STM32F4 controller
+#define BOARD_ARMED                   4202  // Arm'ed STM32F4-based controller
+#define BOARD_RUMBA32                 4203  // RUMBA32 STM32F4-based controller
+#define BOARD_BLACK_STM32F407VE       4204  // BLACK_STM32F407VE
+#define BOARD_BLACK_STM32F407ZE       4205  // BLACK_STM32F407ZE
+#define BOARD_STEVAL                  4206  // STEVAL-3DP001V1 3D PRINTER BOARD
+#define BOARD_BIGTREE_SKR_PRO_V1_1    4207  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
 
 //
 // ARM Cortex M7

Marlin/src/pins/pins_MKS_SGEN.h → Marlin/src/pins/lpc1769/pins_MKS_SGEN.h

@@ -32,7 +32,7 @@
 #define BOARD_NAME        "MKS SGen"
 #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN"
 
-#include "pins_MKS_SBASE.h"
+#include "../lpc1768/pins_MKS_SBASE.h"
 
 #undef E1_STEP_PIN
 #undef E1_DIR_PIN

Marlin/src/pins/pins_EINSTART-S.h → Marlin/src/pins/mega/pins_EINSTART-S.h

@@ -26,16 +26,8 @@
  * PCB Silkscreen: 3DPrinterCon_v3.5
  */
 
-#if ENABLED(TARGET_LPC1768)
-  #error "Oops! Set MOTHERBOARD to an LPC1768-based board when building for LPC1768."
-#elif defined(__STM32F1__)
-  #error "Oops! Set MOTHERBOARD to an STM32F1-based board when building for STM32F1."
-#endif
-
-#if NONE(IS_RAMPS_SMART, IS_RAMPS_DUO, IS_RAMPS4DUE, TARGET_LPC1768)
-  #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
-    #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
-  #endif
+#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
+  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif
 
 #define BOARD_NAME "Einstart-S"

Marlin/src/pins/pins_GT2560_V3.h → Marlin/src/pins/mega/pins_GT2560_V3.h

@@ -149,15 +149,33 @@
 //
 #define BEEPER_PIN         18
 
-#define LCD_PINS_RS        20
-#define LCD_PINS_ENABLE    17
-#define LCD_PINS_D4        16
-#define LCD_PINS_D5        21
-#define LCD_PINS_D6         5
-#define LCD_PINS_D7        36
+#ifndef LCD_PINS_RS
+  #define LCD_PINS_RS      20
+#endif
+#ifndef LCD_PINS_ENABLE
+  #define LCD_PINS_ENABLE  17
+#endif
+#ifndef LCD_PINS_D4
+  #define LCD_PINS_D4      16
+#endif
+#ifndef LCD_PINS_D5
+  #define LCD_PINS_D5      21
+#endif
+#ifndef LCD_PINS_D6
+  #define LCD_PINS_D6       5
+#endif
+#ifndef LCD_PINS_D7
+  #define LCD_PINS_D7      36
+#endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          42
-  #define BTN_EN2          40
-  #define BTN_ENC          19
+  #ifndef BTN_EN1
+    #define BTN_EN1        42
+  #endif
+  #ifndef BTN_EN2
+    #define BTN_EN2        40
+  #endif
+  #ifndef BTN_ENC
+    #define BTN_ENC        19
+  #endif
 #endif

Marlin/src/pins/pins_GT2560_V3_A20.h → Marlin/src/pins/mega/pins_GT2560_V3_A20.h

@@ -25,22 +25,15 @@
  * Geeetech A20M pin assignment
  */
 
-#include "pins_GT2560_V3.h"
-
-#undef LCD_PINS_RS
-#undef LCD_PINS_ENABLE
-#undef LCD_PINS_D4
-#undef LCD_PINS_D7
 #define LCD_PINS_RS       5
 #define LCD_PINS_ENABLE  36
 #define LCD_PINS_D4      21
 #define LCD_PINS_D7       6
 
 #if ENABLED(NEWPANEL)
-  #undef BTN_EN1
-  #undef BTN_EN2
-  #undef BTN_ENC
   #define BTN_EN1        16
   #define BTN_EN2        17
   #define BTN_ENC        19
 #endif
+
+#include "pins_GT2560_V3.h"

Marlin/src/pins/pins.h

@@ -52,448 +52,463 @@
 //
 
 #if MB(RAMPS_OLD)
-  #include "pins_RAMPS_OLD.h"         // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_OLD.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_13_EFB)
-  #include "pins_RAMPS_13.h"          // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_13_EEB)
-  #include "pins_RAMPS_13.h"          // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_13_EFF)
-  #include "pins_RAMPS_13.h"          // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_13_EEF)
-  #include "pins_RAMPS_13.h"          // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_13_SF)
-  #include "pins_RAMPS_13.h"          // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_14_EFB)
-  #include "pins_RAMPS.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_14_EEB)
-  #include "pins_RAMPS.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_14_EFF)
-  #include "pins_RAMPS.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_14_EEF)
-  #include "pins_RAMPS.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_14_SF)
-  #include "pins_RAMPS.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_PLUS_EFB)
-  #include "pins_RAMPS_PLUS.h"        // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_PLUS_EEB)
-  #include "pins_RAMPS_PLUS.h"        // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_PLUS_EFF)
-  #include "pins_RAMPS_PLUS.h"        // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_PLUS_EEF)
-  #include "pins_RAMPS_PLUS.h"        // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RAMPS_PLUS_SF)
-  #include "pins_RAMPS_PLUS.h"        // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 
 //
 // RAMPS Derivatives - ATmega1280, ATmega2560
 //
 
 #elif MB(3DRAG)
-  #include "pins_3DRAG.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_3DRAG.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(K8200)
-  #include "pins_K8200.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560 (3DRAG)
+  #include "ramps/pins_K8200.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
 #elif MB(K8400)
-  #include "pins_K8400.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560 (3DRAG)
+  #include "ramps/pins_K8400.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
 #elif MB(K8800)
-  #include "pins_K8800.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560 (3DRAG)
+  #include "ramps/pins_K8800.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
 #elif MB(BAM_DICE)
-  #include "pins_RAMPS.h"             // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(BAM_DICE_DUE)
-  #include "pins_BAM_DICE_DUE.h"      // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_BAM_DICE_DUE.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_BASE)
-  #include "pins_MKS_BASE.h"          // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_BASE.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_BASE_14)
-  #include "pins_MKS_BASE_14.h"       // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:megaatmega2560
 #elif MB(MKS_BASE_15)
-  #include "pins_MKS_BASE_15.h"       // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_15.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_BASE_HEROIC)
-  #include "pins_MKS_BASE_HEROIC.h"   // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_GEN_13)
-  #include "pins_MKS_GEN_13.h"        // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_GEN_13.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_GEN_L)
-  #include "pins_MKS_GEN_L.h"         // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_GEN_L.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(KFB_2)
-  #include "pins_BIQU_KFB_2.h"        // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_BIQU_KFB_2.h"            // ATmega2560                             env:megaatmega2560
 #elif MB(ZRIB_V20)
-  #include "pins_ZRIB_V20.h"          // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560 (MKS_GEN_13)
+  #include "ramps/pins_ZRIB_V20.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (MKS_GEN_13)
 #elif MB(FELIX2)
-  #include "pins_FELIX2.h"            // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_FELIX2.h"                // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RIGIDBOARD)
-  #include "pins_RIGIDBOARD.h"        // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RIGIDBOARD.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(RIGIDBOARD_V2)
-  #include "pins_RIGIDBOARD_V2.h"     // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RIGIDBOARD_V2.h"         // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(SAINSMART_2IN1)
-  #include "pins_SAINSMART_2IN1.h"    // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_SAINSMART_2IN1.h"        // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(ULTIMAKER)
-  #include "pins_ULTIMAKER.h"         // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_ULTIMAKER.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(ULTIMAKER_OLD)
-  #include "pins_ULTIMAKER_OLD.h"     // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_ULTIMAKER_OLD.h"         // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(AZTEEG_X3)
-  #include "pins_AZTEEG_X3.h"         // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_AZTEEG_X3.h"             // ATmega2560                             env:megaatmega2560
 #elif MB(AZTEEG_X3_PRO)
-  #include "pins_AZTEEG_X3_PRO.h"     // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_AZTEEG_X3_PRO.h"         // ATmega2560                             env:megaatmega2560
 #elif MB(ULTIMAIN_2)
-  #include "pins_ULTIMAIN_2.h"        // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_ULTIMAIN_2.h"            // ATmega2560                             env:megaatmega2560
 #elif MB(FORMBOT_RAPTOR)
-  #include "pins_FORMBOT_RAPTOR.h"    // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_FORMBOT_RAPTOR.h"        // ATmega2560                             env:megaatmega2560
 #elif MB(FORMBOT_RAPTOR2)
-  #include "pins_FORMBOT_RAPTOR2.h"   // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_FORMBOT_RAPTOR2.h"       // ATmega2560                             env:megaatmega2560
 #elif MB(FORMBOT_TREX2PLUS)
-  #include "pins_FORMBOT_TREX2PLUS.h" // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_FORMBOT_TREX2PLUS.h"     // ATmega2560                             env:megaatmega2560
 #elif MB(FORMBOT_TREX3)
-  #include "pins_FORMBOT_TREX3.h"     // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_FORMBOT_TREX3.h"         // ATmega2560                             env:megaatmega2560
 #elif MB(RUMBA)
-  #include "pins_RUMBA.h"             // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_RUMBA.h"                 // ATmega2560                             env:megaatmega2560
 #elif MB(RUMBA_RAISE3D)
-  #include "pins_RUMBA_RAISE3D.h"     // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_RUMBA_RAISE3D.h"         // ATmega2560                             env:megaatmega2560
 #elif MB(RL200)
-  #include "pins_RL200.h"             // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_RL200.h"                 // ATmega2560                             env:megaatmega2560
 #elif MB(BQ_ZUM_MEGA_3D)
-  #include "pins_BQ_ZUM_MEGA_3D.h"    // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_BQ_ZUM_MEGA_3D.h"        // ATmega2560                             env:megaatmega2560
 #elif MB(MAKEBOARD_MINI)
-  #include "pins_MAKEBOARD_MINI.h"    // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_MAKEBOARD_MINI.h"        // ATmega2560                             env:megaatmega2560
 #elif MB(TRIGORILLA_13)
-  #include "pins_TRIGORILLA_13.h"     // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_TRIGORILLA_13.h"         // ATmega2560                             env:megaatmega2560
 #elif MB(TRIGORILLA_14)
-  #include "pins_TRIGORILLA_14.h"     // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:megaatmega2560
 #elif MB(TRIGORILLA_14_11)
-  #include "pins_TRIGORILLA_14.h"     // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:megaatmega2560
 #elif MB(RAMPS_ENDER_4)
-  #include "pins_RAMPS_ENDER_4.h"     // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:megaatmega2560
 #elif MB(RAMPS_CREALITY)
-  #include "pins_RAMPS_CREALITY.h"    // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_RAMPS_CREALITY.h"        // ATmega2560                             env:megaatmega2560
 #elif MB(RAMPS_DAGOMA)
-  #include "pins_RAMPS_DAGOMA.h"      // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_RAMPS_DAGOMA.h"          // ATmega2560                             env:megaatmega2560
 #elif MB(FYSETC_F6_13)
-  #include "pins_FYSETC_F6_13.h"      // ATmega2560                                 env:fysetc_f6_13
+  #include "ramps/pins_FYSETC_F6_13.h"          // ATmega2560                             env:fysetc_f6_13
 #elif MB(DUPLICATOR_I3_PLUS)
-  #include "pins_DUPLICATOR_I3_PLUS.h" // ATmega2560                                env:megaatmega2560
+  #include "ramps/pins_DUPLICATOR_I3_PLUS.h"    // ATmega2560                             env:megaatmega2560
 #elif MB(VORON)
-  #include "pins_VORON.h"             // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_VORON.h"                 // ATmega2560                             env:megaatmega2560
 #elif MB(TRONXY_V3_1_0)
-  #include "pins_TRONXY_V3_1_0.h"     // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_TRONXY_V3_1_0.h"         // ATmega2560                             env:megaatmega2560
 #elif MB(Z_BOLT_X_SERIES)
-  #include "pins_Z_BOLT_X_SERIES.h"   // ATmega2560                                 env:megaatmega2560
+  #include "ramps/pins_Z_BOLT_X_SERIES.h"       // ATmega2560                             env:megaatmega2560
+
+//
+// RAMBo and derivatives
+//
+
+#elif MB(RAMBO)
+  #include "rambo/pins_RAMBO.h"                 // ATmega2560                             env:rambo
+#elif MB(MINIRAMBO) || MB(MINIRAMBO_10A)
+  #include "rambo/pins_MINIRAMBO.h"             // ATmega2560                             env:rambo
+#elif MB(EINSY_RAMBO)
+  #include "rambo/pins_EINSY_RAMBO.h"           // ATmega2560                             env:rambo
+#elif MB(EINSY_RETRO)
+  #include "rambo/pins_EINSY_RETRO.h"           // ATmega2560                             env:rambo
+#elif MB(SCOOVO_X9H)
+  #include "rambo/pins_SCOOVO_X9H.h"            // ATmega2560                             env:rambo
 
 //
 // Other ATmega1280, ATmega2560
 //
 
 #elif MB(CNCONTROLS_11)
-  #include "pins_CNCONTROLS_11.h"     // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "pins_CNCONTROLS_11.h"               // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(CNCONTROLS_12)
-  #include "pins_CNCONTROLS_12.h"     // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "pins_CNCONTROLS_12.h"               // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MIGHTYBOARD_REVE)
-  #include "pins_MIGHTYBOARD_REVE.h"  // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "pins_MIGHTYBOARD_REVE.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(CHEAPTRONIC)
-  #include "pins_CHEAPTRONIC.h"       // ATmega2560                                 env:megaatmega2560
+  #include "pins_CHEAPTRONIC.h"                 // ATmega2560                             env:megaatmega2560
 #elif MB(CHEAPTRONIC_V2)
-  #include "pins_CHEAPTRONICv2.h"     // ATmega2560                                 env:megaatmega2560
+  #include "pins_CHEAPTRONICv2.h"               // ATmega2560                             env:megaatmega2560
 #elif MB(MEGATRONICS)
-  #include "pins_MEGATRONICS.h"       // ATmega2560                                 env:megaatmega2560
+  #include "pins_MEGATRONICS.h"                 // ATmega2560                             env:megaatmega2560
 #elif MB(MEGATRONICS_2)
-  #include "pins_MEGATRONICS_2.h"     // ATmega2560                                 env:megaatmega2560
+  #include "pins_MEGATRONICS_2.h"               // ATmega2560                             env:megaatmega2560
 #elif MB(MEGATRONICS_3) || MB(MEGATRONICS_31) || MB(MEGATRONICS_32)
-  #include "pins_MEGATRONICS_3.h"     // ATmega2560                                 env:megaatmega2560
-#elif MB(RAMBO)
-  #include "pins_RAMBO.h"             // ATmega2560                                 env:rambo
-#elif MB(MINIRAMBO) || MB(MINIRAMBO_10A)
-  #include "pins_MINIRAMBO.h"         // ATmega2560                                 env:rambo
-#elif MB(EINSY_RAMBO)
-  #include "pins_EINSY_RAMBO.h"       // ATmega2560                                 env:rambo
-#elif MB(EINSY_RETRO)
-  #include "pins_EINSY_RETRO.h"       // ATmega2560                                 env:rambo
+  #include "pins_MEGATRONICS_3.h"               // ATmega2560                             env:megaatmega2560
 #elif MB(ELEFU_3)
-  #include "pins_ELEFU_3.h"           // ATmega2560                                 env:megaatmega2560
+  #include "pins_ELEFU_3.h"                     // ATmega2560                             env:megaatmega2560
 #elif MB(LEAPFROG)
-  #include "pins_LEAPFROG.h"          // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "pins_LEAPFROG.h"                    // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MEGACONTROLLER)
-  #include "pins_MEGACONTROLLER.h"    // ATmega2560                                 env:megaatmega2560
-#elif MB(SCOOVO_X9H)
-  #include "pins_SCOOVO_X9H.h"        // ATmega2560                                 env:rambo
+  #include "pins_MEGACONTROLLER.h"              // ATmega2560                             env:megaatmega2560
 #elif MB(GT2560_REV_A)
-  #include "pins_GT2560_REV_A.h"      // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "pins_GT2560_REV_A.h"                // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(GT2560_REV_A_PLUS)
-  #include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "pins_GT2560_REV_A_PLUS.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(GT2560_V3)
-  #include "pins_GT2560_V3.h"         // ATmega2560                                 env:megaatmega2560
+  #include "pins_GT2560_V3.h"                   // ATmega2560                             env:megaatmega2560
 #elif MB(GT2560_V3_MC2)
-  #include "pins_GT2560_V3_MC2.h"     // ATmega2560                                 env:megaatmega2560
+  #include "pins_GT2560_V3_MC2.h"               // ATmega2560                             env:megaatmega2560
 #elif MB(GT2560_V3_A20)
-  #include "pins_GT2560_V3_A20.h"     // ATmega2560                                 env:megaatmega2560
+  #include "pins_GT2560_V3_A20.h"               // ATmega2560                             env:megaatmega2560
 #elif MB(EINSTART_S)
-  #include "pins_EINSTART-S.h"        // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
+  #include "pins_EINSTART-S.h"                  // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 
 //
 // ATmega1281, ATmega2561
 //
 
 #elif MB(MINITRONICS)
-  #include "pins_MINITRONICS.h"       // ATmega1281                                 env:megaatmega1280
+  #include "pins_MINITRONICS.h"                 // ATmega1281                             env:megaatmega1280
 #elif MB(SILVER_GATE)
-  #include "pins_SILVER_GATE.h"       // ATmega2561                                 env:megaatmega2560
+  #include "pins_SILVER_GATE.h"                 // ATmega2561                             env:megaatmega2560
 
 //
 // Sanguinololu and Derivatives - ATmega644P, ATmega1284P
 //
 
 #elif MB(SANGUINOLOLU_11)
-  #include "pins_SANGUINOLOLU_11.h"   // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_SANGUINOLOLU_11.h"    // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(SANGUINOLOLU_12)
-  #include "pins_SANGUINOLOLU_12.h"   // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_SANGUINOLOLU_12.h"    // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(MELZI)
-  #include "pins_MELZI.h"             // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI.h"              // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(MELZI_MAKR3D)
-  #include "pins_MELZI_MAKR3D.h"      // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_MAKR3D.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(MELZI_CREALITY)
-  #include "pins_MELZI_CREALITY.h"    // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_CREALITY.h"     // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(MELZI_MALYAN)
-  #include "pins_MELZI_MALYAN.h"      // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_MALYAN.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(MELZI_TRONXY)
-  #include "pins_MELZI_TRONXY.h"      // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_TRONXY.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(STB_11)
-  #include "pins_STB_11.h"            // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_STB_11.h"             // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(AZTEEG_X1)
-  #include "pins_AZTEEG_X1.h"         // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_AZTEEG_X1.h"          // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 
 //
 // Other ATmega644P, ATmega644, ATmega1284P
 //
 
 #elif MB(GEN3_MONOLITHIC)
-  #include "pins_GEN3_MONOLITHIC.h"   // ATmega644P                                 env:sanguino_atmega644p
+  #include "sanguino/pins_GEN3_MONOLITHIC.h"    // ATmega644P                             env:sanguino_atmega644p
 #elif MB(GEN3_PLUS)
-  #include "pins_GEN3_PLUS.h"         // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN3_PLUS.h"          // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(GEN6)
-  #include "pins_GEN6.h"              // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN6.h"               // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(GEN6_DELUXE)
-  #include "pins_GEN6_DELUXE.h"       // ATmega644P, ATmega1284P                    env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN6_DELUXE.h"        // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(GEN7_CUSTOM)
-  #include "pins_GEN7_CUSTOM.h"       // ATmega644P, ATmega644, ATmega1284P         env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_CUSTOM.h"        // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(GEN7_12)
-  #include "pins_GEN7_12.h"           // ATmega644P, ATmega644, ATmega1284P         env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_12.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(GEN7_13)
-  #include "pins_GEN7_13.h"           // ATmega644P, ATmega644, ATmega1284P         env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_13.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(GEN7_14)
-  #include "pins_GEN7_14.h"           // ATmega644P, ATmega644, ATmega1284P         env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_14.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
 #elif MB(OMCA_A)
-  #include "pins_OMCA_A.h"            // ATmega644                                  env:sanguino_atmega644p
+  #include "sanguino/pins_OMCA_A.h"             // ATmega644                              env:sanguino_atmega644p
 #elif MB(OMCA)
-  #include "pins_OMCA.h"              // ATmega644P, ATmega644                      env:sanguino_atmega644p
+  #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino_atmega644p
 #elif MB(ANET_10)
-  #include "pins_ANET_10.h"           // ATmega1284P                                env:sanguino_atmega1284p
+  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino_atmega1284p
 #elif MB(SETHI)
-  #include "pins_SETHI.h"             // ATmega644P, ATmega644, ATmega1284P         env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
 
 //
 // Teensyduino - AT90USB1286, AT90USB1286P
 //
 
 #elif MB(TEENSYLU)
-  #include "pins_TEENSYLU.h"          // AT90USB1286, AT90USB1286P                  env:at90usb1286_cdc
+  #include "teensy2/pins_TEENSYLU.h"            // AT90USB1286, AT90USB1286P              env:at90usb1286_cdc
 #elif MB(PRINTRBOARD)
-  #include "pins_PRINTRBOARD.h"       // AT90USB1286                                env:at90usb1286_dfu
+  #include "teensy2/pins_PRINTRBOARD.h"         // AT90USB1286                            env:at90usb1286_dfu
 #elif MB(PRINTRBOARD_REVF)
-  #include "pins_PRINTRBOARD_REVF.h"  // AT90USB1286                                env:at90usb1286_dfu
+  #include "teensy2/pins_PRINTRBOARD_REVF.h"    // AT90USB1286                            env:at90usb1286_dfu
 #elif MB(BRAINWAVE)
-  #include "pins_BRAINWAVE.h"         // AT90USB646                                 env:at90usb1286_cdc
+  #include "teensy2/pins_BRAINWAVE.h"           // AT90USB646                             env:at90usb1286_cdc
 #elif MB(BRAINWAVE_PRO)
-  #include "pins_BRAINWAVE_PRO.h"     // AT90USB1286                                env:at90usb1286_cdc
+  #include "teensy2/pins_BRAINWAVE_PRO.h"       // AT90USB1286                            env:at90usb1286_cdc
 #elif MB(SAV_MKI)
-  #include "pins_SAV_MKI.h"           // AT90USB1286                                env:at90usb1286_cdc
+  #include "teensy2/pins_SAV_MKI.h"             // AT90USB1286                            env:at90usb1286_cdc
 #elif MB(TEENSY2)
-  #include "pins_TEENSY2.h"           // AT90USB1286                                env:teensy20
+  #include "teensy2/pins_TEENSY2.h"             // AT90USB1286                            env:teensy20
 #elif MB(5DPRINT)
-  #include "pins_5DPRINT.h"           // AT90USB1286                                env:at90usb1286_dfu
+  #include "teensy2/pins_5DPRINT.h"             // AT90USB1286                            env:at90usb1286_dfu
 
 //
 // LPC1768 ARM Cortex M3
 //
 
 #elif MB(RAMPS_14_RE_ARM_EFB)
-  #include "pins_RAMPS_RE_ARM.h"        // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
 #elif MB(RAMPS_14_RE_ARM_EEB)
-  #include "pins_RAMPS_RE_ARM.h"        // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
 #elif MB(RAMPS_14_RE_ARM_EFF)
-  #include "pins_RAMPS_RE_ARM.h"        // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
 #elif MB(RAMPS_14_RE_ARM_EEF)
-  #include "pins_RAMPS_RE_ARM.h"        // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
 #elif MB(RAMPS_14_RE_ARM_SF)
-  #include "pins_RAMPS_RE_ARM.h"        // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_RAMPS_RE_ARM.h"        // LPC1768                                env:LPC1768
 #elif MB(MKS_SBASE)
-  #include "pins_MKS_SBASE.h"           // LPC1768                                    env:LPC1768
-#elif MB(MKS_SGEN)
-  #include "pins_MKS_SGEN.h"            // LPC1769                                    env:LPC1769
+  #include "lpc1768/pins_MKS_SBASE.h"           // LPC1768                                env:LPC1768
 #elif MB(MKS_SGEN_L)
-  #include "pins_MKS_SGEN_L.h"          // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_MKS_SGEN_L.h"          // LPC1768                                env:LPC1768
 #elif MB(AZSMZ_MINI)
-  #include "pins_AZSMZ_MINI.h"          // LPC1768                                    env:LPC1768
-#elif MB(AZTEEG_X5_GT)
-  #include "pins_AZTEEG_X5_GT.h"        // LPC1769                                    env:LPC1769
-#elif MB(AZTEEG_X5_MINI)
-  #include "pins_AZTEEG_X5_MINI.h"      // LPC1769                                    env:LPC1769
-#elif MB(AZTEEG_X5_MINI_WIFI)
-  #include "pins_AZTEEG_X5_MINI_WIFI.h" // LPC1769                                    env:LPC1769
+  #include "lpc1768/pins_AZSMZ_MINI.h"          // LPC1768                                env:LPC1768
 #elif MB(BIQU_BQ111_A4)
-  #include "pins_BIQU_BQ111_A4.h"       // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_BIQU_BQ111_A4.h"       // LPC1768                                env:LPC1768
 #elif MB(SELENA_COMPACT)
-  #include "pins_SELENA_COMPACT.h"      // LPC1768                                    env:LPC1768
-#elif MB(COHESION3D_REMIX)
-  #include "pins_COHESION3D_REMIX.h"    // LPC1769                                    env:LPC1769
-#elif MB(COHESION3D_MINI)
-  #include "pins_COHESION3D_MINI.h"     // LPC1769                                    env:LPC1769
-#elif MB(SMOOTHIEBOARD)
-  #include "pins_SMOOTHIEBOARD.h"       // LPC1769                                    env:LPC1769
+  #include "lpc1768/pins_SELENA_COMPACT.h"      // LPC1768                                env:LPC1768
 #elif MB(BIGTREE_SKR_V1_1)
-  #include "pins_BIGTREE_SKR_V1.1.h"    // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_BIGTREE_SKR_V1.1.h"    // LPC1768                                env:LPC1768
 #elif MB(BIQU_B300_V1_0)
-  #include "pins_BIQU_B300_V1.0.h"      // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_BIQU_B300_V1.0.h"      // LPC1768                                env:LPC1768
 #elif MB(BIGTREE_SKR_V1_3)
-  #include "pins_BIGTREE_SKR_V1.3.h"    // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_BIGTREE_SKR_V1.3.h"    // LPC1768                                env:LPC1768
 #elif MB(TH3D_EZBOARD)
-  #include "pins_TH3D_EZBOARD.h"        // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_TH3D_EZBOARD.h"        // LPC1768                                env:LPC1768
 #elif MB(GMARSH_X6_REV1)
-  #include "pins_GMARSH_X6_REV1.h"      // LPC1768                                    env:LPC1768
+  #include "lpc1768/pins_GMARSH_X6_REV1.h"      // LPC1768                                env:LPC1768
 
 //
-// Other 32-bit Boards
+// LPC1769 ARM Cortex M3
+//
+
+#elif MB(MKS_SGEN)
+  #include "lpc1769/pins_MKS_SGEN.h"            // LPC1769                                env:LPC1769
+#elif MB(AZTEEG_X5_GT)
+  #include "lpc1769/pins_AZTEEG_X5_GT.h"        // LPC1769                                env:LPC1769
+#elif MB(AZTEEG_X5_MINI)
+  #include "lpc1769/pins_AZTEEG_X5_MINI.h"      // LPC1769                                env:LPC1769
+#elif MB(AZTEEG_X5_MINI_WIFI)
+  #include "lpc1769/pins_AZTEEG_X5_MINI_WIFI.h" // LPC1769                                env:LPC1769
+#elif MB(COHESION3D_REMIX)
+  #include "lpc1769/pins_COHESION3D_REMIX.h"    // LPC1769                                env:LPC1769
+#elif MB(COHESION3D_MINI)
+  #include "lpc1769/pins_COHESION3D_MINI.h"     // LPC1769                                env:LPC1769
+#elif MB(SMOOTHIEBOARD)
+  #include "lpc1769/pins_SMOOTHIEBOARD.h"       // LPC1769                                env:LPC1769
+
+//
+// Due (ATSAM) boards
 //
 
 #elif MB(DUE3DOM)
-  #include "pins_DUE3DOM.h"           // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_DUE3DOM.h"                 // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(DUE3DOM_MINI)
-  #include "pins_DUE3DOM_MINI.h"      // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_DUE3DOM_MINI.h"            // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RADDS)
-  #include "pins_RADDS.h"             // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RADDS.h"                   // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RURAMPS4D_11)
-  #include "pins_RURAMPS4D_11.h"      // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RURAMPS4D_11.h"            // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RURAMPS4D_13)
-  #include "pins_RURAMPS4D_13.h"      // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RURAMPS4D_13.h"            // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_FD_V1)
-  #include "pins_RAMPS_FD_V1.h"       // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_FD_V1.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_FD_V2)
-  #include "pins_RAMPS_FD_V2.h"       // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_FD_V2.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_SMART_EFB)
-  #include "pins_RAMPS_SMART.h"       // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_SMART_EEB)
-  #include "pins_RAMPS_SMART.h"       // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_SMART_EFF)
-  #include "pins_RAMPS_SMART.h"       // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_SMART_EEF)
-  #include "pins_RAMPS_SMART.h"       // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_SMART_SF)
-  #include "pins_RAMPS_SMART.h"       // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_SMART.h"             // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_DUO_EFB)
-  #include "pins_RAMPS_DUO.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_DUO_EEB)
-  #include "pins_RAMPS_DUO.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_DUO_EFF)
-  #include "pins_RAMPS_DUO.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_DUO_EEF)
-  #include "pins_RAMPS_DUO.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS_DUO_SF)
-  #include "pins_RAMPS_DUO.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS_DUO.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS4DUE_EFB)
-  #include "pins_RAMPS4DUE.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS4DUE_EEB)
-  #include "pins_RAMPS4DUE.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS4DUE_EFF)
-  #include "pins_RAMPS4DUE.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS4DUE_EEF)
-  #include "pins_RAMPS4DUE.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(RAMPS4DUE_SF)
-  #include "pins_RAMPS4DUE.h"         // SAM3X8E                                    env:DUE env:DUE_USB env:DUE_debug
+  #include "sam/pins_RAMPS4DUE.h"               // SAM3X8E                                env:DUE env:DUE_USB env:DUE_debug
 #elif MB(ULTRATRONICS_PRO)
-  #include "pins_ULTRATRONICS_PRO.h"  // SAM3X8E                                    env:DUE env:DUE_debug
+  #include "sam/pins_ULTRATRONICS_PRO.h"        // SAM3X8E                                env:DUE env:DUE_debug
 #elif MB(ARCHIM1)
-  #include "pins_ARCHIM1.h"           // SAM3X8E                                    env:DUE env:DUE_debug
+  #include "sam/pins_ARCHIM1.h"                 // SAM3X8E                                env:DUE env:DUE_debug
 #elif MB(ARCHIM2)
-  #include "pins_ARCHIM2.h"           // SAM3X8E                                    env:DUE env:DUE_debug
+  #include "sam/pins_ARCHIM2.h"                 // SAM3X8E                                env:DUE env:DUE_debug
 #elif MB(ALLIGATOR)
-  #include "pins_ALLIGATOR_R2.h"      // SAM3X8E                                    env:DUE env:DUE_debug
+  #include "sam/pins_ALLIGATOR_R2.h"            // SAM3X8E                                env:DUE env:DUE_debug
 #elif MB(ADSK)
-  #include "pins_ADSK.h"              // SAM3X8E                                    env:DUE env:DUE_debug
+  #include "sam/pins_ADSK.h"                    // SAM3X8E                                env:DUE env:DUE_debug
 #elif MB(PRINTRBOARD_G2)
-  #include "pins_PRINTRBOARD_G2.h"    // SAM3X8C                                    env:DUE_USB
+  #include "sam/pins_PRINTRBOARD_G2.h"          // SAM3X8C                                env:DUE_USB
 
 //
 // STM32 ARM Cortex-M3
 //
 
 #elif MB(STM32F1R)
-  #include "pins_STM32F1R.h"          // STM32F1                                    env:STM32F1
+  #include "stm32/pins_STM32F1R.h"              // STM32F1                                env:STM32F1
 #elif MB(STM3R_MINI)
-  #include "pins_STM3R_MINI.h"        // STM32F1                                    env:STM32F1
+  #include "stm32/pins_STM3R_MINI.h"            // STM32F1                                env:STM32F1
 #elif MB(BIGTREE_SKR_MINI_V1_1)
-  #include "pins_BIGTREE_SKR_MINI_V1_1.h" // STM32F1                                env:BIGTREE_SKR_MINI
+  #include "stm32/pins_BIGTREE_SKR_MINI_V1_1.h" // STM32F1                                env:BIGTREE_SKR_MINI
 #elif MB(BIGTREE_SKR_MINI_E3)
-  #include "pins_BIGTREE_SKR_MINI_E3.h" // STM32F1                                  env:BIGTREE_SKR_MINI
+  #include "stm32/pins_BIGTREE_SKR_MINI_E3.h"   // STM32F1                                env:BIGTREE_SKR_MINI
 #elif MB(MALYAN_M200)
-  #include "pins_MALYAN_M200.h"       // STM32F1                                    env:malyanm200
+  #include "stm32/pins_MALYAN_M200.h"           // STM32F1                                env:malyanm200
 #elif MB(CHITU3D)
-  #include "pins_CHITU3D.h"           // STM32F1                                    env:STM32F1
+  #include "stm32/pins_CHITU3D.h"               // STM32F1                                env:STM32F1
 #elif MB(GTM32_PRO_VB)
-  #include "pins_GTM32_PRO_VB.h"      // STM32F1                                    env:STM32F1
+  #include "stm32/pins_GTM32_PRO_VB.h"          // STM32F1                                env:STM32F1
 #elif MB(MORPHEUS)
-  #include "pins_MORPHEUS.h"          // STM32F1                                    env:STM32F1
+  #include "stm32/pins_MORPHEUS.h"              // STM32F1                                env:STM32F1
 #elif MB(MKS_ROBIN)
-  #include "pins_MKS_ROBIN.h"         // STM32F1                                    env:mks_robin
+  #include "stm32/pins_MKS_ROBIN.h"             // STM32F1                                env:mks_robin
 #elif MB(MKS_ROBIN_MINI)
-  #include "pins_MKS_ROBIN_MINI.h"    // STM32F1                                    env:mks_robin_mini
+  #include "stm32/pins_MKS_ROBIN_MINI.h"        // STM32F1                                env:mks_robin_mini
 #elif MB(MKS_ROBIN_NANO)
-  #include "pins_MKS_ROBIN_NANO.h"    // STM32F1                                    env:mks_robin_nano
+  #include "stm32/pins_MKS_ROBIN_NANO.h"        // STM32F1                                env:mks_robin_nano
 #elif MB(JGAURORA_A5S_A1)
-  #include "pins_JGAURORA_A5S_A1.h"   // STM32F1                                    env:JGAURORA_A5S_A1
+  #include "stm32/pins_JGAURORA_A5S_A1.h"       // STM32F1                                env:JGAURORA_A5S_A1
 #elif MB(FYSETC_AIO_II)
-  #include "pins_FYSETC_AIO_II.h"     // STM32F1                                    env:fysetc_STM32F1
+  #include "stm32/pins_FYSETC_AIO_II.h"         // STM32F1                                env:fysetc_STM32F1
 #elif MB(FYSETC_CHEETAH)
-  #include "pins_FYSETC_CHEETAH.h"    // STM32F1                                    env:fysetc_STM32F1
+  #include "stm32/pins_FYSETC_CHEETAH.h"        // STM32F1                                env:fysetc_STM32F1
 
 //
-// STM32 ARM Cortex-M4F
+// ARM Cortex-M4F
 //
 
 #elif MB(TEENSY31_32)
-  #include "pins_TEENSY31_32.h"       // TEENSY31_32                                env:teensy31
+  #include "teensy3/pins_TEENSY31_32.h"         // TEENSY31_32                            env:teensy31
 #elif MB(TEENSY35_36)
-  #include "pins_TEENSY35_36.h"       // TEENSY35_36                                env:teensy35
+  #include "teensy3/pins_TEENSY35_36.h"         // TEENSY35_36                            env:teensy35
+
+//
+// STM32 ARM Cortex-M4F
+//
+
 #elif MB(BEAST)
-  #include "pins_BEAST.h"             // STM32F4                                    env:STM32F4
+  #include "stm32/pins_BEAST.h"                 // STM32F4                                env:STM32F4
 #elif MB(STM32F4)
-  #include "pins_STM32F4.h"           // STM32F4                                    env:STM32F4
+  #include "stm32/pins_STM32F4.h"               // STM32F4                                env:STM32F4
 #elif MB(ARMED)
-  #include "pins_ARMED.h"             // STM32F4                                    env:ARMED
+  #include "stm32/pins_ARMED.h"                 // STM32F4                                env:ARMED
 #elif MB(RUMBA32)
-  #include "pins_RUMBA32.h"           // STM32F4                                    env:RUMBA32
+  #include "stm32/pins_RUMBA32.h"               // STM32F4                                env:RUMBA32
 #elif MB(BLACK_STM32F407VE)
-  #include "pins_BLACK_STM32F407VE.h" // STM32F4                                    env:black_stm32f407ve
+  #include "stm32/pins_BLACK_STM32F407VE.h"     // STM32F4                                env:black_stm32f407ve
 #elif MB(STEVAL)
-  #include "pins_STEVAL.h"            // STM32F4                                    env:STM32F4
+  #include "stm32/pins_STEVAL.h"                // STM32F4                                env:STM32F4
 #elif MB(BIGTREE_SKR_PRO_V1_1)
-  #include "pins_BIGTREE_SKR_PRO_V1.1.h" // STM32F4                                 env:BIGTREE_SKR_PRO
+  #include "stm32/pins_BIGTREE_SKR_PRO_V1.1.h"  // STM32F4                                env:BIGTREE_SKR_PRO
 
 //
 // ARM Cortex M7
 //
 
 #elif MB(THE_BORG)
-  #include "pins_THE_BORG.h"          // STM32F7                                    env:STM32F7
+  #include "stm32/pins_THE_BORG.h"              // STM32F7                                env:STM32F7
 #elif MB(REMRAM_V1)
-  #include "pins_REMRAM_V1.h"         // STM32F7                                    env:STM32F7xx
+  #include "stm32/pins_REMRAM_V1.h"             // STM32F7                                env:STM32F7xx
 
 //
 // Espressif ESP32
 //
 
 #elif MB(ESP32)
-  #include "pins_ESP32.h"             // ESP32                                      env:esp32
+  #include "esp32/pins_ESP32.h"                 // ESP32                                  env:esp32
 
 //
 // Linux Native Debug board
 //
 
 #elif MB(LINUX_RAMPS)
-  #include "pins_RAMPS_LINUX.h"       // Linux                                      env:linux_native
+  #include "linux/pins_RAMPS_LINUX.h"           // Linux                                  env:linux_native
 
 #else
   #error "Unknown MOTHERBOARD value set in Configuration.h"

Marlin/src/pins/pins_RAMPS.h → Marlin/src/pins/ramps/pins_RAMPS.h

@@ -157,9 +157,15 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN       14   // Analog Input
+#ifndef TEMP_0_PIN
+  #define TEMP_0_PIN       13   // Analog Input
+#endif
+#ifndef TEMP_1_PIN
+  #define TEMP_1_PIN       15   // Analog Input
+#endif
+#ifndef TEMP_BED_PIN
+  #define TEMP_BED_PIN     14   // Analog Input
+#endif
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)

Marlin/src/pins/pins_Z_BOLT_X_SERIES.h → Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h

@@ -29,19 +29,11 @@
   #error "Z-Bolt X Series board supports up to 4 hotends / E-steppers."
 #endif
 
-#define BOARD_NAME "Z-Bolt X Series"
-
-#if ENABLED(TARGET_LPC1768)
-  #error "Oops! Set MOTHERBOARD to an LPC1768-based board when building for LPC1768."
-#elif defined(__STM32F1__)
-  #error "Oops! Set MOTHERBOARD to an STM32F1-based board when building for STM32F1."
+#if !defined(__AVR_ATmega2560__)
+  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif
 
-#if NONE(IS_RAMPS_SMART, IS_RAMPS_DUO, IS_RAMPS4DUE, TARGET_LPC1768)
-  #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
-    #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
-  #endif
-#endif
+#define BOARD_NAME "Z-Bolt X Series"
 
 //
 // Servos