Consistent order/formatting of pins files

Marlin/pins_ULTIMAKER.h

@@ -34,49 +34,74 @@
 
 #define LARGE_FLASH true
 
-#define SERVO0_PIN 13 // untested
+//
+// Servos
+//
+#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
+//
+// 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
 
-#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
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  32
+#endif
 
-#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
+//
+// Steppers
+//
+#define X_STEP_PIN         25
+#define X_DIR_PIN          23
+#define X_ENABLE_PIN       27
 
-#define HEATER_BED_PIN 4
-#define TEMP_BED_PIN 10
+#define Y_STEP_PIN         31
+#define Y_DIR_PIN          33
+#define Y_ENABLE_PIN       29
 
-#define HEATER_0_PIN  2
-#define TEMP_0_PIN 8
+#define Z_STEP_PIN         37
+#define Z_DIR_PIN          39
+#define Z_ENABLE_PIN       35
 
-#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
 
-#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
 
-#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