Consistent order/formatting of pins files

Marlin/pins_3DRAG.h

@@ -42,20 +42,35 @@
 
 #include "pins_RAMPS.h"
 
-#define HEATER_2_PIN       6
+//
+// Limit Switches
+//
+#undef Z_MAX_PIN
+#define Z_MAX_PIN          -1
 
+//
+// Steppers
+//
 #undef Z_ENABLE_PIN
 #define Z_ENABLE_PIN       63
 
-#undef Z_MAX_PIN
-#define Z_MAX_PIN          -1
-
+//
+// SD Card
+//
 #undef SDSS
 #define SDSS               25//53
 
+//
+// Heaters / Fans
+//
+#define HEATER_2_PIN        6
+
+//
+// LCD / Controller
+//
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
   #undef BEEPER_PIN
-  #define BEEPER_PIN -1
+  #define BEEPER_PIN       -1
 
   #undef LCD_PINS_RS
   #undef LCD_PINS_ENABLE
@@ -63,23 +78,23 @@
   #undef LCD_PINS_D5
   #undef LCD_PINS_D6
   #undef LCD_PINS_D7
-  #define LCD_PINS_RS 27
-  #define LCD_PINS_ENABLE 29
-  #define LCD_PINS_D4 37
-  #define LCD_PINS_D5 35
-  #define LCD_PINS_D6 33
-  #define LCD_PINS_D7 31
+  #define LCD_PINS_RS      27
+  #define LCD_PINS_ENABLE  29
+  #define LCD_PINS_D4      37
+  #define LCD_PINS_D5      35
+  #define LCD_PINS_D6      33
+  #define LCD_PINS_D7      31
 
   // Buttons
   #undef BTN_EN1
   #undef BTN_EN2
   #undef BTN_ENC
-  #define BTN_EN1 16
-  #define BTN_EN2 17
-  #define BTN_ENC 23
+  #define BTN_EN1          16
+  #define BTN_EN2          17
+  #define BTN_ENC          23
 
 #else
 
-  #define BEEPER_PIN 33
+  #define BEEPER_PIN       33
 
 #endif // ULTRA_LCD && NEWPANEL

Marlin/pins_5DPRINT.h

@@ -35,45 +35,59 @@
 
 #define LARGE_FLASH        true
 
+//
+// Limit Switches
+//
+#define X_STOP_PIN         37
+#define Y_STOP_PIN         36
+#define Z_STOP_PIN         39
+
+//
+// Steppers
+//
 #define X_STEP_PIN          0
 #define X_DIR_PIN           1
 #define X_ENABLE_PIN       23
-#define X_STOP_PIN         37
 
 #define Y_STEP_PIN          2
 #define Y_DIR_PIN           3
 #define Y_ENABLE_PIN       19
-#define Y_STOP_PIN         36
 
 #define Z_STEP_PIN          4
 #define Z_DIR_PIN           5
 #define Z_ENABLE_PIN       18
-#define Z_STOP_PIN         39
 
 #define E0_STEP_PIN         6
 #define E0_DIR_PIN          7
 #define E0_ENABLE_PIN      17
 
-#define HEATER_0_PIN       21  // Extruder
-#define HEATER_BED_PIN     20  // Bed
+// Microstepping pins - Mapping not from fastio.h (?)
+#define X_MS1_PIN          25
+#define X_MS2_PIN          26
+#define Y_MS1_PIN           9
+#define Y_MS2_PIN           8
+#define Z_MS1_PIN           7
+#define Z_MS2_PIN           6
+#define E0_MS1_PIN          5
+#define E0_MS2_PIN          4
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          1  // Analog
+#define TEMP_BED_PIN        0  // Analog
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN       21
+#define HEATER_BED_PIN     20
+
 // You may need to change FAN_PIN to 16 because Marlin isn't using fastio.h
 // for the fan and Teensyduino uses a different pin mapping.
-#define FAN_PIN            16  // Fan
-
-#define TEMP_0_PIN          1  // Extruder / Analog pin numbering
-#define TEMP_BED_PIN        0  // Bed / Analog pin numbering
+#define FAN_PIN            16
 
-// The SDSS pin uses a different pin mapping from file fastio.h
+//
+// SD Card
+//
 #define SDSS               20
-
-// Microstepping pins
-// Note that the pin mapping is not from fastio.h
-// See Sd2PinMap.h for the pin configurations ???
-#define X_MS1_PIN 25
-#define X_MS2_PIN 26
-#define Y_MS1_PIN 9
-#define Y_MS2_PIN 8
-#define Z_MS1_PIN 7
-#define Z_MS2_PIN 6
-#define E0_MS1_PIN 5
-#define E0_MS2_PIN 4

Marlin/pins_99.h

@@ -23,31 +23,46 @@
 /**
  * Board 99 pin assignments
  */
+
 #define BOARD_NAME          "99 Unknown"
- 
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN         16
+#define Y_STOP_PIN         67
+#define Z_STOP_PIN         59
+
+//
+// Steppers
+//
 #define X_STEP_PIN          2
 #define X_DIR_PIN           3
-#define X_ENABLE_PIN        -1
-#define X_STOP_PIN          16
+#define X_ENABLE_PIN       -1
 
 #define Y_STEP_PIN          5
 #define Y_DIR_PIN           6
 #define Y_ENABLE_PIN       -1
-#define Y_STOP_PIN          67
 
-#define Z_STEP_PIN          62
-#define Z_DIR_PIN           63
+#define Z_STEP_PIN         62
+#define Z_DIR_PIN          63
 #define Z_ENABLE_PIN       -1
-#define Z_STOP_PIN          59
 
-#define E0_STEP_PIN         65
-#define E0_DIR_PIN          66
+#define E0_STEP_PIN        65
+#define E0_DIR_PIN         66
 #define E0_ENABLE_PIN      -1
 
-#define SDSS               53
-#define PS_ON_PIN           9
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          6   // ANALOG INPUT - NOT DIGITAL OUTPUT
+#define TEMP_BED_PIN       10
 
-#define HEATER_0_PIN        13
-#define TEMP_0_PIN          6   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN       13
 #define HEATER_BED_PIN      4
-#define TEMP_BED_PIN       10
+
+#define SDSS               53
+#define PS_ON_PIN           9

Marlin/pins_A4JP.h

@@ -30,39 +30,15 @@
 
 #define BOARD_NAME "AJ4P"
 
-// Servo support
+//
+// Servos
+//
 #define SERVO0_PIN 22 // Motor header MX1
 #define SERVO1_PIN 23 // Motor header MX2
 #define SERVO2_PIN 24 // Motor header MX3
 #define SERVO3_PIN  5 // PWM header pin 5
 
-#if ENABLED(Z_PROBE_SLED)
-  #define SLED_PIN -1
-#endif
-
-//Fan_2 2
-
-/*****************
-#if ENABLED(ULTRA_LCD)
-
-  #define KILL_PIN -1 //was 80 Glen maybe a mistake
-
-#endif // ULTRA_LCD */
-
-#if ENABLED(VIKI2) || ENABLED(miniVIKI)
-  #define BEEPER_PIN 44
-  // Pins for DOGM SPI LCD Support
-  #define DOGLCD_A0  70
-  #define DOGLCD_CS  71
-  #define LCD_SCREEN_ROT_180
-
-  #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
-
-  #if ENABLED(TEMP_STAT_LEDS)
-    #define STAT_LED_RED      22
-    #define STAT_LED_BLUE     32
-  #endif
-#endif // VIKI2/miniVIKI
+#define SLED_PIN -1
 
 #define FILWIDTH_PIN        3  // ANALOG NUMBERING
 
@@ -71,57 +47,81 @@
  ************************************************/
 
 #define LARGE_FLASH true
-#define X_STEP_PIN    37
-#define X_DIR_PIN     48
-#define X_MIN_PIN     12
-#define X_MAX_PIN     24
-#define X_ENABLE_PIN  29
-#define X_MS1_PIN     40
-#define X_MS2_PIN     41
-#define Y_STEP_PIN    36
-#define Y_DIR_PIN     49
-#define Y_MIN_PIN     11
-#define Y_MAX_PIN     23
-#define Y_ENABLE_PIN  28
-#define Y_MS1_PIN     69
-#define Y_MS2_PIN     39
-#define Z_STEP_PIN    35
-#define Z_DIR_PIN     47
-#define Z_MIN_PIN     10
-#define Z_MAX_PIN     30
-#define Z_ENABLE_PIN  27
-#define Z_MS1_PIN     68
-#define Z_MS2_PIN     67
 
-#define HEATER_BED_PIN 3
-#define TEMP_BED_PIN   7 //2014/02/04  0:T0 / 1:T1 / 2:T2 / 7:T3
+//
+// Limit Switches
+//
+#define X_MIN_PIN           12
+#define X_MAX_PIN           24
+#define Y_MIN_PIN           11
+#define Y_MAX_PIN           23
+#define Z_MIN_PIN           10
+#define Z_MAX_PIN           30
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN   30
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN          37
+#define X_DIR_PIN           48
+#define X_ENABLE_PIN        29
+#define X_MS1_PIN           40
+#define X_MS2_PIN           41
+
+#define Y_STEP_PIN          36
+#define Y_DIR_PIN           49
+#define Y_ENABLE_PIN        28
+#define Y_MS1_PIN           69
+#define Y_MS2_PIN           39
+
+#define Z_STEP_PIN          35
+#define Z_DIR_PIN           47
+#define Z_ENABLE_PIN        27
+#define Z_MS1_PIN           68
+#define Z_MS2_PIN           67
+
+#define E0_STEP_PIN         34
+#define E0_DIR_PIN          43
+#define E0_ENABLE_PIN       26
+#define E0_MS1_PIN          65
+#define E0_MS2_PIN          66
+
+#define E1_STEP_PIN         33
+#define E1_DIR_PIN          42
+#define E1_ENABLE_PIN       25
+#define E1_MS1_PIN          63
+#define E1_MS2_PIN          64
+
+#define DIGIPOTSS_PIN       38
+#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
+
+//
+// Heaters / Fans
+//
 #define HEATER_0_PIN   9
-#define TEMP_0_PIN     0
 #define HEATER_1_PIN   7
+#define HEATER_BED_PIN 3
 
-#define E0_STEP_PIN   34
-#define E0_DIR_PIN    43
-#define E0_ENABLE_PIN 26
-#define E0_MS1_PIN    65
-#define E0_MS2_PIN    66
-#define E1_STEP_PIN   33
-#define E1_DIR_PIN    42
-#define E1_ENABLE_PIN 25
-#define E1_MS1_PIN    63
-#define E1_MS2_PIN    64
-
-#define DIGIPOTSS_PIN 38
-#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
+#define FAN_PIN        8
+#define FAN0_PIN       6
+#define FAN1_PIN       2
+
+#define TEMP_0_PIN     0
+#define TEMP_BED_PIN   7
 
 #define SDSS          53
 #define LED_PIN       13
-#define FAN_PIN        8
 #define PS_ON_PIN      4
-#define FAN_0_PIN      6 //Glen
-#define FAN_1_PIN      2 //Glen
-
-// 2015/12/23
 
+//
+// LCD / Controller
+//
 #define LCD_PINS_RS     70 //ext2_5
 #define LCD_PINS_ENABLE 71 //ext2_7
 #define LCD_PINS_D4     72 ///////Ext2 9 ?
@@ -139,3 +139,18 @@
 #define BTN_DOWN        85 //ext2_6
 
 #define HOME_PIN        BTN_HOME
+
+#if ENABLED(VIKI2) || ENABLED(miniVIKI)
+  #define BEEPER_PIN 44
+  // Pins for DOGM SPI LCD Support
+  #define DOGLCD_A0  70
+  #define DOGLCD_CS  71
+  #define LCD_SCREEN_ROT_180
+
+  #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
+
+  #if ENABLED(TEMP_STAT_LEDS)
+    #define STAT_LED_RED      22
+    #define STAT_LED_BLUE     32
+  #endif
+#endif // VIKI2/miniVIKI

Marlin/pins_AZTEEG_X3_PRO.h

@@ -28,21 +28,16 @@
 
 #include "pins_RAMPS.h"
 
-#undef FAN_PIN
-#define FAN_PIN             6 //Part Cooling System
+//
+// Tested this pin with bed leveling on a Delta with 1 servo.
+// Physical wire attachment on EXT1: GND, 5V, D47.
+//
+#undef SERVO0_PIN
+#define SERVO0_PIN         47
 
-#undef BEEPER_PIN
-#define BEEPER_PIN         33
-#define CONTROLLERFAN_PIN   4 //Pin used for the fan to cool motherboard (-1 to disable)
-//Fans/Water Pump to cool the hotend cool side.
-#define EXTRUDER_0_AUTO_FAN_PIN   5
-#define EXTRUDER_1_AUTO_FAN_PIN   5
-#define EXTRUDER_2_AUTO_FAN_PIN   5
-#define EXTRUDER_3_AUTO_FAN_PIN   5
 //
