diff --git a/Marlin/boards.h b/Marlin/boards.h
index c63651950fd0bb0f4d3cab909e152aa107879bbe..2f1107b45b8a17bee167b9791a1345ac02865dca 100644
--- a/Marlin/boards.h
+++ b/Marlin/boards.h
@@ -50,12 +50,11 @@
#define BOARD_LEAPFROG 999 // Leapfrog
#define BOARD_WITBOX 41 // bq WITBOX
#define BOARD_HEPHESTOS 42 // bq Prusa i3 Hephestos
-#define BOARD_BAM_DICE 401 // 2PrintBeta BAM&DICE with STK drivers
-#define BOARD_BAM_DICE_DUE 402 // 2PrintBeta BAM&DICE Due with STK drivers and Arduino Mega
+#define BOARD_BAM_DICE 401 // 2PrintBeta BAM&DICE with STK drivers
+#define BOARD_BAM_DICE_DUE 402 // 2PrintBeta BAM&DICE Due with STK drivers
#define BOARD_99 99 // This is in pins.h but...?
#define MB(board) (MOTHERBOARD==BOARD_##board)
-#define IS_RAMPS (MB(RAMPS_OLD) || MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(BAM_DICE) )
#endif //__BOARDS_H
diff --git a/Marlin/pins.h b/Marlin/pins.h
index ecee6c0acdcc0566a9dfb7ef09fe572d615fd6b8..c33fa24e05ac3aefbcd012f76e5e678d4ede930d 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -36,7 +36,7 @@
#include "pins_SETHI.h"
#elif MB(RAMPS_OLD)
#include "pins_RAMPS_OLD.h"
-#elif IS_RAMPS
+#elif MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF)
#include "pins_RAMPS_13.h"
#elif MB(DUEMILANOVE_328P)
#include "pins_DUEMILANOVE_328P.h"
@@ -110,6 +110,8 @@
#include "pins_WITBOX.h"
#elif MB(HEPHESTOS)
#include "pins_HEPHESTOS.h"
+#elif MB(BAM_DICE)
+ #include "pins_RAMPS_13.h"
#elif MB(BAM_DICE_DUE)
#include "pins_BAM_DICE_DUE.h"
#elif MB(99)
diff --git a/Marlin/pins_AZTEEG_X3.h b/Marlin/pins_AZTEEG_X3.h
index 7eb8eae49a4490fd97327bf75ac2c4d64657167c..d346e0bd208d74a7a8198397a09c0e93131dee0e 100644
--- a/Marlin/pins_AZTEEG_X3.h
+++ b/Marlin/pins_AZTEEG_X3.h
@@ -3,3 +3,11 @@
*/
#include "pins_RAMPS_13.h"
+
+#define FAN_PIN 9 // (Sprinter config)
+#define HEATER_1_PIN -1
+
+#ifdef TEMP_STAT_LEDS
+ #define STAT_LED_RED 6
+ #define STAT_LED_BLUE 11
+#endif
diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h
index ddb055ad9155bcd98ce06487a6ca72ce547b200f..5d0d70db63f18020174a97065ff73fa757b84021 100644
--- a/Marlin/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/pins_AZTEEG_X3_PRO.h
@@ -4,6 +4,9 @@
#include "pins_RAMPS_13.h"
+#define FAN_PIN 9 // (Sprinter config)
+#define BEEPER 33
+
#define E2_STEP_PIN 23
#define E2_DIR_PIN 25
#define E2_ENABLE_PIN 40
@@ -16,15 +19,16 @@
#define E4_DIR_PIN 37
#define E4_ENABLE_PIN 42
+#define HEATER_1_PIN -1
#define HEATER_2_PIN 16
#define HEATER_3_PIN 17
-#define HEATER_4_PIN 4
-#define HEATER_5_PIN 5
-#define HEATER_6_PIN 6
+#define HEATER_4_PIN 4
+#define HEATER_5_PIN 5
+#define HEATER_6_PIN 6
#define HEATER_7_PIN 11
#define TEMP_2_PIN 12 // ANALOG NUMBERING
#define TEMP_3_PIN 11 // ANALOG NUMBERING
#define TEMP_4_PIN 10 // ANALOG NUMBERING
-#define TC1 4 // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
-#define TC2 5 // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
+#define TC1 4 // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
+#define TC2 5 // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
diff --git a/Marlin/pins_BAM_DICE_DUE.h b/Marlin/pins_BAM_DICE_DUE.h
index f9ca27ef7432401afda0e74d5f3ce6673606d121..c3123d043cff4a29fb59ad1a790966743b1b87b6 100644
--- a/Marlin/pins_BAM_DICE_DUE.h
+++ b/Marlin/pins_BAM_DICE_DUE.h
@@ -1,183 +1,11 @@
/**
- * Arduino Mega with BAM&DICE DUE pin assignments
- *
- * Applies to the following boards:
- *
- * BAM&DICE Due with Arduino Mega
+ * BAM&DICE Due (Arduino Mega) pin assignments
*/
-#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
- #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
-#endif
-
-#define LARGE_FLASH true
-
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
-#define X_MIN_PIN 3
-#define X_MAX_PIN 2
-
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
-#define Y_MIN_PIN 14
-#define Y_MAX_PIN 15
-
-#define Z_STEP_PIN 46
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 62
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
-
-#define Y2_STEP_PIN 36
-#define Y2_DIR_PIN 34
-#define Y2_ENABLE_PIN 30
-
-#define Z2_STEP_PIN 36
-#define Z2_DIR_PIN 34
-#define Z2_ENABLE_PIN 30
-
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
-
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
-
-#define SDPOWER -1
-#define SDSS 53
-#define LED_PIN 13
-
-#define FAN_PIN 9 // (Sprinter config)
-
-#define PS_ON_PIN 12
-
-#if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL)
- #define KILL_PIN 41
-#else
- #define KILL_PIN -1
-#endif
-
-#define HEATER_0_PIN 10
+#include "pins_RAMPS_13.h"
+#define FAN_PIN 9 // (Sprinter config)
#define HEATER_1_PIN -1
-#define HEATER_2_PIN -1
-
-#define TEMP_0_PIN 9 // ANALOG NUMBERING
-#define TEMP_1_PIN 11 // ANALOG NUMBERING
-#define TEMP_2_PIN -1 // ANALOG NUMBERING
-
-#define HEATER_BED_PIN 8 // BED
-
-#define TEMP_BED_PIN 14 // ANALOG NUMBERING
-
-#ifdef NUM_SERVOS
- #define SERVO0_PIN 11
-
- #if NUM_SERVOS > 1
- #define SERVO1_PIN 6
- #endif
-
- #if NUM_SERVOS > 2
- #define SERVO2_PIN 5
- #endif
-
- #if NUM_SERVOS > 3
- #define SERVO3_PIN 4
- #endif
-#endif
-
-
-#ifdef ULTRA_LCD
-
- #ifdef NEWPANEL
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
- #define LCD_PINS_D7 29
-
- #ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
- #define BEEPER 37
-
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
-
- #define SDCARDDETECT 49
- #elif defined(LCD_I2C_PANELOLU2)
- #define BTN_EN1 47 // reverse if the encoder turns the wrong way.
- #define BTN_EN2 43
- #define BTN_ENC 32
- #define LCD_SDSS 53
- #define SDCARDDETECT -1
- #define KILL_PIN 41
- #elif defined(LCD_I2C_VIKI)
- #define BTN_EN1 22 // reverse if the encoder turns the wrong way.
- #define BTN_EN2 7
- #define BTN_ENC -1
- #define LCD_SDSS 53
- #define SDCARDDETECT 49
- #else
- // arduino pin which triggers an piezzo beeper
- #define BEEPER 33 // Beeper on AUX-4
-
- // buttons are directly attached using AUX-2
- #ifdef REPRAPWORLD_KEYPAD
- #define BTN_EN1 64 // encoder
- #define BTN_EN2 59 // encoder
- #define BTN_ENC 63 // enter button
- #define SHIFT_OUT 40 // shift register
- #define SHIFT_CLK 44 // shift register
- #define SHIFT_LD 42 // shift register
- #else
- #define BTN_EN1 37
- #define BTN_EN2 35
- #define BTN_ENC 31 // the click
- #endif
-
- #ifdef G3D_PANEL
- #define SDCARDDETECT 49
- #else
- #define SDCARDDETECT -1 // Ramps does not use this port
- #endif
-
- #endif
-
- #else // Old-style panel with shift register
- // Arduino pin witch triggers an piezzo beeper
- #define BEEPER 33 // No Beeper added
-
- // Buttons are attached to a shift register
- // Not wired yet
- // #define SHIFT_CLK 38
- // #define SHIFT_LD 42
- // #define SHIFT_OUT 40
- // #define SHIFT_EN 17
-
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
- #define LCD_PINS_D7 29
- #endif
-#endif // ULTRA_LCD
-
-// SPI for Max6675 Thermocouple
-#ifndef SDSUPPORT
- #define MAX6675_SS 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
-#else
- #define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
-#endif
-
-#ifndef SDSUPPORT
- // these pins are defined in the SD library if building with SD support
- #define SCK_PIN 52
- #define MISO_PIN 50
- #define MOSI_PIN 51
-#endif
+#define TEMP_0_PIN 9 // ANALOG NUMBERING
+#define TEMP_1_PIN 11 // ANALOG NUMBERING
diff --git a/Marlin/pins_HEPHESTOS.h b/Marlin/pins_HEPHESTOS.h
index c5b7bcf7996f36861a8b0240b48c1a7197b89607..8fc5ba6433000e6f63a088b6e5a4675902d9689d 100644
--- a/Marlin/pins_HEPHESTOS.h
+++ b/Marlin/pins_HEPHESTOS.h
@@ -3,3 +3,6 @@
*/
#include "pins_RAMPS_13.h"
+
+#define FAN_PIN 9 // (Sprinter config)
+#define HEATER_1_PIN -1
diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h
index e2f74fc834f82542981317684d3bd3a0887f7c73..840804a9d16daa863e8825047896fccbef74fce7 100644
--- a/Marlin/pins_RAMPS_13.h
+++ b/Marlin/pins_RAMPS_13.h
@@ -7,10 +7,8 @@
* RAMPS_13_EEB (Extruder, Extruder, Bed)
* RAMPS_13_EFF (Extruder, Fan, Fan)
* RAMPS_13_EEF (Extruder, Extruder, Fan)
- * 3DRAG
- * K8200
- * AZTEEG_X3
- * AZTEEG_X3_PRO
+ *
+ * Other pins_MYBOARD.h files may override these defaults
*/
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
@@ -63,7 +61,7 @@
#define FILWIDTH_PIN 5
#endif
-#if MB(RAMPS_13_EFB) || MB(RAMPS_13_EFF) || MB(AZTEEG_X3) || MB(AZTEEG_X3_PRO) || MB(WITBOX) || MB(HEPHESTOS)
+#if MB(RAMPS_13_EFB) || MB(RAMPS_13_EFF)
#define FAN_PIN 9 // (Sprinter config)
#if MB(RAMPS_13_EFF)
#define CONTROLLERFAN_PIN -1 // Pin used for the fan to cool controller
@@ -88,7 +86,7 @@
#define HEATER_0_PIN 10 // EXTRUDER 1
#endif
-#if MB(RAMPS_13_EFB) || MB(AZTEEG_X3) || MB(WITBOX) || MB(HEPHESTOS)
+#if MB(RAMPS_13_EFB)
#define HEATER_1_PIN -1
#else
#define HEATER_1_PIN 9 // EXTRUDER 2 (FAN On Sprinter)
@@ -110,28 +108,14 @@
#ifdef NUM_SERVOS
#define SERVO0_PIN 11
-
#if NUM_SERVOS > 1
- #define SERVO1_PIN 6
- #endif
-
- #if NUM_SERVOS > 2
- #define SERVO2_PIN 5
- #endif
-
- #if NUM_SERVOS > 3
- #define SERVO3_PIN 4
- #endif
-#endif
-
-#if MB(AZTEEG_X3_PRO)
- #define BEEPER 33
-#endif
-
-#ifdef TEMP_STAT_LEDS
- #if MB(AZTEEG_X3)
- #define STAT_LED_RED 6
- #define STAT_LED_BLUE 11
+ #define SERVO1_PIN 6
+ #if NUM_SERVOS > 2
+ #define SERVO2_PIN 5
+ #if NUM_SERVOS > 3
+ #define SERVO3_PIN 4
+ #endif
+ #endif
#endif
#endif
diff --git a/Marlin/pins_WITBOX.h b/Marlin/pins_WITBOX.h
index 4deda2cbab65d578c91f986f6088eba3414e9e95..a4eb0e31329f5817e9f67bfc3497c39f93a19c4d 100644
--- a/Marlin/pins_WITBOX.h
+++ b/Marlin/pins_WITBOX.h
@@ -3,3 +3,6 @@
*/
#include "pins_RAMPS_13.h"
+
+#define FAN_PIN 9 // (Sprinter config)
+#define HEATER_1_PIN -1