-//This section is to swap the MIN and MAX pins because the X3 Pro comes with only
-//MIN endstops soldered onto the board. Delta code wants the homing endstops to be
-//the MAX so I swapped them here.
+// Swap the MIN and MAX endstop pins because the X3 Pro comes with only
+// MIN endstop pin headers soldered onto the board.
 //
 #if ENABLED(DELTA)
   #undef X_MIN_PIN
@@ -60,10 +55,16 @@
   #define Z_MAX_PIN        18
 #endif
 
+//
+// Z Probe (when not Z_MIN_PIN)
+//
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN  18
 #endif
 
+//
+// Steppers
+//
 #define E2_STEP_PIN        23
 #define E2_DIR_PIN         25
 #define E2_ENABLE_PIN      40
@@ -76,10 +77,18 @@
 #define E4_DIR_PIN         37
 #define E4_ENABLE_PIN      42
 
-#undef HEATER_1_PIN
-#undef HEATER_2_PIN
-#undef HEATER_3_PIN
-#define HEATER_1_PIN        9
+//
+// Temperature Sensors
+//
+#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
+
+//
+// Heaters / Fans
+//
 #define HEATER_2_PIN       16
 #define HEATER_3_PIN       17
 #define HEATER_4_PIN        4
@@ -87,26 +96,27 @@
 #define HEATER_6_PIN        6
 #define HEATER_7_PIN       11
 
-#undef TEMP_2_PIN
-#undef TEMP_3_PIN
-#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
+#undef FAN_PIN
+#define FAN_PIN             6 //Part Cooling System
+
+#define CONTROLLERFAN_PIN   4 //Pin used for the fan to cool motherboard (-1 to disable)
+
+// Fans/Water Pump to cool the hotend cool side.
+#define EXTRUDER_0_AUTO_FAN_PIN   5
+#define EXTRUDER_1_AUTO_FAN_PIN   5
+#define EXTRUDER_2_AUTO_FAN_PIN   5
+#define EXTRUDER_3_AUTO_FAN_PIN   5
 
 //
-// These Servo pins are for when they are defined. Tested for usage with bed leveling
-// on a Delta with 1 servo. Running through the Z servo endstop in code.
-// Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins.
+// LCD / Controller
 //
-#undef SERVO0_PIN
-#define SERVO0_PIN         47
+#undef BEEPER_PIN
+#define BEEPER_PIN         33
 
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN 49  // For easy adapter board
-#elif ENABLED(TEMP_STAT_LEDS)
-  #define STAT_LED_RED   32
-  #define STAT_LED_BLUE  35
+  #define SD_DETECT_PIN    49 // For easy adapter board
+#else
+  #define STAT_LED_RED     32
+  #define STAT_LED_BLUE    35
 #endif

Marlin/pins_BRAINWAVE.h

@@ -33,22 +33,29 @@
 
 #define BOARD_NAME         "Brainwave"
 
+//
+// Limit Switches
+//
+#define X_STOP_PIN          7
+#define Y_STOP_PIN          6
+#define Z_STOP_PIN          5
+
+//
+// Steppers
+//
 #define X_STEP_PIN         27
 #define X_DIR_PIN          29
 #define X_ENABLE_PIN       28
-#define X_STOP_PIN          7
 #define X_ATT_PIN          26
 
 #define Y_STEP_PIN         31
 #define Y_DIR_PIN          33
 #define Y_ENABLE_PIN       32
-#define Y_STOP_PIN          6
 #define Y_ATT_PIN          30
 
 #define Z_STEP_PIN         17
 #define Z_DIR_PIN          19
 #define Z_ENABLE_PIN       18
-#define Z_STOP_PIN          5
 #define Z_ATT_PIN          16
 
 #define E0_STEP_PIN        21
@@ -56,11 +63,17 @@
 #define E0_ENABLE_PIN      22
 #define E0_ATT_PIN         20
 
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          7  // Extruder / Analog pin numbering
+#define TEMP_BED_PIN        6  // Bed / Analog pin numbering
+
+//
+// Heaters / Fans
+//
 #define HEATER_0_PIN        4  // Extruder
 #define HEATER_BED_PIN     38  // Bed
 #define FAN_PIN             3  // Fan
 
-#define TEMP_0_PIN          7  // Extruder / Analog pin numbering
-#define TEMP_BED_PIN        6  // Bed / Analog pin numbering
-
 #define LED_PIN            39

Marlin/pins_BRAINWAVE_PRO.h

@@ -41,13 +41,23 @@
 
 #define LARGE_FLASH        true
 
+//
+// Limit Switches
+//
 #define X_STOP_PIN         47
 #define Y_STOP_PIN         18
 #define Z_MAX_PIN          36
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
 #ifndef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN  17
 #endif
 
+//
+// Steppers
+//
 #define X_STEP_PIN         33
 #define X_DIR_PIN          32
 #define X_ENABLE_PIN       11
@@ -64,14 +74,24 @@
 #define E0_DIR_PIN         34
 #define E0_ENABLE_PIN      13
 
-#define HEATER_0_PIN       15
-#define HEATER_BED_PIN     14  // Bed
-#define FAN_PIN            16  // Fan, PWM
-
+//
+// Temperature Sensors
+//
 #define TEMP_0_PIN          2  // Extruder / Analog pin numbering
 #define TEMP_1_PIN          1  // Spare / Analog pin numbering
 #define TEMP_BED_PIN        0  // Bed / Analog pin numbering
 
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN       15
+#define HEATER_BED_PIN     14  // Bed
+#define FAN_PIN            16  // Fan, PWM
+
+//
+// LCD / Controller
+//
 #define SDSS               20
-#define LED_PIN            19
 #define SD_DETECT_PIN      12
+
+#define LED_PIN            19

Marlin/pins_CHEAPTRONIC.h

@@ -31,57 +31,59 @@
 #define BOARD_NAME         "Cheaptronic v1.0"
 #define LARGE_FLASH        true
 
-// X motor stepper
-#define X_STEP_PIN 14
-#define X_DIR_PIN 15
-#define X_ENABLE_PIN 24
+//
+// Limit Switches
+//
+#define X_STOP_PIN          3
+#define Y_STOP_PIN          2
+#define Z_STOP_PIN          5
 
-// Y motor stepper
-#define Y_STEP_PIN 35
-#define Y_DIR_PIN 36
-#define Y_ENABLE_PIN 31
+//
+// Steppers
+//
+#define X_STEP_PIN         14
+#define X_DIR_PIN          15
+#define X_ENABLE_PIN       24
 
-// Z motor stepper
-#define Z_STEP_PIN 40
-#define Z_DIR_PIN 41
-#define Z_ENABLE_PIN 37
+#define Y_STEP_PIN         35
+#define Y_DIR_PIN          36
+#define Y_ENABLE_PIN       31
 
-// XYZ endstops
-#define X_STOP_PIN 3
-#define Y_STOP_PIN 2
-#define Z_STOP_PIN 5
+#define Z_STEP_PIN         40
+#define Z_DIR_PIN          41
+#define Z_ENABLE_PIN       37
 
-// Extruder 0 stepper
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 25
+#define E0_STEP_PIN        26
+#define E0_DIR_PIN         28
+#define E0_ENABLE_PIN      25
 
-// Extruder 1 stepper
-#define E1_STEP_PIN 33
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
-
-
-#define HEATER_0_PIN 19 // EXTRUDER 1
-#define HEATER_1_PIN 23 // EXTRUDER 2
-#define HEATER_BED_PIN 22
+#define E1_STEP_PIN        33
+#define E1_DIR_PIN         34
+#define E1_ENABLE_PIN      30
 
+//
 // Temperature sensors
-#define TEMP_0_PIN 15
-#define TEMP_1_PIN 14
-#define TEMP_BED_PIN 13
+//
+#define TEMP_0_PIN         15
+#define TEMP_1_PIN         14
+#define TEMP_BED_PIN       13
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN       19 // EXTRUDER 1
+#define HEATER_1_PIN       23 // EXTRUDER 2
+#define HEATER_BED_PIN     22
 
 // Cheaptronic v1.0 doesn't support LCD
-#define LCD_PINS_RS -1
-#define LCD_PINS_ENABLE -1
-#define LCD_PINS_D4 -1
-#define LCD_PINS_D5 -1
-#define LCD_PINS_D6 -1
-#define LCD_PINS_D7 -1
+#define LCD_PINS_RS        -1
+#define LCD_PINS_ENABLE    -1
+#define LCD_PINS_D4        -1
+#define LCD_PINS_D5        -1
+#define LCD_PINS_D6        -1
+#define LCD_PINS_D7        -1
 
 // Cheaptronic v1.0 doesn't support keypad
-#define BTN_EN1 -1
-#define BTN_EN2 -1
-#define BTN_ENC -1
-
-// Cheaptronic v1.0 doesn't use this
+#define BTN_EN1            -1
+#define BTN_EN2            -1
+#define BTN_ENC            -1

Marlin/pins_CNCONTROLS_11.h

@@ -6,54 +6,65 @@
   #error Oops!  Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
 #endif
 
-#define BOARD_NAME            "CN Controls V11"
+#define BOARD_NAME "CN Controls V11"
 
 //#define LARGE_FLASH true
 
-#define X_ENABLE_PIN          35
-#define X_STEP_PIN            34
-#define X_DIR_PIN             36
-#define X_MIN_PIN             43
-#define X_MAX_PIN             -1
-
-#define Y_ENABLE_PIN          38
-#define Y_STEP_PIN            37
-#define Y_DIR_PIN             39
-#define Y_MIN_PIN             45
-#define Y_MAX_PIN             -1
-
-#define Z_ENABLE_PIN          41
-#define Z_STEP_PIN            40
-#define Z_DIR_PIN             48
-#define Z_MIN_PIN             42
-#define Z_MAX_PIN             -1
-
-#define E0_ENABLE_PIN          3
-#define E0_STEP_PIN           29
-#define E0_DIR_PIN            28
-#define HEATER_0_PIN           5
-#define TEMP_0_PIN             0  // ANALOG INPUT !!
-
-#define E1_ENABLE_PIN         60
-#define E1_STEP_PIN           61
-#define E1_DIR_PIN            62
-#define HEATER_1_PIN          58
-#define TEMP_1_PIN             3  // 3 for tool2 -> 2 for chambertemp
-
-#define E2_ENABLE_PIN         16
-#define E2_STEP_PIN           15
-#define E2_DIR_PIN            14
-#define HEATER_2_PIN          64
-#define TEMP_2_PIN             2  // 9 for tool3 -> 2 for chambertemp
-
-#define E3_ENABLE_PIN         47
-#define E3_STEP_PIN           44
-#define E3_DIR_PIN            49
-#define HEATER_3_PIN          46
-#define TEMP_3_PIN            11  // 11 for tool4 -> 2 for chambertemp
-
-#define HEATER_BED_PIN         2
-#define TEMP_BED_PIN           1  // ANALOG INPUT !!
+//
+// Limit Switches
+//
+#define X_STOP_PIN         43
+#define Y_STOP_PIN         45
+#define Z_STOP_PIN         42
+
+//
+// Steppers
+//
+#define X_STEP_PIN         34
+#define X_DIR_PIN          36
+#define X_ENABLE_PIN       35
+
+#define Y_STEP_PIN         37
+#define Y_DIR_PIN          39
+#define Y_ENABLE_PIN       38
+
+#define Z_STEP_PIN         40
+#define Z_DIR_PIN          48
+#define Z_ENABLE_PIN       41
+
+#define E0_STEP_PIN        29
+#define E0_DIR_PIN         28
+#define E0_ENABLE_PIN       3
+
+#define E1_STEP_PIN        61
+#define E1_DIR_PIN         62
+#define E1_ENABLE_PIN      60
+
+#define E2_STEP_PIN        15
+#define E2_DIR_PIN         14
+#define E2_ENABLE_PIN      16
+
+#define E3_STEP_PIN        44
+#define E3_DIR_PIN         49
+#define E3_ENABLE_PIN      47
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          0  // ANALOG INPUT !!
+#define TEMP_1_PIN          3  // 3 for tool2 -> 2 for chambertemp
+#define TEMP_2_PIN          2  // 9 for tool3 -> 2 for chambertemp
+#define TEMP_3_PIN         11  // 11 for tool4 -> 2 for chambertemp
+#define TEMP_BED_PIN        1  // ANALOG INPUT !!
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        5
+#define HEATER_1_PIN       58
+#define HEATER_2_PIN       64
+#define HEATER_3_PIN       46
+#define HEATER_BED_PIN      2
 
 // Tools
 
@@ -72,30 +83,37 @@
 //#define SPARE_IO            12
 //#define FAN_PIN              7  // common PWM pin for all tools
 
-// User interface
-#define BEEPER_PIN             6
+//
+// SD Card
+//
+#define SDSS               53
+#define SD_DETECT_PIN      13
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN          6
 
 // Pins for DOGM SPI LCD Support
-#define DOGLCD_A0             26
-#define DOGLCD_CS             24
-#define DOGLCD_MOSI           -1
-#define DOGLCD_SCK            -1
+#define DOGLCD_A0          26
+#define DOGLCD_CS          24
+#define DOGLCD_MOSI        -1
+#define DOGLCD_SCK         -1
 
-// The encoder and click button
-#define BTN_EN1               23
-#define BTN_EN2               25
-#define BTN_ENC               27
+#define BTN_EN1            23
+#define BTN_EN2            25
+#define BTN_ENC            27
 
 // Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT             19
-#define SHIFT_LD              18
-#define SHIFT_CLK             17
-
-//#define UI1                 31
-//#define UI2                 22
-
-// Other
-#define SDSS                  53
-#define SD_DETECT_PIN         13
-#define STAT_LED_BLUE         -1
-#define STAT_LED_RED          31
+#define SHIFT_OUT          19
+#define SHIFT_LD           18
+#define SHIFT_CLK          17
+
+//#define UI1                31
+//#define UI2                22
+
+//
+// Misc. Functions
+//
+#define STAT_LED_BLUE      -1
+#define STAT_LED_RED       31

Marlin/pins_CNCONTROLS_12.h

@@ -10,96 +10,115 @@
 
 //#define LARGE_FLASH true
 
-#define X_ENABLE_PIN          26
-#define X_STEP_PIN            25
-#define X_DIR_PIN             27
-#define X_MIN_PIN             19
-#define X_MAX_PIN             -1
-
-#define Y_ENABLE_PIN          29
-#define Y_STEP_PIN            28
-#define Y_DIR_PIN             30
-#define Y_MIN_PIN             22
-#define Y_MAX_PIN             -1
-
-#define Z_ENABLE_PIN          32
-#define Z_STEP_PIN            31
-#define Z_DIR_PIN             33
-#define Z_MIN_PIN             23
-#define Z_MAX_PIN             -1
-
-#define E0_ENABLE_PIN         58
-#define E0_STEP_PIN           57
-#define E0_DIR_PIN            55
-#define HEATER_0_PIN          11
-#define TEMP_0_PIN             0  // ANALOG INPUT !!
-
-#define E1_ENABLE_PIN         60
-#define E1_STEP_PIN           61
-#define E1_DIR_PIN            62
-#define HEATER_1_PIN           9
-#define TEMP_1_PIN             9  // 9 for tool2 -> 13 for chambertemp
-
-#define E2_ENABLE_PIN         44
-#define E2_STEP_PIN           46
-#define E2_DIR_PIN            66
-#define HEATER_2_PIN           6
-#define TEMP_2_PIN            13  // 10 for tool3 -> 13 for chambertemp
-
-#define E3_ENABLE_PIN         47
-#define E3_STEP_PIN           45
-#define E3_DIR_PIN            69
-#define HEATER_3_PIN           3
-#define TEMP_3_PIN            11  // 11 for tool4 -> 13 for chambertemp
-
-#define HEATER_BED_PIN        24
-#define TEMP_BED_PIN          14  // ANALOG INPUT !!
+//
+// Limit Switches
+//
+#define X_STOP_PIN         19
+#define Y_STOP_PIN         22
+#define Z_STOP_PIN         23
+
+//
+// Steppers
+//
+#define X_STEP_PIN         25
+#define X_DIR_PIN          27
+#define X_ENABLE_PIN       26
+
+#define Y_STEP_PIN         28
+#define Y_DIR_PIN          30
+#define Y_ENABLE_PIN       29
+
+#define Z_STEP_PIN         31
+#define Z_DIR_PIN          33
+#define Z_ENABLE_PIN       32
+
+#define E0_STEP_PIN        57
+#define E0_DIR_PIN         55
+#define E0_ENABLE_PIN      58
+
+#define E1_STEP_PIN        61
+#define E1_DIR_PIN         62
+#define E1_ENABLE_PIN      60
+
+#define E2_STEP_PIN        46
+#define E2_DIR_PIN         66
+#define E2_ENABLE_PIN      44
+
+#define E3_STEP_PIN        45
+#define E3_DIR_PIN         69
+#define E3_ENABLE_PIN      47
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          0  // ANALOG INPUT !!
+#define TEMP_1_PIN          9  // 9 for tool2 -> 13 for chambertemp
+#define TEMP_2_PIN         13  // 10 for tool3 -> 13 for chambertemp
+#define TEMP_3_PIN         11  // 11 for tool4 -> 13 for chambertemp
+#define TEMP_BED_PIN       14  // ANALOG INPUT !!
+//#define TEMP_CHAMBER_PIN   13  // ANALOG INPUT !!
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN       11
+#define HEATER_1_PIN        9
+#define HEATER_2_PIN        6
+#define HEATER_3_PIN        3
+#define HEATER_BED_PIN     24
+
+#define FAN_PIN             5  // 5 is PWMtool3 -> 7 is common PWM pin for all tools
+
+//#define PWM_1_PIN          12
+//#define PWM_2_PIN          13
+//#define SPARE_IO           17
 
 // Tools
 
-//#define TOOL_0_PIN          56
-//#define TOOL_0_PWM_PIN      10  // red warning led at dual extruder
-//#define TOOL_1_PIN          59
-//#define TOOL_1_PWM_PIN       8  // lights at dual extruder
-//#define TOOL_2_PIN           4
-//#define TOOL_2_PWM_PIN       5
-//#define TOOL_3_PIN          14
-//#define TOOL_3_PWM_PIN       2
+//#define TOOL_0_PIN         56
+//#define TOOL_0_PWM_PIN     10  // red warning led at dual extruder
+//#define TOOL_1_PIN         59
+//#define TOOL_1_PWM_PIN      8  // lights at dual extruder
+//#define TOOL_2_PIN          4
+//#define TOOL_2_PWM_PIN      5
+//#define TOOL_3_PIN         14
+//#define TOOL_3_PWM_PIN      2
 
 // Common I/O
 
-//#define TEMP_CHAMBER_PIN    13  // ANALOG INPUT !!
-#define FIL_RUNOUT_PIN        18
-//#define PWM_1_PIN           12
-//#define PWM_2_PIN           13
-//#define SPARE_IO            17
-#define FAN_PIN                5  // 5 is PWMtool3 -> 7 is common PWM pin for all tools
-
-// User interface
-#define BEEPER_PIN            16
+//
+// LCD / Controller
+//
+#define BEEPER_PIN         16
 
 // Pins for DOGM SPI LCD Support
-#define DOGLCD_A0             39
-#define DOGLCD_CS             35
-#define DOGLCD_MOSI           48
-#define DOGLCD_SCK            49
+#define DOGLCD_A0          39
+#define DOGLCD_CS          35
+#define DOGLCD_MOSI        48
+#define DOGLCD_SCK         49
 #define LCD_SCREEN_ROT_180
 
 // The encoder and click button
-#define BTN_EN1               36
-#define BTN_EN2               34
-#define BTN_ENC               38
+#define BTN_EN1            36
+#define BTN_EN2            34
+#define BTN_ENC            38
 
 // Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT             42
-#define SHIFT_LD              41
-#define SHIFT_CLK             40
+#define SHIFT_OUT          42
+#define SHIFT_LD           41
+#define SHIFT_CLK          40
+
+//#define UI1              43
+//#define UI2              37
+
+#define STAT_LED_BLUE      -1
+#define STAT_LED_RED       10 // TOOL_0_PWM_PIN
 
-//#define UI1                 43
-//#define UI2                 37
+//
+// SD Card
+//
+#define SDSS               53
+#define SD_DETECT_PIN      15
 
 // Other
-#define SDSS                  53
-#define SD_DETECT_PIN         15
-#define STAT_LED_BLUE         -1
-#define STAT_LED_RED          10 // TOOL_0_PWM_PIN
+#define FIL_RUNOUT_PIN     18

Marlin/pins_ELEFU_3.h

@@ -28,58 +28,82 @@
   #error "Oops!  Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
 #endif
 
-#define BOARD_NAME         "Elefu Ra v3"
+#define BOARD_NAME "Elefu Ra v3"
 
+//
+// Limit Switches
+//
+#define X_MIN_PIN          35
+#define X_MAX_PIN          34
+#define Y_MIN_PIN          33
+#define Y_MAX_PIN          32
+#define Z_MIN_PIN          31
+#define Z_MAX_PIN          30
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  30
+#endif
+
+//
+// Steppers
+//
 #define X_STEP_PIN         49
 #define X_DIR_PIN          13
 #define X_ENABLE_PIN       48
-#define X_MIN_PIN          35
-#define X_MAX_PIN          34
 
 #define Y_STEP_PIN         11
 #define Y_DIR_PIN           9
 #define Y_ENABLE_PIN       12
-#define Y_MIN_PIN          33
-#define Y_MAX_PIN          32
 
 #define Z_STEP_PIN          7
 #define Z_DIR_PIN           6
 #define Z_ENABLE_PIN        8
-#define Z_MIN_PIN          31
-#define Z_MAX_PIN          30
-
-#define E2_STEP_PIN        43
-#define E2_DIR_PIN         47
-#define E2_ENABLE_PIN      42
-
-#define E1_STEP_PIN        18
-#define E1_DIR_PIN         19
-#define E1_ENABLE_PIN      38
 
 #define E0_STEP_PIN        40
 #define E0_DIR_PIN         41
 #define E0_ENABLE_PIN      37
 
-#define FAN_PIN            16 //5V PWM
+#define E1_STEP_PIN        18
+#define E1_DIR_PIN         19
+#define E1_ENABLE_PIN      38
 
-#define PS_ON_PIN          10 //Set to -1 if using a manual switch on the PWRSW Connector
-#define SLEEP_WAKE_PIN     26 //This feature still needs work
+#define E2_STEP_PIN        43
+#define E2_DIR_PIN         47
+#define E2_ENABLE_PIN      42
 
-#define HEATER_0_PIN       45 //12V PWM1
-#define HEATER_1_PIN       46 //12V PWM2
-#define HEATER_2_PIN       17 //12V PWM3
-#define HEATER_BED_PIN     44 //DOUBLE 12V PWM
-#define TEMP_0_PIN          3 //ANALOG NUMBERING
-#define TEMP_1_PIN          2 //ANALOG NUMBERING
-#define TEMP_2_PIN          1 //ANALOG NUMBERING
-#define TEMP_BED_PIN        0 //ANALOG NUMBERING
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          3 // ANALOG NUMBERING
+#define TEMP_1_PIN          2 // ANALOG NUMBERING
+#define TEMP_2_PIN          1 // ANALOG NUMBERING
+#define TEMP_BED_PIN        0 // ANALOG NUMBERING
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN       45 // 12V PWM1
+#define HEATER_1_PIN       46 // 12V PWM2
+#define HEATER_2_PIN       17 // 12V PWM3
+#define HEATER_BED_PIN     44 // DOUBLE 12V PWM
+
+#define FAN_PIN            16 // 5V PWM
+
+//
+// Misc. Functions
+//
+#define PS_ON_PIN          10 // Set to -1 if using a manual switch on the PWRSW Connector
+#define SLEEP_WAKE_PIN     26 // This feature still needs work
+#define PHOTOGRAPH_PIN     29
 
+//
+// LCD / Controller
+//
 #define BEEPER_PIN         36
 
-// M240  Triggers a camera by emulating a Canon RC-1 Remote
-// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
-#define PHOTOGRAPH_PIN     29
-
 #if ENABLED(RA_CONTROL_PANEL)
 
   #define SDSS             53

Marlin/pins_GEN3_MONOLITHIC.h

@@ -31,39 +31,45 @@
 #define BOARD_NAME "Gen3 Monolithic"
 #define DEBUG_PIN 0
 
-// x axis
-#define X_STEP_PIN 15
-#define X_DIR_PIN 18
-#define X_MIN_PIN 20
-// Alex Checar #define X_STOP_PIN         20
-#define X_ENABLE_PIN 24 // actually uses Y_enable_pin
-#define X_MAX_PIN -1
+//
+// Limit Switches
+//
+#define X_STOP_PIN         20
+#define Y_STOP_PIN         25
+#define Z_STOP_PIN         30
 
-// y axis
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_MIN_PIN 25
-// Alex Checar #define Y_STOP_PIN         25
-#define Y_ENABLE_PIN 24 // shared with X_enable_pin
-#define Y_MAX_PIN -1
+//
+// Steppers
+//
+#define X_STEP_PIN         15
+#define X_DIR_PIN          18
+#define X_ENABLE_PIN       24 // actually uses Y_enable_pin
 
-// z axis
-#define Z_STEP_PIN 27
-#define Z_DIR_PIN 28
-#define Z_MIN_PIN 30
-// Alex Checar #define Z_STOP_PIN         30
-#define Z_ENABLE_PIN 29
-#define Z_MAX_PIN -1
+#define Y_STEP_PIN         23
+#define Y_DIR_PIN          22
+#define Y_ENABLE_PIN       24 // shared with X_enable_pin
 
-// extruder pins
-#define E0_STEP_PIN         12
-#define E0_DIR_PIN          17
+#define Z_STEP_PIN         27
+#define Z_DIR_PIN          28
+#define Z_ENABLE_PIN       29
+
+#define E0_STEP_PIN        12
+#define E0_DIR_PIN         17
 #define E0_ENABLE_PIN       3
 
-#define HEATER_0_PIN 16
-#define TEMP_0_PIN 0
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          0
+
+//
+// Heaters
+//
+#define HEATER_0_PIN       16
 
-// pin for controlling the PSU.
-#define PS_ON_PIN       14  // Alex, Do this work on the card?
+//
+// Etc.
+//
+#define PS_ON_PIN          14 // Alex, does this work on the card?
 
 // Alex extras from Gen3+

Marlin/pins_GEN3_PLUS.h

@@ -30,31 +30,47 @@
 
 #define BOARD_NAME         "Gen3+"
 
+//
+// Limit Switches
+//
+#define X_STOP_PIN         20
+#define Y_STOP_PIN         25
+#define Z_STOP_PIN         30
+
+//
+// Steppers
+//
 #define X_STEP_PIN         15
 #define X_DIR_PIN          18
-#define X_STOP_PIN         20
+#define X_ENABLE_PIN       19
 
 #define Y_STEP_PIN         23
 #define Y_DIR_PIN          22
-#define Y_STOP_PIN         25
+#define Y_ENABLE_PIN       24
 
 #define Z_STEP_PIN         27
 #define Z_DIR_PIN          28
-#define Z_STOP_PIN         30
+#define Z_ENABLE_PIN       29
 
 #define E0_STEP_PIN        17
 #define E0_DIR_PIN         21
+#define E0_ENABLE_PIN      13
 
-#define PS_ON_PIN         14
+#define PS_ON_PIN          14
 
-#define HEATER_0_PIN       12 // (extruder)
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          0   // ANALOG INPUT (pin 33 extruder)
+#define TEMP_BED_PIN        5   // ANALOG INPUT (pin 34 bed)
 
-#define HEATER_BED_PIN     16 // (bed)
-#define X_ENABLE_PIN       19
-#define Y_ENABLE_PIN       24
-#define Z_ENABLE_PIN       29
-#define E0_ENABLE_PIN      13
+//
+// Heaters
+//
+#define HEATER_0_PIN       12
+#define HEATER_BED_PIN     16
 
-#define TEMP_0_PIN          0   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder)
-#define TEMP_BED_PIN        5   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed)
-#define SDSS               4
+//
+// SD Card
+//
+#define SDSS                4

Marlin/pins_GEN6.h

@@ -34,42 +34,57 @@
   #define BOARD_NAME "Gen6"
 #endif
 
-//x axis pins
-#define X_STEP_PIN      15
-#define X_DIR_PIN       18
-#define X_ENABLE_PIN    19
-#define X_STOP_PIN      20
+//
+// Limit Switches
+//
+#define X_STOP_PIN         20
+#define Y_STOP_PIN         25
+#define Z_STOP_PIN         30
 
-//y axis pins
-#define Y_STEP_PIN      23
-#define Y_DIR_PIN       22
-#define Y_ENABLE_PIN    24
-#define Y_STOP_PIN      25
+//
+// Steppers
+//
+#define X_STEP_PIN         15
+#define X_DIR_PIN          18
+#define X_ENABLE_PIN       19
 
-//z axis pins
-#define Z_STEP_PIN      27
-#define Z_DIR_PIN       28
-#define Z_ENABLE_PIN    29
-#define Z_STOP_PIN      30
+#define Y_STEP_PIN         23
+#define Y_DIR_PIN          22
+#define Y_ENABLE_PIN       24
 
-//extruder pins
-#define E0_STEP_PIN      4    //Edited @ EJE Electronics 20100715
-#define E0_DIR_PIN       2    //Edited @ EJE Electronics 20100715
-#define E0_ENABLE_PIN    3    //Added @ EJE Electronics 20100715
-#define TEMP_0_PIN      5     //changed @ rkoeppl 20110410
+#define Z_STEP_PIN         27
+#define Z_DIR_PIN          28
+#define Z_ENABLE_PIN       29
 
-#define HEATER_0_PIN    14    //changed @ rkoeppl 20110410
+#define E0_STEP_PIN         4    //Edited @ EJE Electronics 20100715
+#define E0_DIR_PIN          2    //Edited @ EJE Electronics 20100715
+#define E0_ENABLE_PIN       3    //Added @ EJE Electronics 20100715
+
+//
+// Temperature Sensor
+//
+#define TEMP_0_PIN          5    //changed @ rkoeppl 20110410
+
+//
+// Heaters
+//
+#define HEATER_0_PIN       14    //changed @ rkoeppl 20110410
 
 #if !MB(GEN6)
-  #define HEATER_BED_PIN   1    //changed @ rkoeppl 20110410
-  #define TEMP_BED_PIN     0    //changed @ rkoeppl 20110410
+  #define HEATER_BED_PIN    1    //changed @ rkoeppl 20110410
+  #define TEMP_BED_PIN      0    //changed @ rkoeppl 20110410
 #endif
 
-#define SDSS          17
-//our pin for debugging.
+//
+// SD Card
+//
+#define SDSS               17
 
-#define DEBUG_PIN        0
+//
+// Misc. Functions
+//
+#define DEBUG_PIN           0
 
-//our RS485 pins
-#define TX_ENABLE_PIN 12
-#define RX_ENABLE_PIN 13
+// RS485 pins
+#define TX_ENABLE_PIN      12
+#define RX_ENABLE_PIN      13

Marlin/pins_GEN7_12.h

@@ -36,52 +36,68 @@
   #define GEN7_VERSION 12 // v1.x
 #endif
 
-//x axis pins
-#define X_STEP_PIN 19
-#define X_DIR_PIN 18
-#define X_ENABLE_PIN 24
-#define X_STOP_PIN 7
-
-//y axis pins
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24
-#define Y_STOP_PIN 5
-
-//z axis pins
-#define Z_STEP_PIN 26
-#define Z_DIR_PIN 25
-#define Z_ENABLE_PIN 24
-#define Z_MIN_PIN 1
-#define Z_MAX_PIN 0
-
-//extruder pins
-#define E0_STEP_PIN 28
-#define E0_DIR_PIN 27
-#define E0_ENABLE_PIN 24
-
-#define TEMP_0_PIN 1
-#define TEMP_BED_PIN 2
-
-#define HEATER_0_PIN 4
-#define HEATER_BED_PIN 3
-
-
-// Gen7 v1.3 removed the fan pin
-#if GEN7_VERSION < 13
-  #define FAN_PIN 31
+//
+// Limit Switches
+//
+#define X_STOP_PIN          7
+#define Y_STOP_PIN          5
+#define Z_MIN_PIN           1
+#define Z_MAX_PIN           0
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN   0
 #endif
 
-#define PS_ON_PIN 15
+//
+// Steppers
+//
+#define X_STEP_PIN         19
+#define X_DIR_PIN          18
+#define X_ENABLE_PIN       24
+
+#define Y_STEP_PIN         23
+#define Y_DIR_PIN          22
+#define Y_ENABLE_PIN       24
+
+#define Z_STEP_PIN         26
+#define Z_DIR_PIN          25
+#define Z_ENABLE_PIN       24
+
+#define E0_STEP_PIN        28
+#define E0_DIR_PIN         27
+#define E0_ENABLE_PIN      24
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          1
+#define TEMP_BED_PIN        2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        4
+#define HEATER_BED_PIN      3
+
+#if GEN7_VERSION < 13   // Gen7 v1.3 removed the fan pin
+  #define FAN_PIN          31
+#endif
+
+//
+// Misc. Functions
+//
+#define PS_ON_PIN          15
 
-//All these generations of Gen7 supply thermistor power
-//via PS_ON, so ignore bad thermistor readings
+// All these generations of Gen7 supply thermistor power
+// via PS_ON, so ignore bad thermistor readings
 #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
 
-//our pin for debugging.
-#define DEBUG_PIN 0
+#define DEBUG_PIN           0
 
-//our RS485 pins
-#define TX_ENABLE_PIN 12
-#define RX_ENABLE_PIN 13
+// RS485 pins
+#define TX_ENABLE_PIN      12
+#define RX_ENABLE_PIN      13
 

Marlin/pins_LEAPFROG.h

@@ -30,44 +30,63 @@
 
 #define BOARD_NAME         "Leapfrog"
 
+//
+// Limit Switches
+//
+#define X_MIN_PIN          47
+#define X_MAX_PIN           2
+#define Y_MIN_PIN          48
+#define Y_MAX_PIN          15
+#define Z_MIN_PIN          49
+#define Z_MAX_PIN          -1
+
+//
+// Steppers
+//
 #define X_STEP_PIN         28
 #define X_DIR_PIN          63
 #define X_ENABLE_PIN       29
-#define X_MIN_PIN          47
-#define X_MAX_PIN          2 //Max endstops default to disabled "-1", set to commented value to enable.
 
 #define Y_STEP_PIN         14 // A6
 #define Y_DIR_PIN          15 // A0
 #define Y_ENABLE_PIN       39
-#define Y_MIN_PIN          48
-#define Y_MAX_PIN          15
 
 #define Z_STEP_PIN         31 // A2
 #define Z_DIR_PIN          32 // A6
 #define Z_ENABLE_PIN       30 // A1
-#define Z_MIN_PIN          49
-#define Z_MAX_PIN          -1
 
-#define E0_STEP_PIN         34  //34
-#define E0_DIR_PIN          35 //35
-#define E0_ENABLE_PIN       33 //33
+#define E0_STEP_PIN        34 // 34
+#define E0_DIR_PIN         35 // 35
+#define E0_ENABLE_PIN      33 // 33
 
-#define E1_STEP_PIN         37 //37
-#define E1_DIR_PIN          40 //40
-#define E1_ENABLE_PIN       36 //36
+#define E1_STEP_PIN        37 // 37
+#define E1_DIR_PIN         40 // 40
+#define E1_ENABLE_PIN      36 // 36
 
+//
+// Misc. Functions
+//
 #define SDSS               11
 #define LED_PIN            13
-#define FAN_PIN            7
-#define SOL1_PIN   16
-#define SOL2_PIN    17
+#define SOL1_PIN           16
+#define SOL2_PIN           17
 
-#define HEATER_0_PIN       9
-#define HEATER_1_PIN       8 // 12
-#define HEATER_2_PIN       11 //-1 // 13
+//
+// Temperature Sensors
+//
 #define TEMP_0_PIN         13 //D27   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
 #define TEMP_1_PIN         15 // 1
-#define HEATER_BED_PIN     10 // 14/15
 #define TEMP_BED_PIN       14 // 1,2 or I2C
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        9
+#define HEATER_1_PIN        8 // 12
+#define HEATER_2_PIN       11 // 13
+#define HEATER_BED_PIN     10 // 14/15
+
+#define FAN_PIN             7
+
 /*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */
 

Marlin/pins_MEGACONTROLLER.h

@@ -34,79 +34,109 @@
 
 #define BOARD_NAME "Mega Controller"
 
-#define SERVO0_PIN 30
-#define SERVO1_PIN 31
-#define SERVO2_PIN 32
-#define SERVO3_PIN 33
-
-#define X_STEP_PIN 62//A8
-#define X_DIR_PIN 63//A9
-#define X_ENABLE_PIN 61//A7
-#define X_MIN_PIN 43
-#define X_MAX_PIN 42 //Max endstops default to disabled "-1", set to commented value to enable.
-
-#define Y_STEP_PIN 65 // A11
-#define Y_DIR_PIN 66 // A12
-#define Y_ENABLE_PIN 64//A10
-#define Y_MIN_PIN 38
-#define Y_MAX_PIN 41
-
-#define Z_STEP_PIN 68 // A14
-#define Z_DIR_PIN 69 // A15
-#define Z_ENABLE_PIN 67 // A13
-#define Z_MIN_PIN 40
-#define Z_MAX_PIN 37
-
-#define E0_STEP_PIN 23
-#define E0_DIR_PIN 24
-#define E0_ENABLE_PIN 22
-
-#define E1_STEP_PIN 26
-#define E1_DIR_PIN 27
-#define E1_ENABLE_PIN 25
-
-#define SDSS 53
-#define LED_PIN 13
-
-#define FAN_PIN 39
-#define FAN1_PIN 35
-#define FAN2_PIN 36
-#define FAN_SOFT_PWM
-#define CONTROLLERFAN_PIN FAN2_PIN
-
-#define HEATER_0_PIN 29 // EXTRUDER 1
-#define HEATER_1_PIN 34 // EXTRUDER 2
+//
+// Servos
+//
+#define SERVO0_PIN         30
+#define SERVO1_PIN         31
+#define SERVO2_PIN         32
+#define SERVO3_PIN         33
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN          43
+#define X_MAX_PIN          42
+#define Y_MIN_PIN          38
+#define Y_MAX_PIN          41
+#define Z_MIN_PIN          40
+#define Z_MAX_PIN          37
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  37
+#endif
 
+//
+// Steppers
+//
+#define X_STEP_PIN         62 // A8
+#define X_DIR_PIN          63 // A9
+#define X_ENABLE_PIN       61 // A7
+
+#define Y_STEP_PIN         65 // A11
+#define Y_DIR_PIN          66 // A12
+#define Y_ENABLE_PIN       64 // A10
+
+#define Z_STEP_PIN         68 // A14
+#define Z_DIR_PIN          69 // A15
+#define Z_ENABLE_PIN       67 // A13
+
+#define E0_STEP_PIN        23
+#define E0_DIR_PIN         24
+#define E0_ENABLE_PIN      22
+
+#define E1_STEP_PIN        26
+#define E1_DIR_PIN         27
+#define E1_ENABLE_PIN      25
+
+//
+// Misc. Functions
+//
+#define SDSS               53
+#define LED_PIN            13
+
+//
+// Temperature Sensors
+//
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN 4 // ANALOG NUMBERING
+  #define TEMP_0_PIN        4 // ANALOG NUMBERING
 #else
-  #define TEMP_0_PIN 0 // ANALOG NUMBERING
+  #define TEMP_0_PIN        0 // ANALOG NUMBERING
 #endif
 
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN 5 // ANALOG NUMBERING
+  #define TEMP_1_PIN        5 // ANALOG NUMBERING
 #else
-  #define TEMP_1_PIN 2 // ANALOG NUMBERING
+  #define TEMP_1_PIN        2 // ANALOG NUMBERING
 #endif
 
-#define TEMP_2_PIN 3 // ANALOG NUMBERING
-
-#define HEATER_BED_PIN 28 // BED
+#define TEMP_2_PIN          3 // ANALOG NUMBERING
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN 6 // ANALOG NUMBERING
+  #define TEMP_BED_PIN      6 // ANALOG NUMBERING
 #else
-  #define TEMP_BED_PIN 1 // ANALOG NUMBERING
+  #define TEMP_BED_PIN      1 // ANALOG NUMBERING
 #endif
 
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN       29
+#define HEATER_1_PIN       34
+#define HEATER_BED_PIN     28
+
+#define FAN_PIN            39
+#define FAN1_PIN           35
+#define FAN2_PIN           36
+
+#define CONTROLLERFAN_PIN  FAN2_PIN
+
+#define FAN_SOFT_PWM
+
+//
+// LCD / Controller
+//
 #if ENABLED(MINIPANEL)
-  #define BEEPER_PIN 46
+  #define BEEPER_PIN       46
   // Pins for DOGM SPI LCD Support
-  #define DOGLCD_A0  47
-  #define DOGLCD_CS  45
-  #define LCD_PIN_BL 44  // backlight LED on PA3
+  #define DOGLCD_A0        47
+  #define DOGLCD_CS        45
+  #define LCD_PIN_BL       44  // backlight LED on PA3
 
-  #define KILL_PIN 12
+  #define KILL_PIN         12
   // GLCD features
   //#define LCD_CONTRAST 190
   // Uncomment screen orientation
@@ -114,10 +144,10 @@
   //#define LCD_SCREEN_ROT_180
   //#define LCD_SCREEN_ROT_270
 
-  #define BTN_EN1 48
-  #define BTN_EN2 11
-  #define BTN_ENC 10
+  #define BTN_EN1          48
+  #define BTN_EN2          11
+  #define BTN_ENC          10
 
-  #define SD_DETECT_PIN 49
+  #define SD_DETECT_PIN    49
 #endif // MINIPANEL
 

Marlin/pins_MEGATRONICS.h

@@ -31,23 +31,37 @@
 #define BOARD_NAME         "Megatronics"
 #define LARGE_FLASH        true
 
+//
+// Limit Switches
+//
+#define X_MIN_PIN          41
+#define X_MAX_PIN          37
+#define Y_MIN_PIN          14
+#define Y_MAX_PIN          15
+#define Z_MIN_PIN          18
+#define Z_MAX_PIN          19
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  19
+#endif
+
+//
+// Steppers
+//
 #define X_STEP_PIN         26
 #define X_DIR_PIN          28
 #define X_ENABLE_PIN       24
-#define X_MIN_PIN          41
-#define X_MAX_PIN          37
 
 #define Y_STEP_PIN         60 // A6
 #define Y_DIR_PIN          61 // A7
 #define Y_ENABLE_PIN       22
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
 
 #define Z_STEP_PIN         54 // A0
 #define Z_DIR_PIN          55 // A1
 #define Z_ENABLE_PIN       56 // A2
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
 
 #define E0_STEP_PIN        31
 #define E0_DIR_PIN         32
@@ -57,16 +71,16 @@
 #define E1_DIR_PIN         36
 #define E1_ENABLE_PIN      30
 
+//
+// Misc. Functions
+//
 #define SDSS               53
 #define LED_PIN            13
-
-#define FAN_PIN             7   // IO pin. Buffer needed
 #define PS_ON_PIN          12
 
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8
-#define HEATER_BED_PIN     10   // BED
-
+//
+// Temperature Sensors
+//
 #if TEMP_SENSOR_0 == -1
   #define TEMP_0_PIN        8   // ANALOG NUMBERING
 #else
@@ -75,7 +89,18 @@
 #define TEMP_1_PIN         15   // ANALOG NUMBERING
 #define TEMP_BED_PIN       14   // ANALOG NUMBERING
 
-// AUX-4
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        9
+#define HEATER_1_PIN        8
+#define HEATER_BED_PIN     10
+
+#define FAN_PIN             7   // IO pin. Buffer needed
+
+//
+// LCD / Controller
+//
 #define BEEPER_PIN         33
 
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)

Marlin/pins_MEGATRONICS_2.h

@@ -31,74 +31,101 @@
 #define BOARD_NAME         "Megatronics v2.0"
 #define LARGE_FLASH        true
 
-#define X_STEP_PIN 26
-#define X_DIR_PIN 27
-#define X_ENABLE_PIN 25
-#define X_MIN_PIN 37
-#define X_MAX_PIN 40
-
-#define Y_STEP_PIN 4 // A6
-#define Y_DIR_PIN 54 // A0
-#define Y_ENABLE_PIN 5
-#define Y_MIN_PIN 41
-#define Y_MAX_PIN 38
-
-#define Z_STEP_PIN 56 // A2
-#define Z_DIR_PIN 60 // A6
-#define Z_ENABLE_PIN 55 // A1
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
-
-#define E0_STEP_PIN 35
-#define E0_DIR_PIN 36
-#define E0_ENABLE_PIN 34
-
-#define E1_STEP_PIN 29
-#define E1_DIR_PIN 39
-#define E1_ENABLE_PIN 28
-
-#define E2_STEP_PIN 23
-#define E2_DIR_PIN 24
-#define E2_ENABLE_PIN 22
-
-#define SDSS 53
-#define LED_PIN 13
-
-#define FAN_PIN 7
-#define FAN2_PIN 6
-#define PS_ON_PIN 12
-
-#define HEATER_0_PIN 9  // EXTRUDER 1
+//
+// Limit Switches
+//
+#define X_MIN_PIN          37
+#define X_MAX_PIN          40
+#define Y_MIN_PIN          41
+#define Y_MAX_PIN          38
+#define Z_MIN_PIN          18
+#define Z_MAX_PIN          19
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  19
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN         26
+#define X_DIR_PIN          27
+#define X_ENABLE_PIN       25
+
+#define Y_STEP_PIN          4 // A6
+#define Y_DIR_PIN          54 // A0
+#define Y_ENABLE_PIN        5
+
+#define Z_STEP_PIN         56 // A2
+#define Z_DIR_PIN          60 // A6
+#define Z_ENABLE_PIN       55 // A1
+
+#define E0_STEP_PIN        35
+#define E0_DIR_PIN         36
+#define E0_ENABLE_PIN      34
+
+#define E1_STEP_PIN        29
+#define E1_DIR_PIN         39
+#define E1_ENABLE_PIN      28
+
+#define E2_STEP_PIN        23
+#define E2_DIR_PIN         24
+#define E2_ENABLE_PIN      22
+
+//
+// Misc. Functions
+//
+#define SDSS               53
+#define LED_PIN            13
+#define PS_ON_PIN          12
+
+//
+// Temperature Sensors
+//
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN 4  // ANALOG NUMBERING
+  #define TEMP_0_PIN        4 // ANALOG NUMBERING
 #else
-  #define TEMP_0_PIN 13 // ANALOG NUMBERING
+  #define TEMP_0_PIN       13 // ANALOG NUMBERING
 #endif
 
-#define HEATER_1_PIN 8  // EXTRUDER 2
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN 8  // ANALOG NUMBERING
+  #define TEMP_1_PIN        8 // ANALOG NUMBERING
 #else
-  #define TEMP_1_PIN 15 // ANALOG NUMBERING
+  #define TEMP_1_PIN       15 // ANALOG NUMBERING
 #endif
 
-#define HEATER_BED_PIN 10 // BED
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN 8  // ANALOG NUMBERING
+  #define TEMP_BED_PIN      8 // ANALOG NUMBERING
 #else
-  #define TEMP_BED_PIN 14 // ANALOG NUMBERING
+  #define TEMP_BED_PIN     14 // ANALOG NUMBERING
 #endif
 
-#define BEEPER_PIN 64
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        9
+#define HEATER_1_PIN        8
+#define HEATER_BED_PIN     10
+
+#define FAN_PIN             7
+#define FAN1_PIN            6
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN         64
 
-#define LCD_PINS_RS 14
-#define LCD_PINS_ENABLE 15
-#define LCD_PINS_D4 30
-#define LCD_PINS_D5 31
-#define LCD_PINS_D6 32
-#define LCD_PINS_D7 33
+#define LCD_PINS_RS        14
+#define LCD_PINS_ENABLE    15
+#define LCD_PINS_D4        30
+#define LCD_PINS_D5        31
+#define LCD_PINS_D6        32
+#define LCD_PINS_D7        33
 
 // Buttons are directly attached using keypad
-#define BTN_EN1 61
-#define BTN_EN2 59
-#define BTN_ENC 43
+#define BTN_EN1            61
+#define BTN_EN2            59
+#define BTN_ENC            43

Marlin/pins_MEGATRONICS_3.h

@@ -38,33 +38,45 @@
 
 #define LARGE_FLASH        true
 
-#if ENABLED(Z_PROBE_SLED)
-  #define SLED_PIN         -1
-#endif
-
-// Servo support
+//
+// Servos
+//
 #define SERVO0_PIN         46 // AUX3-6
 #define SERVO1_PIN         47 // AUX3-5
 #define SERVO2_PIN         48 // AUX3-4
 #define SERVO3_PIN         49 // AUX3-3
 
+//
+// Limit Switches
+//
+#define X_MIN_PIN          37
+#define X_MAX_PIN          40
+#define Y_MIN_PIN          41
+#define Y_MAX_PIN          38
+#define Z_MIN_PIN          18
+#define Z_MAX_PIN          19
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  19
+#endif
+
+//
+// Steppers
+//
 #define X_STEP_PIN         58
 #define X_DIR_PIN          57
 #define X_ENABLE_PIN       59
-#define X_MIN_PIN          37
-#define X_MAX_PIN          40
 
-#define Y_STEP_PIN         5
+#define Y_STEP_PIN          5
 #define Y_DIR_PIN          17
-#define Y_ENABLE_PIN       4
-#define Y_MIN_PIN          41
-#define Y_MAX_PIN          38
+#define Y_ENABLE_PIN        4
 
 #define Z_STEP_PIN         16
 #define Z_DIR_PIN          11
-#define Z_ENABLE_PIN       3
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Z_ENABLE_PIN        3
 
 #define E0_STEP_PIN        28
 #define E0_DIR_PIN         27
@@ -78,70 +90,80 @@
 #define E2_DIR_PIN         60
 #define E2_ENABLE_PIN      23
 
-#define SDSS 53
-#define LED_PIN 13
-
-#define PS_ON_PIN 12
-
-#define HEATER_0_PIN 2
-#define HEATER_1_PIN 9
-#define HEATER_2_PIN 8
-#define HEATER_BED_PIN 10
-#define FAN_PIN 6
-#define FAN2_PIN 7
-
+//
+// Misc. Functions
+//
+#define SDSS               53
+#define LED_PIN            13
+#define PS_ON_PIN          12
+#define SLED_PIN           -1
+
+//
+// Temperature Sensors
+//
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN   11 // ANALOG NUMBERING
+  #define TEMP_0_PIN       11 // ANALOG NUMBERING
 #else
-  #define TEMP_0_PIN   15 // ANALOG NUMBERING
+  #define TEMP_0_PIN       15 // ANALOG NUMBERING
 #endif
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN   10 // ANALOG NUMBERING
+  #define TEMP_1_PIN       10 // ANALOG NUMBERING
 #else
-  #define TEMP_1_PIN   13 // ANALOG NUMBERING
+  #define TEMP_1_PIN       13 // ANALOG NUMBERING
 #endif
 #if TEMP_SENSOR_2 == -1
-  #define TEMP_2_PIN    9 // ANALOG NUMBERING
+  #define TEMP_2_PIN        9 // ANALOG NUMBERING
 #else
-  #define TEMP_2_PIN   12 // ANALOG NUMBERING
+  #define TEMP_2_PIN       12 // ANALOG NUMBERING
 #endif
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN  8 // ANALOG NUMBERING
+  #define TEMP_BED_PIN      8 // ANALOG NUMBERING
 #else
-  #define TEMP_BED_PIN 14 // ANALOG NUMBERING
+  #define TEMP_BED_PIN     14 // ANALOG NUMBERING
 #endif
 
-/**
- * Controllers and LCDs
- */
-#define BEEPER_PIN 61
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        2
+#define HEATER_1_PIN        9
+#define HEATER_2_PIN        8
+#define HEATER_BED_PIN     10
+
+#define FAN_PIN             6
+#define FAN1_PIN            7
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN         61
 
-#define BTN_EN1 44
-#define BTN_EN2 45
-#define BTN_ENC 33
+#define BTN_EN1            44
+#define BTN_EN2            45
+#define BTN_ENC            33
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-  #define LCD_PINS_RS     56 // CS chip select / SS chip slave select
-  #define LCD_PINS_ENABLE 51 // SID (MOSI)
-  #define LCD_PINS_D4     52 // SCK (CLK) clock
-  #define SD_DETECT_PIN   35
+  #define LCD_PINS_RS      56 // CS chip select / SS chip slave select
+  #define LCD_PINS_ENABLE  51 // SID (MOSI)
+  #define LCD_PINS_D4      52 // SCK (CLK) clock
+  #define SD_DETECT_PIN    35
 #else
-  #define LCD_PINS_RS     32
-  #define LCD_PINS_ENABLE 31
-  #define LCD_PINS_D4     14
-  #define LCD_PINS_D5     30
-  #define LCD_PINS_D6     39
-  #define LCD_PINS_D7     15
+  #define LCD_PINS_RS      32
+  #define LCD_PINS_ENABLE  31
+  #define LCD_PINS_D4      14
+  #define LCD_PINS_D5      30
+  #define LCD_PINS_D6      39
+  #define LCD_PINS_D7      15
   
-  #define SHIFT_CLK       43
-  #define SHIFT_LD        35
-  #define SHIFT_OUT       34
-  #define SHIFT_EN        44
+  #define SHIFT_CLK        43
+  #define SHIFT_LD         35
+  #define SHIFT_OUT        34
+  #define SHIFT_EN         44
 
   #if ENABLED(MEGATRONICS_31)
-    #define SD_DETECT_PIN 56
+    #define SD_DETECT_PIN  56
   #else
-    #define SD_DETECT_PIN -1
+    #define SD_DETECT_PIN  -1
   #endif
 
 #endif

Marlin/pins_MINIRAMBO.h

@@ -31,52 +31,53 @@
 #define BOARD_NAME          "Mini Rambo"
 #define LARGE_FLASH         true
 
-#define X_STEP_PIN          37
-#define X_DIR_PIN           48
-#define X_MIN_PIN           12
-#define X_MAX_PIN           30
-#define X_ENABLE_PIN        29
-#define X_MS1_PIN           40
-#define X_MS2_PIN           41
-
-#define Y_STEP_PIN          36
-#define Y_DIR_PIN           49
-#define Y_MIN_PIN           11
-#define Y_MAX_PIN           24
-#define Y_ENABLE_PIN        28
-#define Y_MS1_PIN           69
-#define Y_MS2_PIN           39
-
-#define Z_STEP_PIN          35
-#define Z_DIR_PIN           47
-#define Z_MIN_PIN           10
-#define Z_MAX_PIN           23
-#define Z_ENABLE_PIN        27
-#define Z_MS1_PIN           68
-#define Z_MS2_PIN           67
-
-#define HEATER_BED_PIN       4
-#define TEMP_BED_PIN         2
-
-#define HEATER_0_PIN         3
-#define TEMP_0_PIN           0
-
-#define HEATER_1_PIN         7
-#define TEMP_1_PIN           1
-
-#if ENABLED(BARICUDA)
-  #define HEATER_2_PIN       6
+//
+// Limit Switches
+//
+#define X_MIN_PIN          12
+#define X_MAX_PIN          30
+#define Y_MIN_PIN          11
+#define Y_MAX_PIN          24
+#define Z_MIN_PIN          10
+#define Z_MAX_PIN          23
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  23
 #endif
 
-#define E0_STEP_PIN         34
-#define E0_DIR_PIN          43
-#define E0_ENABLE_PIN       26
-#define E0_MS1_PIN          65
-#define E0_MS2_PIN          66
-
-#define E1_STEP_PIN         -1
-#define E1_DIR_PIN          -1
-#define E1_ENABLE_PIN       -1
+//
+// Steppers
+//
+#define X_STEP_PIN         37
+#define X_DIR_PIN          48
+#define X_ENABLE_PIN       29
+#define X_MS1_PIN          40
+#define X_MS2_PIN          41
+
+#define Y_STEP_PIN         36
+#define Y_DIR_PIN          49
+#define Y_ENABLE_PIN       28
+#define Y_MS1_PIN          69
+#define Y_MS2_PIN          39
+
+#define Z_STEP_PIN         35
+#define Z_DIR_PIN          47
+#define Z_ENABLE_PIN       27
+#define Z_MS1_PIN          68
+#define Z_MS2_PIN          67
+
+#define E0_STEP_PIN        34
+#define E0_DIR_PIN         43
+#define E0_ENABLE_PIN      26
+#define E0_MS1_PIN         65
+#define E0_MS2_PIN         66
+
+#define E1_STEP_PIN        -1
+#define E1_DIR_PIN         -1
+#define E1_ENABLE_PIN      -1
 
 #define MOTOR_CURRENT_PWM_XY_PIN 46
 #define MOTOR_CURRENT_PWM_Z_PIN  45
@@ -84,33 +85,56 @@
 //Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #define MOTOR_CURRENT_PWM_RANGE 2000
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
-#define SDSS                53
-#define LED_PIN             13
-#define FAN_PIN              8
-#define FAN_1_PIN            6
 
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          0
+#define TEMP_1_PIN          1
+#define TEMP_BED_PIN        2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        3
+#define HEATER_1_PIN        7
+#define HEATER_2_PIN        6
+#define HEATER_BED_PIN      4
+
+#define FAN_PIN             8
+#define FAN1_PIN            6
+
+//
+// Misc. Functions
+//
+#define SDSS               53
+#define LED_PIN            13
+
+//
+// LCD / Controller
+//
 #if ENABLED(ULTRA_LCD)
 
-  #define KILL_PIN          32
+  #define KILL_PIN         32
 
   #if ENABLED(NEWPANEL)
 
     // Beeper on AUX-4
-    #define BEEPER_PIN      84
+    #define BEEPER_PIN     84
 
-    #define LCD_PINS_RS     82
+    #define LCD_PINS_RS    82
     #define LCD_PINS_ENABLE 18
-    #define LCD_PINS_D4     19
-    #define LCD_PINS_D5     70
-    #define LCD_PINS_D6     85
-    #define LCD_PINS_D7     71
+    #define LCD_PINS_D4    19
+    #define LCD_PINS_D5    70
+    #define LCD_PINS_D6    85
+    #define LCD_PINS_D7    71
 
     //buttons are directly attached using AUX-2
-    #define BTN_EN1         14
-    #define BTN_EN2         72
-    #define BTN_ENC          9  // the click
+    #define BTN_EN1        14
+    #define BTN_EN2        72
+    #define BTN_ENC         9  // the click
 
-    #define SD_DETECT_PIN   15
+    #define SD_DETECT_PIN  15
 
   #endif //NEWPANEL
 #endif //ULTRA_LCD

Marlin/pins_MINITRONICS.h

@@ -28,82 +28,95 @@
   #error "Oops!  Make sure you have 'Minitronics' selected from the 'Tools -> Boards' menu."
 #endif
 
+#if HOTENDS > 2
+  #error "Minitronics supports up to 2 hotends. Comment this line to keep going."
+#endif
+
 #define BOARD_NAME         "Minitronics v1.0 / v1.1"
 #define LARGE_FLASH        true
 
-#define X_STEP_PIN 48
-#define X_DIR_PIN 47
-#define X_ENABLE_PIN 49
-#define X_MIN_PIN 5
-#define X_MAX_PIN 2
-
-#define Y_STEP_PIN 39 // A6
-#define Y_DIR_PIN 40 // A0
-#define Y_ENABLE_PIN 38
-#define Y_MIN_PIN 2
-#define Y_MAX_PIN 15
-
-#define Z_STEP_PIN 42 // A2
-#define Z_DIR_PIN 43 // A6
-#define Z_ENABLE_PIN 41 // A1
-#define Z_MIN_PIN 6
-#define Z_MAX_PIN -1
-
-#define E0_STEP_PIN 45
-#define E0_DIR_PIN 44
-#define E0_ENABLE_PIN 27
-
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 35
-#define E1_ENABLE_PIN 37
-
-#define E2_STEP_PIN -1
-#define E2_DIR_PIN -1
-#define E2_ENABLE_PIN -1
-
-#define SDSS 16
-#define LED_PIN 46
-
-#define FAN_PIN 9
-
-#define TEMP_0_PIN   7 // ANALOG NUMBERING
-#define TEMP_1_PIN   6 // ANALOG NUMBERING
-#define TEMP_BED_PIN 6 // ANALOG NUMBERING
-
-#define HEATER_0_PIN   7 // EXTRUDER 1
-#define HEATER_1_PIN   8 // EXTRUDER 2
-#define HEATER_BED_PIN 3 // BED
-
-/**
- * Controllers and LCDs
- */
-#define BEEPER_PIN -1
+//
+// Limit Switches
+//
+#define X_MIN_PIN           5
+#define X_MAX_PIN           2
+#define Y_MIN_PIN           2
+#define Y_MAX_PIN          15
+#define Z_MIN_PIN           6
+#define Z_MAX_PIN          -1
+
+//
+// Steppers
+//
+#define X_STEP_PIN         48
+#define X_DIR_PIN          47
+#define X_ENABLE_PIN       49
+
+#define Y_STEP_PIN         39 // A6
+#define Y_DIR_PIN          40 // A0
+#define Y_ENABLE_PIN       38
+
+#define Z_STEP_PIN         42 // A2
+#define Z_DIR_PIN          43 // A6
+#define Z_ENABLE_PIN       41 // A1
+
+#define E0_STEP_PIN        45
+#define E0_DIR_PIN         44
+#define E0_ENABLE_PIN      27
+
+#define E1_STEP_PIN        36
+#define E1_DIR_PIN         35
+#define E1_ENABLE_PIN      37
+
+//
+// Temperature Sensors
+//
+#define SDSS               16
+#define LED_PIN            46
+
+#define TEMP_0_PIN          7 // ANALOG NUMBERING
+#define TEMP_1_PIN          6 // ANALOG NUMBERING
+#define TEMP_BED_PIN        6 // ANALOG NUMBERING
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        7 // EXTRUDER 1
+#define HEATER_1_PIN        8 // EXTRUDER 2
+#define HEATER_BED_PIN      3 // BED
+
+#define FAN_PIN             9
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN         -1
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-  #define LCD_PINS_RS     15 // CS chip select /SS chip slave select
-  #define LCD_PINS_ENABLE 11 // SID (MOSI)
-  #define LCD_PINS_D4     10 // SCK (CLK) clock
+  #define LCD_PINS_RS      15 // CS chip select /SS chip slave select
+  #define LCD_PINS_ENABLE  11 // SID (MOSI)
+  #define LCD_PINS_D4      10 // SCK (CLK) clock
 
-  #define BTN_EN1         18
-  #define BTN_EN2         17
-  #define BTN_ENC         25
+  #define BTN_EN1          18
+  #define BTN_EN2          17
+  #define BTN_ENC          25
 
-  #define SD_DETECT_PIN   30
+  #define SD_DETECT_PIN    30
 
 #else
 
-  #define LCD_PINS_RS     -1
-  #define LCD_PINS_ENABLE -1
-  #define LCD_PINS_D4     -1
-  #define LCD_PINS_D5     -1
-  #define LCD_PINS_D6     -1
-  #define LCD_PINS_D7     -1
+  #define LCD_PINS_RS      -1
+  #define LCD_PINS_ENABLE  -1
+  #define LCD_PINS_D4      -1
+  #define LCD_PINS_D5      -1
+  #define LCD_PINS_D6      -1
+  #define LCD_PINS_D7      -1
 
   // Buttons are directly attached using keypad
-  #define BTN_EN1         -1
-  #define BTN_EN2         -1
-  #define BTN_ENC         -1
+  #define BTN_EN1          -1
+  #define BTN_EN2          -1
+  #define BTN_ENC          -1
 
-  #define SD_DETECT_PIN -1  // Minitronics doesn't use this
+  #define SD_DETECT_PIN    -1  // Minitronics doesn't use this
 #endif

Marlin/pins_RAMBO.h

@@ -32,85 +32,97 @@
 
 #define LARGE_FLASH true
 
-// Servo support
-#define SERVO0_PIN 22 // Motor header MX1
-#define SERVO1_PIN 23 // Motor header MX2
-#define SERVO2_PIN 24 // Motor header MX3
-#define SERVO3_PIN  5 // PWM header pin 5
+//
+// Servos
+//
+#define SERVO0_PIN         22 // Motor header MX1
+#define SERVO1_PIN         23 // Motor header MX2
+#define SERVO2_PIN         24 // Motor header MX3
+#define SERVO3_PIN          5 // PWM header pin 5
 
 #if ENABLED(Z_PROBE_SLED)
   #define SLED_PIN         -1
 #endif
 
-#define X_MIN_PIN 12
-#define X_MAX_PIN 24
-#define Y_MIN_PIN 11
-#define Y_MAX_PIN 23
-#define Z_MIN_PIN 10
-#define Z_MAX_PIN 30
+//
+// Limit Switches
+//
+#define X_MIN_PIN          12
+#define X_MAX_PIN          24
+#define Y_MIN_PIN          11
+#define Y_MAX_PIN          23
+#define Z_MIN_PIN          10
+#define Z_MAX_PIN          30
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN 10
+  #define Z_MIN_PROBE_PIN  30
 #endif
 
-#define X_STEP_PIN 37
-#define X_DIR_PIN 48
-#define X_ENABLE_PIN 29
-#define X_MS1_PIN 40
-#define X_MS2_PIN 41
-
-#define Y_STEP_PIN 36
-#define Y_DIR_PIN 49
-#define Y_ENABLE_PIN 28
-#define Y_MS1_PIN 69
-#define Y_MS2_PIN 39
-
-#define Z_STEP_PIN 35
-#define Z_DIR_PIN 47
-#define Z_ENABLE_PIN 27
-#define Z_MS1_PIN 68
-#define Z_MS2_PIN 67
-
-#define HEATER_BED_PIN 3
-#define TEMP_BED_PIN 2
-
-#define HEATER_0_PIN  9
-#define TEMP_0_PIN 0
-
-#define HEATER_1_PIN 7
-#define TEMP_1_PIN 1
-
-#if ENABLED(BARICUDA)
-  #define HEATER_2_PIN 6
-#endif
-
-#define E0_STEP_PIN         34
-#define E0_DIR_PIN          43
-#define E0_ENABLE_PIN       26
-#define E0_MS1_PIN 65
-#define E0_MS2_PIN 66
-
-#define E1_STEP_PIN         33
-#define E1_DIR_PIN          42
-#define E1_ENABLE_PIN       25
-#define E1_MS1_PIN 63
-#define E1_MS2_PIN 64
-
-#define DIGIPOTSS_PIN 38
+//
+// Steppers
+//
+#define X_STEP_PIN         37
+#define X_DIR_PIN          48
+#define X_ENABLE_PIN       29
+#define X_MS1_PIN          40
+#define X_MS2_PIN          41
+
+#define Y_STEP_PIN         36
+#define Y_DIR_PIN          49
+#define Y_ENABLE_PIN       28
+#define Y_MS1_PIN          69
+#define Y_MS2_PIN          39
+
+#define Z_STEP_PIN         35
+#define Z_DIR_PIN          47
+#define Z_ENABLE_PIN       27
+#define Z_MS1_PIN          68
+#define Z_MS2_PIN          67
+
+#define E0_STEP_PIN        34
+#define E0_DIR_PIN         43
+#define E0_ENABLE_PIN      26
+#define E0_MS1_PIN         65
+#define E0_MS2_PIN         66
+
+#define E1_STEP_PIN        33
+#define E1_DIR_PIN         42
+#define E1_ENABLE_PIN      25
+#define E1_MS1_PIN         63
+#define E1_MS2_PIN         64
+
+#define DIGIPOTSS_PIN      38
 #define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
 
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          0
+#define TEMP_1_PIN          1
+#define TEMP_BED_PIN        2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        9
+#define HEATER_1_PIN        7
+#define HEATER_2_PIN        6
+#define HEATER_BED_PIN      3
+
+#define FAN_PIN             8
+#define FAN1_PIN            6
+#define FAN2_PIN            2
+
+//
+// Misc. Functions
+//
 #define SDSS               53
 #define LED_PIN            13
-#define FAN_PIN            8
-
 #define FILWIDTH_PIN        3  // ANALOG NUMBERING
-
-/**********************************************************
-  Fan Pins
-  Fan_0 8
-  Fan_1 6
-  Fan_2 2
-***********************************************************/
-#define PS_ON_PIN          4
+#define PS_ON_PIN           4
 
 #if ENABLED(ULTRA_LCD)
 

Marlin/pins_RAMPS.h

@@ -54,6 +54,9 @@
 
 #define LARGE_FLASH true
 
+//
+// Servos
+//
 #ifdef IS_RAMPS_13
   #define SERVO0_PIN        7 // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
 #else
@@ -63,6 +66,9 @@
 #define SERVO2_PIN          5
 #define SERVO3_PIN          4
 
+//
+// Limit Switches
+//
 #define X_MIN_PIN           3
 #ifndef X_MAX_PIN
   #define X_MAX_PIN         2
@@ -71,10 +77,17 @@
 #define Y_MAX_PIN          15
 #define Z_MIN_PIN          18
 #define Z_MAX_PIN          19
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
 #ifndef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN  32
 #endif
 
+//
+// Steppers
+//
 #define X_STEP_PIN         54
 #define X_DIR_PIN          55
 #define X_ENABLE_PIN       38
@@ -95,6 +108,16 @@
 #define E1_DIR_PIN         34
 #define E1_ENABLE_PIN      30
 
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN         13   // ANALOG NUMBERING
+#define TEMP_1_PIN         15   // ANALOG NUMBERING
+#define TEMP_BED_PIN       14   // ANALOG NUMBERING
+
+//
+// Misc. Functions
+//
 #define SDSS               53
 #define LED_PIN            13
 
@@ -105,15 +128,11 @@
 #define FIL_RUNOUT_PIN      4
 
 #define PS_ON_PIN          12
-#define TEMP_0_PIN         13   // ANALOG NUMBERING
-#define TEMP_1_PIN         15   // ANALOG NUMBERING
-#define TEMP_BED_PIN       14   // ANALOG NUMBERING
-
-#if ENABLED(Z_PROBE_SLED)
-  #define SLED_PIN           -1
-#endif
+#define SLED_PIN           -1
 
+//
 // Augmentation for auto-assigning RAMPS plugs
+//
 #if DISABLED(IS_RAMPS_EEB) && DISABLED(IS_RAMPS_EEF) && DISABLED(IS_RAMPS_EFB) && DISABLED(IS_RAMPS_EFF) && DISABLED(IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
   #if HOTENDS > 1
     #if TEMP_SENSOR_BED
@@ -128,10 +147,9 @@
   #endif
 #endif
 
-/**
- * Hi Voltage PWM Pin Assignments
- */
-
+//
+// Heaters / Fans
+//
 #ifndef MOSFET_D_PIN
   #define MOSFET_D_PIN  -1
 #endif
@@ -175,10 +193,9 @@
   #define FAN_PIN 4      // IO pin. Buffer needed
 #endif
 
-/**
- * LCD Controller Pin Assignments
- */
-
+//
+// LCD / Controller
+//
 #if ENABLED(ULTRA_LCD)
 
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)

Marlin/pins_RAMPS_OLD.h

@@ -33,45 +33,68 @@
 // Uncomment the following line for RAMPS v1.0
 //#define RAMPS_V_1_0
 
+//
+// Limit Switches
+//
+#define X_MIN_PIN           3
+#define X_MAX_PIN           2
+#define Y_MIN_PIN          16
+#define Y_MAX_PIN          17
+#define Z_MIN_PIN          18
+#define Z_MAX_PIN          19
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  19
+#endif
+
+//
+// Steppers
+//
 #define X_STEP_PIN         26
 #define X_DIR_PIN          28
 #define X_ENABLE_PIN       24
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
 
 #define Y_STEP_PIN         38
 #define Y_DIR_PIN          40
 #define Y_ENABLE_PIN       36
-#define Y_MIN_PIN          16
-#define Y_MAX_PIN          17
 
 #define Z_STEP_PIN         44
 #define Z_DIR_PIN          46
 #define Z_ENABLE_PIN       42
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
 
 #define E0_STEP_PIN        32
 #define E0_DIR_PIN         34
 #define E0_ENABLE_PIN      30
 
+//
+// Misc. Functions
+//
 #define SDPOWER            48
 #define SDSS               53
 #define LED_PIN            13
 
-#if ENABLED(RAMPS_V_1_0) // RAMPS_V_1_0
-  #define HEATER_0_PIN     12    // RAMPS 1.0
-  #define HEATER_BED_PIN   -1    // RAMPS 1.0
-  #define FAN_PIN          11    // RAMPS 1.0
-#else // RAMPS_V_1_1 or RAMPS_V_1_2
-  #define HEATER_0_PIN     10    // RAMPS 1.1
-  #define HEATER_BED_PIN    8    // RAMPS 1.1
-  #define FAN_PIN           9    // RAMPS 1.1
-#endif
-
+//
+// Temperature Sensors
+//
 #define TEMP_0_PIN          2    // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
 #define TEMP_BED_PIN        1    // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
 
+//
+// Heaters / Fans
+//
+#if ENABLED(RAMPS_V_1_0)
+  #define HEATER_0_PIN     12
+  #define HEATER_BED_PIN   -1
+  #define FAN_PIN          11
+#else // RAMPS_V_1_1 or RAMPS_V_1_2
+  #define HEATER_0_PIN     10
+  #define HEATER_BED_PIN    8
+  #define FAN_PIN           9
+#endif
+
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
   #define MAX6675_SS       66// Do not use pin 53 if there is even the remote possibility of using Display/SD card

Marlin/pins_RUMBA.h

@@ -35,27 +35,37 @@
 #define DEFAULT_MACHINE_NAME "Rumba"
 #define BOARD_NAME           "Rumba"
 
+//
+// Limit Switches
+//
+#define X_MIN_PIN          37
+#define X_MAX_PIN          36
+#define Y_MIN_PIN          35
+#define Y_MAX_PIN          34
+#define Z_MIN_PIN          33
+#define Z_MAX_PIN          32
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  32
+#endif
+
+//
+// Steppers
+//
 #define X_STEP_PIN         17
 #define X_DIR_PIN          16
 #define X_ENABLE_PIN       48
-#define X_MIN_PIN          37
-#define X_MAX_PIN          36
 
 #define Y_STEP_PIN         54
 #define Y_DIR_PIN          47
 #define Y_ENABLE_PIN       55
-#define Y_MIN_PIN          35
-#define Y_MAX_PIN          34
 
 #define Z_STEP_PIN         57
 #define Z_DIR_PIN          56
 #define Z_ENABLE_PIN       62
-#define Z_MIN_PIN          33
-#define Z_MAX_PIN          32
-
-#ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  33
-#endif
 
 #define E0_STEP_PIN        23
 #define E0_DIR_PIN         22
@@ -69,18 +79,17 @@
 #define E2_DIR_PIN         28
 #define E2_ENABLE_PIN      39
 
+//
+// Misc. Functions
+//
 #define LED_PIN            13
 
-#define FAN_PIN             7
-#define FAN1_PIN            8
-
 #define PS_ON_PIN          45
 #define KILL_PIN           46
 
-#define HEATER_0_PIN        2   // EXTRUDER 1
-#define HEATER_1_PIN        3   // EXTRUDER 2
-#define HEATER_2_PIN        6   // EXTRUDER 3
-
+//
+// Temperature Sensors
+//
 #if TEMP_SENSOR_0 == -1
   #define TEMP_0_PIN        6   // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used
 #else
@@ -99,10 +108,21 @@
   #define TEMP_2_PIN       13   // ANALOG NUMBERING - default connector for thermistor *T2* on rumba board is used
 #endif
 
-//optional for extruder 4 or chamber: #define TEMP_X_PIN         12   // ANALOG NUMBERING - default connector for thermistor *T3* on rumba board is used
-//optional FAN1 can be used as 4th heater output: #define HEATER_3_PIN       8    // EXTRUDER 4
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        2
+#define HEATER_1_PIN        3
+#define HEATER_2_PIN        6
+#define HEATER_3_PIN        8
+#define HEATER_BED_PIN      9
+
+#define FAN_PIN             7
+#define FAN1_PIN            8
+
+//optional for extruder 4 or chamber:
+// #define TEMP_X_PIN         12   // ANALOG NUMBERING - default connector for thermistor *T3* on rumba board is used
 
-#define HEATER_BED_PIN      9    // BED
 #if TEMP_SENSOR_BED == -1
   #define TEMP_BED_PIN      7    // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple
 #else

Marlin/pins_SETHI.h

@@ -34,53 +34,62 @@
   #define GEN7_VERSION 12 // v1.x
 #endif
 
-//x axis pins
-#define X_STEP_PIN 19
-#define X_DIR_PIN 18
-#define X_ENABLE_PIN 24
-#define X_STOP_PIN 2
-
-//y axis pins
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24
-#define Y_STOP_PIN 0
-
-//z axis pins
-#define Z_STEP_PIN 26
-#define Z_DIR_PIN 25
-#define Z_ENABLE_PIN 24
-#define Z_MIN_PIN 1
-#define Z_MAX_PIN 0
-
-//extruder pins
-#define E0_STEP_PIN 28
-#define E0_DIR_PIN 27
-#define E0_ENABLE_PIN 24
-
-#define TEMP_0_PIN 1
-#define TEMP_BED_PIN 2
-
-#define HEATER_0_PIN 4
-#define HEATER_BED_PIN 3
+//
+// Limit Switches
+//
+#define X_STOP_PIN          2
+#define Y_STOP_PIN          0
+#define Z_MIN_PIN           1
+#define Z_MAX_PIN           0
+
+//
+// Steppers
+//
+#define X_STEP_PIN         19
+#define X_DIR_PIN          18
+#define X_ENABLE_PIN       24
+
+#define Y_STEP_PIN         23
+#define Y_DIR_PIN          22
+#define Y_ENABLE_PIN       24
+
+#define Z_STEP_PIN         26
+#define Z_DIR_PIN          25
+#define Z_ENABLE_PIN       24
+
+#define E0_STEP_PIN        28
+#define E0_DIR_PIN         27
+#define E0_ENABLE_PIN      24
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          1
+#define TEMP_BED_PIN        2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        4
+#define HEATER_BED_PIN      3
 
 
 #if (GEN7_VERSION >= 13)
   // Gen7 v1.3 removed the fan pin
-  #define FAN_PIN -1
+  #define FAN_PIN          -1
 #else
-  #define FAN_PIN 31
+  #define FAN_PIN          31
 #endif
 
-#define PS_ON_PIN 15
+#define PS_ON_PIN          15
 
 //All these generations of Gen7 supply thermistor power
 //via PS_ON, so ignore bad thermistor readings
 #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
 
 //our pin for debugging.
-#define DEBUG_PIN 0
+#define DEBUG_PIN           0
 
 //our RS485 pins
-#define TX_ENABLE_PIN 12
-#define RX_ENABLE_PIN 13
+#define TX_ENABLE_PIN      12
+#define RX_ENABLE_PIN      13

Marlin/pins_ULTIMAIN_2.h

@@ -32,43 +32,35 @@
 #define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
 #define BOARD_NAME              "Ultimaker 2.x"
 
-#define X_STEP_PIN 25
-#define X_DIR_PIN 23
-#define X_STOP_PIN 22
-#define X_ENABLE_PIN 27
-
-#define Y_STEP_PIN 32
-#define Y_DIR_PIN 33
-#define Y_STOP_PIN 26
-#define Y_ENABLE_PIN 31
-
-#define Z_STEP_PIN 35
-#define Z_DIR_PIN 36
-#define Z_STOP_PIN 29
-#define Z_ENABLE_PIN 34
-
-#define HEATER_BED_PIN 4
-#define TEMP_BED_PIN 10
-
-#define HEATER_0_PIN  2
-#define TEMP_0_PIN 8
-
-#define HEATER_1_PIN 3
-#define TEMP_1_PIN 9
-
-#define E0_STEP_PIN         42
-#define E0_DIR_PIN          43
-#define E0_ENABLE_PIN       37
-
-#define E1_STEP_PIN         49
-#define E1_DIR_PIN          47
-#define E1_ENABLE_PIN       48
-
-#define SDSS               53
-#define LED_PIN            8
-#define FAN_PIN            7
-#define SAFETY_TRIGGERED_PIN     28 //PIN to detect the safety circuit has triggered
-#define MAIN_VOLTAGE_MEASURE_PIN 14 //Analogue PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
+//
+// Limit Switches
+//
+#define X_STOP_PIN         22
+#define Y_STOP_PIN         26
+#define Z_STOP_PIN         29
+
+//
+// Steppers
+//
+#define X_STEP_PIN         25
+#define X_DIR_PIN          23
+#define X_ENABLE_PIN       27
+
+#define Y_STEP_PIN         32
+#define Y_DIR_PIN          33
+#define Y_ENABLE_PIN       31
+
+#define Z_STEP_PIN         35
+#define Z_DIR_PIN          36
+#define Z_ENABLE_PIN       34
+
+#define E0_STEP_PIN        42
+#define E0_DIR_PIN         43
+#define E0_ENABLE_PIN      37
+
+#define E1_STEP_PIN        49
+#define E1_DIR_PIN         47
+#define E1_ENABLE_PIN      48
 
 #define MOTOR_CURRENT_PWM_XY_PIN 44
 #define MOTOR_CURRENT_PWM_Z_PIN 45
@@ -77,18 +69,42 @@
 #define MOTOR_CURRENT_PWM_RANGE 2000
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
 
-#define BEEPER_PIN 18
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          8
+#define TEMP_1_PIN          9
+#define TEMP_BED_PIN       10
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        2
+#define HEATER_1_PIN        3
+#define HEATER_BED_PIN      4
+
+#define FAN_PIN             7
+
+//
+// SD Card
+//
+#define SDSS               53
+#define SD_DETECT_PIN      39
+
+#define LED_PIN             8
+#define SAFETY_TRIGGERED_PIN     28 // PIN to detect the safety circuit has triggered
+#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
 
-#define LCD_PINS_RS 20
-#define LCD_PINS_ENABLE 15
-#define LCD_PINS_D4 14
-#define LCD_PINS_D5 21
-#define LCD_PINS_D6 5
-#define LCD_PINS_D7 6
+#define BEEPER_PIN         18
 
-//buttons are directly attached
-#define BTN_EN1 40
-#define BTN_EN2 41
-#define BTN_ENC 19
+#define LCD_PINS_RS        20
+#define LCD_PINS_ENABLE    15
+#define LCD_PINS_D4        14
+#define LCD_PINS_D5        21
+#define LCD_PINS_D6         5
+#define LCD_PINS_D7         6
 
-#define SD_DETECT_PIN 39
+// Buttons are directly attached
+#define BTN_EN1            40
+#define BTN_EN2            41
+#define BTN_ENC            19

Marlin/pins_ULTIMAKER.h

@@ -34,49 +34,74 @@
 
 #define LARGE_FLASH true
 
-#define SERVO0_PIN 13 // untested
-
-#define X_STEP_PIN 25
-#define X_DIR_PIN 23
-#define X_MIN_PIN 22
-#define X_MAX_PIN 24
-#define X_ENABLE_PIN 27
-
-#define Y_STEP_PIN 31
-#define Y_DIR_PIN 33
-#define Y_MIN_PIN 26
-#define Y_MAX_PIN 28
-#define Y_ENABLE_PIN 29
-
-#define Z_STEP_PIN 37
-#define Z_DIR_PIN 39
-#define Z_MIN_PIN 30
-#define Z_MAX_PIN 32
-#define Z_ENABLE_PIN 35
-
-#define HEATER_BED_PIN 4
-#define TEMP_BED_PIN 10
-
-#define HEATER_0_PIN  2
-#define TEMP_0_PIN 8
-
-#define HEATER_1_PIN 3
-#define TEMP_1_PIN 9
-
-#define E0_STEP_PIN         43
-#define E0_DIR_PIN          45
-#define E0_ENABLE_PIN       41
+//
+// Servos
+//
+#define SERVO0_PIN         13 // untested
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN          22
+#define X_MAX_PIN          24
+#define Y_MIN_PIN          26
+#define Y_MAX_PIN          28
+#define Z_MIN_PIN          30
+#define Z_MAX_PIN          32
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  32
+#endif
 
-#define E1_STEP_PIN         49
-#define E1_DIR_PIN          47
-#define E1_ENABLE_PIN       48
+//
+// Steppers
+//
+#define X_STEP_PIN         25
+#define X_DIR_PIN          23
+#define X_ENABLE_PIN       27
+
+#define Y_STEP_PIN         31
+#define Y_DIR_PIN          33
+#define Y_ENABLE_PIN       29
+
+#define Z_STEP_PIN         37
+#define Z_DIR_PIN          39
+#define Z_ENABLE_PIN       35
+
+#define E0_STEP_PIN        43
+#define E0_DIR_PIN         45
+#define E0_ENABLE_PIN      41
+
+#define E1_STEP_PIN        49
+#define E1_DIR_PIN         47
+#define E1_ENABLE_PIN      48
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          8
+#define TEMP_1_PIN          9
+#define TEMP_BED_PIN       10
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        2
+#define HEATER_1_PIN        3
+#define HEATER_BED_PIN      4
 
 #define SDSS               53
 #define LED_PIN            13
-#define FAN_PIN            7
+#define FAN_PIN             7
 #define PS_ON_PIN          12
 #define SUICIDE_PIN        54  //PIN that has to be turned on right after start, to keep power flowing.
 
+//
+// LCD / Controller
+//
 #if ENABLED(ULTRA_LCD)
 
   #define BEEPER_PIN 18

Marlin/pins_ULTIMAKER_OLD.h

@@ -34,41 +34,64 @@
 
 #define LARGE_FLASH true
 
-#define X_STEP_PIN 25
-#define X_DIR_PIN 23
-#define X_MIN_PIN 15
-#define X_MAX_PIN 14
-#define X_ENABLE_PIN 27
+//
+// Limit Switches
+//
+#define X_MIN_PIN          15
+#define X_MAX_PIN          14
+#define Y_MIN_PIN          17
+#define Y_MAX_PIN          16
+#define Z_MIN_PIN          19
+#define Z_MAX_PIN          18
 
-#define Y_STEP_PIN 31
-#define Y_DIR_PIN 33
-#define Y_MIN_PIN 17
-#define Y_MAX_PIN 16
-#define Y_ENABLE_PIN 29
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  18
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN         25
+#define X_DIR_PIN          23
+#define X_ENABLE_PIN       27
+
+#define Y_STEP_PIN         31
+#define Y_DIR_PIN          33
+#define Y_ENABLE_PIN       29
 
-#define Z_STEP_PIN 37
-#define Z_DIR_PIN 39
-#define Z_MIN_PIN 19
-#define Z_MAX_PIN 18
-#define Z_ENABLE_PIN 35
+#define Z_STEP_PIN         37
+#define Z_DIR_PIN          39
+#define Z_ENABLE_PIN       35
 
-#define TEMP_0_PIN 8
-#define TEMP_1_PIN 1
+#define E0_STEP_PIN        43
+#define E0_DIR_PIN         45
+#define E0_ENABLE_PIN      41
 
-#define HEATER_0_PIN  2
-#define HEATER_1_PIN  1
+#define E1_STEP_PIN        -1
+#define E1_DIR_PIN         -1
+#define E1_ENABLE_PIN      -1
 
-#define E0_STEP_PIN         43
-#define E0_DIR_PIN          45
-#define E0_ENABLE_PIN       41
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          8
+#define TEMP_1_PIN          1
 
-#define E1_STEP_PIN         -1
-#define E1_DIR_PIN          -1
-#define E1_ENABLE_PIN       -1
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        2
+#define HEATER_1_PIN        1
 
-#define LCD_PINS_RS 24
-#define LCD_PINS_ENABLE 22
-#define LCD_PINS_D4 36
-#define LCD_PINS_D5 34
-#define LCD_PINS_D6 32
-#define LCD_PINS_D7 30
+//
+// LCD / Controller
+//
+#define LCD_PINS_RS        24
+#define LCD_PINS_ENABLE    22
+#define LCD_PINS_D4        36
+#define LCD_PINS_D5        34
+#define LCD_PINS_D6        32
+#define LCD_PINS_D7        30