diff --git a/Marlin/pins_3DRAG.h b/Marlin/pins_3DRAG.h
index bd0cec24517cf24330dc691d5eba87fe99a2968a..9eaf2c9f6514871b61d3e6d17782a2fbe6132be1 100644
--- a/Marlin/pins_3DRAG.h
+++ b/Marlin/pins_3DRAG.h
@@ -36,6 +36,9 @@
#define DEFAULT_SOURCE_CODE_URL "http://3dprint.elettronicain.it/"
#endif
+//
+// Heaters / Fans
+//
#define RAMPS_D8_PIN 9
#define RAMPS_D9_PIN 8
#define MOSFET_D_PIN 12
@@ -55,7 +58,12 @@
#define Z_ENABLE_PIN 63
//
-// SD Card
+// Heaters / Fans
+//
+#define HEATER_2_PIN 6
+
+//
+// Misc. Functions
//
#undef SDSS
#define SDSS 25
@@ -63,11 +71,6 @@
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 53
-//
-// Heaters / Fans
-//
-#define HEATER_2_PIN 6
-
//
// LCD / Controller
//
diff --git a/Marlin/pins_5DPRINT.h b/Marlin/pins_5DPRINT.h
index 9e4e8c41ab233d3b2e68e5d6b0c392811de7dfef..f44a56887da1415fd32a4ee291d01c40a027d7ef 100644
--- a/Marlin/pins_5DPRINT.h
+++ b/Marlin/pins_5DPRINT.h
@@ -89,6 +89,6 @@
#define FAN_PIN 16
//
-// SD Card
+// Misc. Functions
//
#define SDSS 20
diff --git a/Marlin/pins_99.h b/Marlin/pins_99.h
index 35686b8ab7faadd6b0a69f9d98a6713d2aac5b55..ba86bf58b6a4e7c46b0390b46861e6e9883d3969 100644
--- a/Marlin/pins_99.h
+++ b/Marlin/pins_99.h
@@ -64,5 +64,8 @@
#define HEATER_0_PIN 13
#define HEATER_BED_PIN 4
+//
+// Misc. Functions
+//
#define SDSS 53
#define PS_ON_PIN 9
diff --git a/Marlin/pins_A4JP.h b/Marlin/pins_A4JP.h
index 4e00892059bf84bac983fdf6366123f7a49bc774..7e9acd431284160a6bae4f2b8b4748847ef6d98b 100644
--- a/Marlin/pins_A4JP.h
+++ b/Marlin/pins_A4JP.h
@@ -30,6 +30,12 @@
#define BOARD_NAME "AJ4P"
+#define LARGE_FLASH true
+
+/************************************************
+ * Rambo pin assignments old
+ ************************************************/
+
//
// Servos
//
@@ -38,16 +44,6 @@
#define SERVO2_PIN 24 // Motor header MX3
#define SERVO3_PIN 5 // PWM header pin 5
-#define SLED_PIN -1
-
-#define FILWIDTH_PIN 3 // Analog Input
-
-/************************************************
- * Rambo pin assignments old
- ************************************************/
-
-#define LARGE_FLASH true
-
//
// Limit Switches
//
@@ -65,42 +61,52 @@
#define Z_MIN_PROBE_PIN 30
#endif
+#define SLED_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 33
#define E1_DIR_PIN 42
#define E1_ENABLE_PIN 25
+
+// Microstepping pins - Mapping not from fastio.h (?)
+#define X_MS1_PIN 40
+#define X_MS2_PIN 41
+#define Y_MS1_PIN 69
+#define Y_MS2_PIN 39
+#define Z_MS1_PIN 68
+#define Z_MS2_PIN 67
+#define E0_MS1_PIN 65
+#define E0_MS2_PIN 66
#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 // Analog Input
+#define TEMP_BED_PIN 7 // Analog Input
+
//
// Heaters / Fans
//
@@ -112,31 +118,32 @@
#define FAN0_PIN 6
#define FAN1_PIN 2
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_BED_PIN 7 // Analog Input
-
+//
+// Misc. Functions
+//
#define SDSS 53
#define LED_PIN 13
#define PS_ON_PIN 4
+#define FILWIDTH_PIN 3 // Analog Input
//
// LCD / Controller
//
-#define LCD_PINS_RS 70 //ext2_5
-#define LCD_PINS_ENABLE 71 //ext2_7
-#define LCD_PINS_D4 72 ///////Ext2 9 ?
-#define LCD_PINS_D5 73 ///////Ext2 11 ?
-#define LCD_PINS_D6 74 //ext2_13
-#define LCD_PINS_D7 75 ///////Ext2 15 ?
+#define LCD_PINS_RS 70 // Ext2_5
+#define LCD_PINS_ENABLE 71 // Ext2_7
+#define LCD_PINS_D4 72 // Ext2_9 ?
+#define LCD_PINS_D5 73 // Ext2_11 ?
+#define LCD_PINS_D6 74 // Ext2_13
+#define LCD_PINS_D7 75 // Ext2_15 ?
#define BEEPER_PIN -1
-#define BTN_HOME 80 //ext_16
-#define BTN_CENTER 81 //ext_14
+#define BTN_HOME 80 // Ext_16
+#define BTN_CENTER 81 // Ext_14
#define BTN_ENC BTN_CENTER
-#define BTN_RIGHT 82 //ext_12
-#define BTN_LEFT 83 //ext_10
-#define BTN_UP 84 //ext2_8
-#define BTN_DOWN 85 //ext2_6
+#define BTN_RIGHT 82 // Ext_12
+#define BTN_LEFT 83 // Ext_10
+#define BTN_UP 84 // Ext2_8
+#define BTN_DOWN 85 // Ext2_6
#define HOME_PIN BTN_HOME
diff --git a/Marlin/pins_AZTEEG_X3.h b/Marlin/pins_AZTEEG_X3.h
index b7d1e726f0a778612f18551ff44a05b2b7dc7c83..998bd38265044c16d524b8b621fa64a5e326999f 100644
--- a/Marlin/pins_AZTEEG_X3.h
+++ b/Marlin/pins_AZTEEG_X3.h
@@ -32,6 +32,9 @@
#include "pins_RAMPS_13.h"
+//
+// LCD / Controller
+//
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#undef DOGLCD_A0
diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h
index e59279bd0a4afeadbbc53d3dc68969f91e24d574..99720613a9b5b5f5ac095cfbd3a3607f39136e8b 100644
--- a/Marlin/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/pins_AZTEEG_X3_PRO.h
@@ -28,6 +28,8 @@
#include "pins_RAMPS.h"
+//
+// Servos
//
// Tested this pin with bed leveling on a Delta with 1 servo.
// Physical wire attachment on EXT1: GND, 5V, D47.
@@ -35,6 +37,8 @@
#undef SERVO0_PIN
#define SERVO0_PIN 47
+//
+// Limit Switches
//
// Swap the MIN and MAX endstop pins because the X3 Pro comes with only
// MIN endstop pin headers soldered onto the board.
@@ -80,11 +84,11 @@
//
// 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
+#define TEMP_2_PIN 12 // Analog Input
+#define TEMP_3_PIN 11 // Analog Input
+#define TEMP_4_PIN 10 // Analog Input
+#define TC1 4 // Analog Input (Thermo couple on Azteeg X3Pro)
+#define TC2 5 // Analog Input (Thermo couple on Azteeg X3Pro)
//
// Heaters / Fans
@@ -97,9 +101,9 @@
#define HEATER_7_PIN 11
#undef FAN_PIN
-#define FAN_PIN 6 //Part Cooling System
+#define FAN_PIN 6 // Part Cooling System
-#define CONTROLLERFAN_PIN 4 //Pin used for the fan to cool motherboard (-1 to disable)
+#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
diff --git a/Marlin/pins_BAM_DICE_DUE.h b/Marlin/pins_BAM_DICE_DUE.h
index b1399b695c4f940eead0cdb8297d5b3cdb81c223..488861d5c9ff930902157236ffe1efc8076d4fe7 100644
--- a/Marlin/pins_BAM_DICE_DUE.h
+++ b/Marlin/pins_BAM_DICE_DUE.h
@@ -32,6 +32,9 @@
#include "pins_RAMPS.h"
+//
+// Temperature Sensors
+//
#undef TEMP_0_PIN
#undef TEMP_1_PIN
#define TEMP_0_PIN 9 // Analog Input
diff --git a/Marlin/pins_BQ_ZUM_MEGA_3D.h b/Marlin/pins_BQ_ZUM_MEGA_3D.h
index c05674f07119767193b09e1c62fd50a59e7e76d7..8075265f09aade0c17778b28c461e3c784dca6e2 100644
--- a/Marlin/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/pins_BQ_ZUM_MEGA_3D.h
@@ -30,6 +30,9 @@
#define BOARD_NAME "ZUM Mega 3D"
+//
+// Heaters / Fans
+//
#define RAMPS_D8_PIN 10
#define RAMPS_D9_PIN 12
#define RAMPS_D10_PIN 9
@@ -37,23 +40,38 @@
#include "pins_RAMPS_13.h"
+//
+// Limit Switches
+//
#undef X_MAX_PIN
-#define X_MAX_PIN 79 // 2
+#define X_MAX_PIN 79 // 2
+//
+// Z Probe (when not Z_MIN_PIN)
+//
#undef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 19 // IND_S_5V
#undef Z_ENABLE_PIN
#define Z_ENABLE_PIN 77 // 62
+//
+// Steppers
+//
+#define DIGIPOTSS_PIN 22
+#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 }
+
+//
+// Temperature Sensors
+//
#undef TEMP_1_PIN
-#define TEMP_1_PIN 14 // 15
+#define TEMP_1_PIN 14 // Analog Input (15)
#undef TEMP_BED_PIN
-#define TEMP_BED_PIN 15 // 14
-
-#define DIGIPOTSS_PIN 22
-#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 }
+#define TEMP_BED_PIN 15 // Analog Input (14)
+//
+// Misc. Functions
+//
#undef PS_ON_PIN // 12
#define PS_ON_PIN 81 // External Power Supply
diff --git a/Marlin/pins_BRAINWAVE.h b/Marlin/pins_BRAINWAVE.h
index d7dc0942d77effaf0352383224e898e92745afb8..ba9d04099c7277359d48aad2b22330ab1a888d9a 100644
--- a/Marlin/pins_BRAINWAVE.h
+++ b/Marlin/pins_BRAINWAVE.h
@@ -76,6 +76,10 @@
//
#define HEATER_0_PIN 4 // Extruder
#define HEATER_BED_PIN 38 // Bed
+
#define FAN_PIN 3 // Fan
+//
+// Misc. Functions
+//
#define LED_PIN 39
diff --git a/Marlin/pins_BRAINWAVE_PRO.h b/Marlin/pins_BRAINWAVE_PRO.h
index 34479e2f047f67d6cd7c6024212f2d68d37365d7..b353581f0a483d51404ef4af33918c7c27f6a847 100644
--- a/Marlin/pins_BRAINWAVE_PRO.h
+++ b/Marlin/pins_BRAINWAVE_PRO.h
@@ -90,9 +90,8 @@
#define FAN_PIN 16 // Fan, PWM
//
-// LCD / Controller
+// Misc. Functions
//
#define SDSS 20
#define SD_DETECT_PIN 12
-
#define LED_PIN 19
diff --git a/Marlin/pins_CHEAPTRONIC.h b/Marlin/pins_CHEAPTRONIC.h
index 9d55919981cd2da608eb400d8c68cd1af23ba016..d1da32cd82c58e475d6652ba535a4b95d455d10d 100644
--- a/Marlin/pins_CHEAPTRONIC.h
+++ b/Marlin/pins_CHEAPTRONIC.h
@@ -75,6 +75,9 @@
#define HEATER_1_PIN 23 // EXTRUDER 2
#define HEATER_BED_PIN 22
+//
+// LCD / Controller
+//
// Cheaptronic v1.0 doesn't support LCD
#define LCD_PINS_RS -1
#define LCD_PINS_ENABLE -1
diff --git a/Marlin/pins_CNCONTROLS_11.h b/Marlin/pins_CNCONTROLS_11.h
index b750c97b5dd637a09eae502f3377aea4ac860705..dfd4c19bd49e9a301ff299efea11155a0cacee52 100644
--- a/Marlin/pins_CNCONTROLS_11.h
+++ b/Marlin/pins_CNCONTROLS_11.h
@@ -56,6 +56,7 @@
#define TEMP_2_PIN 2 // Analog Input. 9 for tool3 -> 2 for chambertemp
#define TEMP_3_PIN 11 // Analog Input. 11 for tool4 -> 2 for chambertemp
#define TEMP_BED_PIN 1 // Analog Input
+//#define TEMP_CHAMBER_PIN 2 // Analog Input
//
// Heaters / Fans
@@ -66,6 +67,14 @@
#define HEATER_3_PIN 46
#define HEATER_BED_PIN 2
+//#define FAN_PIN 7 // common PWM pin for all tools
+
+//
+// Misc. Functions
+//
+#define SDSS 53
+#define SD_DETECT_PIN 13
+
// Tools
//#define TOOL_0_PIN 4
@@ -76,18 +85,10 @@
// Common I/O
-//#define TEMP_CHAMBER_PIN 2 // ANALOG INPUT !!
//#define FIL_RUNOUT_PIN -1
//#define PWM_1_PIN 11
//#define PWM_2_PIN 10
//#define SPARE_IO 12
-//#define FAN_PIN 7 // common PWM pin for all tools
-
-//
-// SD Card
-//
-#define SDSS 53
-#define SD_DETECT_PIN 13
//
// LCD / Controller
@@ -112,8 +113,5 @@
//#define UI1 31
//#define UI2 22
-//
-// Misc. Functions
-//
#define STAT_LED_BLUE_PIN -1
#define STAT_LED_RED_PIN 31
diff --git a/Marlin/pins_CNCONTROLS_12.h b/Marlin/pins_CNCONTROLS_12.h
index e55f208caa96f0f36ccfb331b6c602025f008aba..aac4d8afc774ba7da0e47bb040f062ca52f40651 100644
--- a/Marlin/pins_CNCONTROLS_12.h
+++ b/Marlin/pins_CNCONTROLS_12.h
@@ -69,9 +69,11 @@
#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
+//
+// Misc. Functions
+//
+#define SDSS 53
+#define SD_DETECT_PIN 15
// Tools
@@ -86,6 +88,11 @@
// Common I/O
+#define FIL_RUNOUT_PIN 18
+//#define PWM_1_PIN 12
+//#define PWM_2_PIN 13
+//#define SPARE_IO 17
+
//
// LCD / Controller
//
@@ -113,12 +120,3 @@
#define STAT_LED_BLUE_PIN -1
#define STAT_LED_RED_PIN 10 // TOOL_0_PWM_PIN
-
-//
-// SD Card
-//
-#define SDSS 53
-#define SD_DETECT_PIN 15
-
-// Other
-#define FIL_RUNOUT_PIN 18
diff --git a/Marlin/pins_ELEFU_3.h b/Marlin/pins_ELEFU_3.h
index aba2f4ad6977642cf81e667113a5ccb1cd9c8fec..51bd078648d256a97e60fdce73963cceec323f47 100644
--- a/Marlin/pins_ELEFU_3.h
+++ b/Marlin/pins_ELEFU_3.h
@@ -116,34 +116,34 @@
#endif // RA_CONTROL_PANEL
#if ENABLED(RA_DISCO)
- //variables for which pins the TLC5947 is using
+ // variables for which pins the TLC5947 is using
#define TLC_CLOCK_PIN 25
#define TLC_BLANK_PIN 23
#define TLC_XLAT_PIN 22
#define TLC_DATA_PIN 24
- //We also need to define pin to port number mapping for the 2560 to match the pins listed above. If you change the TLC pins, update this as well per the 2560 datasheet!
- //This currently only works with the RA Board.
- #define TLC_CLOCK_BIT 3 //bit 3 on port A
- #define TLC_CLOCK_PORT &PORTA //bit 3 on port A
+ // We also need to define pin to port number mapping for the 2560 to match the pins listed above. If you change the TLC pins, update this as well per the 2560 datasheet!
+ // This currently only works with the RA Board.
+ #define TLC_CLOCK_BIT 3 // bit 3 on port A
+ #define TLC_CLOCK_PORT &PORTA // bit 3 on port A
- #define TLC_BLANK_BIT 1 //bit 1 on port A
- #define TLC_BLANK_PORT &PORTA //bit 1 on port A
+ #define TLC_BLANK_BIT 1 // bit 1 on port A
+ #define TLC_BLANK_PORT &PORTA // bit 1 on port A
- #define TLC_DATA_BIT 2 //bit 2 on port A
- #define TLC_DATA_PORT &PORTA //bit 2 on port A
+ #define TLC_DATA_BIT 2 // bit 2 on port A
+ #define TLC_DATA_PORT &PORTA // bit 2 on port A
- #define TLC_XLAT_BIT 0 //bit 0 on port A
- #define TLC_XLAT_PORT &PORTA //bit 0 on port A
+ #define TLC_XLAT_BIT 0 // bit 0 on port A
+ #define TLC_XLAT_PORT &PORTA // bit 0 on port A
- //change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
- //Leave it at at least 1 if you have enabled RA_LIGHTING
- //The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
+ // change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
+ // Leave it at at least 1 if you have enabled RA_LIGHTING
+ // The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
#define NUM_TLCS 2
- //These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
- //Modify them according to your specific situation.
- //NOTE: the array should be 8 long for every TLC you have. These defaults assume (2) TLCs.
+ // These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
+ // Modify them according to your specific situation.
+ // NOTE: the array should be 8 long for every TLC you have. These defaults assume (2) TLCs.
#define TRANS_ARRAY {0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8} //forwards
//#define TRANS_ARRAY {7, 6, 5, 4, 3, 2, 1, 0, 8, 9, 10, 11, 12, 13, 14, 15} //backwards
#endif // RA_DISCO
diff --git a/Marlin/pins_FELIX2.h b/Marlin/pins_FELIX2.h
index 31906b515131d781d70d93f385b364d22a3c4219..45bf257c42558db486bbb438917977ae6a7affd5 100644
--- a/Marlin/pins_FELIX2.h
+++ b/Marlin/pins_FELIX2.h
@@ -30,16 +30,25 @@
#define BOARD_NAME "Felix 2.0+"
+//
+// Heaters / Fans
+//
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7
#include "pins_RAMPS.h"
+//
+// Misc. Functions
+//
#undef SDPOWER
#define SDPOWER 1
#define PS_ON_PIN 12
+//
+// LCD / Controller
+//
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
#define SD_DETECT_PIN 6
diff --git a/Marlin/pins_GEN3_MONOLITHIC.h b/Marlin/pins_GEN3_MONOLITHIC.h
index aacbc046a0b005f386caceff9988221a65152871..e7a5dfb0d15390e93f97a95cb53f4519a30a0799 100644
--- a/Marlin/pins_GEN3_MONOLITHIC.h
+++ b/Marlin/pins_GEN3_MONOLITHIC.h
@@ -68,7 +68,7 @@
#define HEATER_0_PIN 16
//
-// Etc.
+// Misc. Functions
//
#define PS_ON_PIN 14 // Alex, does this work on the card?
diff --git a/Marlin/pins_GEN3_PLUS.h b/Marlin/pins_GEN3_PLUS.h
index 19c782ac47db5a03da0668d0c117826e0f95e457..b5236d87eae8e003317a92ba8bc9ffd4a907749b 100644
--- a/Marlin/pins_GEN3_PLUS.h
+++ b/Marlin/pins_GEN3_PLUS.h
@@ -56,8 +56,6 @@
#define E0_DIR_PIN 21
#define E0_ENABLE_PIN 13
-#define PS_ON_PIN 14
-
//
// Temperature Sensors
//
@@ -71,6 +69,8 @@
#define HEATER_BED_PIN 16
//
-// SD Card
+// Misc. Functions
//
#define SDSS 4
+#define PS_ON_PIN 14
+
diff --git a/Marlin/pins_GEN6.h b/Marlin/pins_GEN6.h
index e1a34f1397201fa4e9dfdac6be3d74629cc56aab..9d1e1bcf18ec4e2cd51549ca28ffaf0b19cd75b1 100644
--- a/Marlin/pins_GEN6.h
+++ b/Marlin/pins_GEN6.h
@@ -56,9 +56,9 @@
#define Z_DIR_PIN 28
#define Z_ENABLE_PIN 29
-#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 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
@@ -68,21 +68,17 @@
//
// Heaters
//
-#define HEATER_0_PIN 14 //changed @ rkoeppl 20110410
+#define HEATER_0_PIN 14 // changed @ rkoeppl 20110410
#if !MB(GEN6)
- #define HEATER_BED_PIN 1 //changed @ rkoeppl 20110410
+ #define HEATER_BED_PIN 1 // changed @ rkoeppl 20110410
#define TEMP_BED_PIN 0 // Analog Input
#endif
-//
-// SD Card
-//
-#define SDSS 17
-
//
// Misc. Functions
//
+#define SDSS 17
#define DEBUG_PIN 0
// RS485 pins
diff --git a/Marlin/pins_GEN7_14.h b/Marlin/pins_GEN7_14.h
index 3cfdf68500770ab34f30ed57c5d3c682e8a4bc0e..d200137b486a00910082b3f65fd2437972dea860 100644
--- a/Marlin/pins_GEN7_14.h
+++ b/Marlin/pins_GEN7_14.h
@@ -70,6 +70,9 @@
#define HEATER_0_PIN 4
#define HEATER_BED_PIN 3
+//
+// Misc. Functions
+//
#define PS_ON_PIN 15
// A pin for debugging
diff --git a/Marlin/pins_GEN7_CUSTOM.h b/Marlin/pins_GEN7_CUSTOM.h
index 9515f79cf511b6c8ba5b966d361676b7737a6837..81809d61ae9c9b09d7c8eeea290e94af482071c4 100644
--- a/Marlin/pins_GEN7_CUSTOM.h
+++ b/Marlin/pins_GEN7_CUSTOM.h
@@ -71,13 +71,18 @@
#define HEATER_0_PIN 4
#define HEATER_BED_PIN 3 // (bed)
-#define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support
-
+//
+// Misc. Functions
+//
+#define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support
#define PS_ON_PIN 19
// A pin for debugging
#define DEBUG_PIN -1
+//
+// LCD / Controller
+//
#define BEEPER_PIN -1
// 4bit LCD Support
diff --git a/Marlin/pins_K8400.h b/Marlin/pins_K8400.h
index 163755d92870282eca842c687db4387fa938f72d..030546c93dd2620702a4975dbf1c66247f2cbf16 100644
--- a/Marlin/pins_K8400.h
+++ b/Marlin/pins_K8400.h
@@ -37,18 +37,31 @@
#include "pins_3DRAG.h"
-#undef X_MAX_PIN
-#undef X_MIN_PIN
-#undef Y_MAX_PIN
-#undef Y_MIN_PIN
+//
+// Limit Switches
+//
#define X_STOP_PIN 3
#define Y_STOP_PIN 14
+#undef X_MIN_PIN
+#undef X_MAX_PIN
+#undef Y_MIN_PIN
+#undef Y_MAX_PIN
+
+//
+// Steppers
+//
#undef E1_STEP_PIN
#define E1_STEP_PIN 32
-#undef PS_ON_PIN
-#undef KILL_PIN
-
+//
+// Heaters / Fans
+//
#undef HEATER_1_PIN
#define HEATER_1_PIN 11
+
+//
+// Misc. Functions
+//
+#undef PS_ON_PIN
+#undef KILL_PIN
diff --git a/Marlin/pins_LEAPFROG.h b/Marlin/pins_LEAPFROG.h
index a87549b8d663f913281c87368250b5153f3ae384..a7fffa532516bffbc90578d1dbbb1b9faddf0a8d 100644
--- a/Marlin/pins_LEAPFROG.h
+++ b/Marlin/pins_LEAPFROG.h
@@ -63,14 +63,6 @@
#define E1_DIR_PIN 40 // 40
#define E1_ENABLE_PIN 36 // 36
-//
-// Misc. Functions
-//
-#define SDSS 11
-#define LED_PIN 13
-#define SOL1_PIN 16
-#define SOL2_PIN 17
-
//
// Temperature Sensors
//
@@ -88,5 +80,12 @@
#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) */
+//
+// Misc. Functions
+//
+#define SDSS 11
+#define LED_PIN 13
+#define SOL1_PIN 16
+#define SOL2_PIN 17
+/* 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) */
diff --git a/Marlin/pins_MEGACONTROLLER.h b/Marlin/pins_MEGACONTROLLER.h
index c08512f8e594340f43627b593d544a1aa9a74f70..10ffe3283ae7df3377307b9e554aa93b5bbf5d92 100644
--- a/Marlin/pins_MEGACONTROLLER.h
+++ b/Marlin/pins_MEGACONTROLLER.h
@@ -82,12 +82,6 @@
#define E1_DIR_PIN 27
#define E1_ENABLE_PIN 25
-//
-// Misc. Functions
-//
-#define SDSS 53
-#define LED_PIN 13
-
//
// Temperature Sensors
//
@@ -126,6 +120,12 @@
#define FAN_SOFT_PWM
+//
+// Misc. Functions
+//
+#define SDSS 53
+#define LED_PIN 13
+
//
// LCD / Controller
//
@@ -150,4 +150,3 @@
#define SD_DETECT_PIN 49
#endif // MINIPANEL
-
diff --git a/Marlin/pins_MEGATRONICS.h b/Marlin/pins_MEGATRONICS.h
index 3f2be4f4720fcd803ce67da2b041c0245fb59cf2..5b8d41f4f59f5830e0aaf20f559851adbc06c390 100644
--- a/Marlin/pins_MEGATRONICS.h
+++ b/Marlin/pins_MEGATRONICS.h
@@ -71,13 +71,6 @@
#define E1_DIR_PIN 36
#define E1_ENABLE_PIN 30
-//
-// Misc. Functions
-//
-#define SDSS 53
-#define LED_PIN 13
-#define PS_ON_PIN 12
-
//
// Temperature Sensors
//
@@ -98,6 +91,13 @@
#define FAN_PIN 7 // IO pin. Buffer needed
+//
+// Misc. Functions
+//
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 12
+
//
// LCD / Controller
//
diff --git a/Marlin/pins_MEGATRONICS_2.h b/Marlin/pins_MEGATRONICS_2.h
index 766cc2c254cbe35299e76ae50ed8c22a82c763d3..be3ed4cf4abd944a57b8aae8ad3f58641009abe4 100644
--- a/Marlin/pins_MEGATRONICS_2.h
+++ b/Marlin/pins_MEGATRONICS_2.h
@@ -75,13 +75,6 @@
#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
//
@@ -113,6 +106,13 @@
#define FAN_PIN 7
#define FAN1_PIN 6
+//
+// Misc. Functions
+//
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 12
+
//
// LCD / Controller
//
diff --git a/Marlin/pins_MEGATRONICS_3.h b/Marlin/pins_MEGATRONICS_3.h
index 15b6fcb6848a833d05786408b8c7157522611461..8f02325ddd816d036dd1e76990ac0df7ca65802b 100644
--- a/Marlin/pins_MEGATRONICS_3.h
+++ b/Marlin/pins_MEGATRONICS_3.h
@@ -63,6 +63,8 @@
#define Z_MIN_PROBE_PIN 19
#endif
+#define SLED_PIN -1
+
//
// Steppers
//
@@ -90,14 +92,6 @@
#define E2_DIR_PIN 60
#define E2_ENABLE_PIN 23
-//
-// Misc. Functions
-//
-#define SDSS 53
-#define LED_PIN 13
-#define PS_ON_PIN 12
-#define SLED_PIN -1
-
//
// Temperature Sensors
//
@@ -133,6 +127,13 @@
#define FAN_PIN 6
#define FAN1_PIN 7
+//
+// Misc. Functions
+//
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 12
+
//
// LCD / Controller
//
diff --git a/Marlin/pins_MINIRAMBO.h b/Marlin/pins_MINIRAMBO.h
index 4746be6067dad7283b023906fa37229839d08c75..551926a5fae5cf0945b884f2b4f5464402313349 100644
--- a/Marlin/pins_MINIRAMBO.h
+++ b/Marlin/pins_MINIRAMBO.h
@@ -54,35 +54,37 @@
#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
+// Microstepping pins - Mapping not from fastio.h (?)
+#define X_MS1_PIN 40
+#define X_MS2_PIN 41
+#define Y_MS1_PIN 69
+#define Y_MS2_PIN 39
+#define Z_MS1_PIN 68
+#define Z_MS2_PIN 67
+#define E0_MS1_PIN 65
+#define E0_MS2_PIN 66
+
#define MOTOR_CURRENT_PWM_XY_PIN 46
#define MOTOR_CURRENT_PWM_Z_PIN 45
#define MOTOR_CURRENT_PWM_E_PIN 44
-//Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
+// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
#define MOTOR_CURRENT_PWM_RANGE 2000
#define DEFAULT_PWM_MOTOR_CURRENT {1300, 1300, 1250}
@@ -129,12 +131,12 @@
#define LCD_PINS_D6 85
#define LCD_PINS_D7 71
- //buttons are directly attached using AUX-2
+ // buttons are directly attached using AUX-2
#define BTN_EN1 14
#define BTN_EN2 72
#define BTN_ENC 9 // the click
#define SD_DETECT_PIN 15
- #endif //NEWPANEL
-#endif //ULTRA_LCD
+ #endif // NEWPANEL
+#endif // ULTRA_LCD
diff --git a/Marlin/pins_MINITRONICS.h b/Marlin/pins_MINITRONICS.h
index 244aa6fb53486a719e70f30302fd0df1b837c634..7ee89a0a456b5d41c43a39cb3d008bcae11c2597 100644
--- a/Marlin/pins_MINITRONICS.h
+++ b/Marlin/pins_MINITRONICS.h
@@ -71,9 +71,6 @@
//
// Temperature Sensors
//
-#define SDSS 16
-#define LED_PIN 46
-
#define TEMP_0_PIN 7 // Analog Input
#define TEMP_1_PIN 6 // Analog Input
#define TEMP_BED_PIN 6 // Analog Input
@@ -87,6 +84,12 @@
#define FAN_PIN 9
+//
+// Misc. Functions
+//
+#define SDSS 16
+#define LED_PIN 46
+
//
// LCD / Controller
//
@@ -118,5 +121,5 @@
#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
diff --git a/Marlin/pins_MKS_13.h b/Marlin/pins_MKS_13.h
index 0457be78c8f68419033252e77f82f74878fbcd2c..ce1217157c0d323ccb479f8161e5d7d78b142ba0 100644
--- a/Marlin/pins_MKS_13.h
+++ b/Marlin/pins_MKS_13.h
@@ -35,11 +35,17 @@
#define BOARD_NAME "MKS > v1.3"
+//
+// Heaters / Fans
+//
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7
#include "pins_RAMPS.h"
+//
+// LCD / Controller
+//
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
/**
* VIKI2 Has two groups of wires with...
diff --git a/Marlin/pins_MKS_BASE.h b/Marlin/pins_MKS_BASE.h
index 8c7222017aedf240798966977b9095dfca5698e7..c098341530eacb52d00b63bcbc2a9227f994d0da 100644
--- a/Marlin/pins_MKS_BASE.h
+++ b/Marlin/pins_MKS_BASE.h
@@ -30,6 +30,9 @@
#define BOARD_NAME "MKS BASE 1.0"
+//
+// Heaters / Fans
+//
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7
diff --git a/Marlin/pins_OMCA.h b/Marlin/pins_OMCA.h
index 06b48995aa33760f73964c283df6bd38894fbbdd..a69d61ec73426be5115d03e247e962e1a56d52ee 100644
--- a/Marlin/pins_OMCA.h
+++ b/Marlin/pins_OMCA.h
@@ -57,33 +57,32 @@
#define BOARD_NAME "Final OMCA"
+//
+// Limit Switches
+//
+#define X_STOP_PIN 0
+#define Y_STOP_PIN 1
+#define Z_STOP_PIN 2
+
+//
+// Steppers
+//
#define X_STEP_PIN 26
#define X_DIR_PIN 25
#define X_ENABLE_PIN 10
-#define X_STOP_PIN 0
#define Y_STEP_PIN 28
#define Y_DIR_PIN 27
#define Y_ENABLE_PIN 10
-#define Y_STOP_PIN 1
#define Z_STEP_PIN 23
#define Z_DIR_PIN 22
#define Z_ENABLE_PIN 10
-#define Z_STOP_PIN 2
#define E0_STEP_PIN 24
#define E0_DIR_PIN 21
#define E0_ENABLE_PIN 10
-// future proofing
-#define __FS 20
-#define __FD 19
-#define __GS 18
-#define __GD 13
-
-#define UNUSED_PWM 14 // PWM on LEFT connector
-
#define E1_STEP_PIN -1 // 21
#define E1_DIR_PIN -1 // 20
#define E1_ENABLE_PIN -1 // 19
@@ -92,16 +91,33 @@
#define E2_DIR_PIN -1 // 20
#define E2_ENABLE_PIN -1 // 18
-#define SDSS 11
-#define FAN_PIN 14 // PWM on MIDDLE connector
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input (1,2 or I2C)
+//
+// Heaters / Fans
+//
#define HEATER_0_PIN 3 // DONE PWM on RIGHT connector
#define HEATER_BED_PIN 4
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 1 // Analog Input
-#define TEMP_BED_PIN 2 // Analog Input (1,2 or I2C)
+#define FAN_PIN 14 // PWM on MIDDLE connector
+
+//
+// Misc. Functions
+//
+#define SDSS 11
#define I2C_SCL 16
#define I2C_SDA 17
+// future proofing
+#define __FS 20
+#define __FD 19
+#define __GS 18
+#define __GD 13
+
+#define UNUSED_PWM 14 // PWM on LEFT connector
diff --git a/Marlin/pins_OMCA_A.h b/Marlin/pins_OMCA_A.h
index 5e1415a153d8b33c8951fd2672fc16ddc185645a..d325a648d9c64dfb36688c2ed48adeae9618427b 100644
--- a/Marlin/pins_OMCA_A.h
+++ b/Marlin/pins_OMCA_A.h
@@ -99,8 +99,12 @@
// Heaters / Fans
//
#define HEATER_0_PIN 4
+
#define FAN_PIN 3
+//
+// Misc. Functions
+//
#define SDSS 11
/* 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) */
diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/pins_PRINTRBOARD.h
index 0852c97569fdb16f513064d1fa709474f2116280..b53db770a523ebb32b059d6b4a8d39ad065b4ff0 100644
--- a/Marlin/pins_PRINTRBOARD.h
+++ b/Marlin/pins_PRINTRBOARD.h
@@ -43,6 +43,20 @@
// Disable JTAG pins so they can be used for the Extrudrboard
#define DISABLE_JTAG true
+//
+// Limit Switches
+//
+#define X_STOP_PIN 35
+#if ENABLED(SDSUPPORT)
+ #define Y_STOP_PIN 37 // Move Ystop to Estop socket
+#else
+ #define Y_STOP_PIN 8 // Ystop in Ystop socket
+#endif
+#define Z_STOP_PIN 36
+
+//
+// Steppers
+//
#define X_STEP_PIN 0
#define X_DIR_PIN 1
#define X_ENABLE_PIN 39
@@ -59,7 +73,16 @@
#define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19
-#define HEATER_0_PIN 21 // Extruder
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 1 // Analog Input
+#define TEMP_BED_PIN 0 // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN 21 // Extruder
#define HEATER_1_PIN 46
#define HEATER_2_PIN 47
#define HEATER_BED_PIN 20
@@ -72,40 +95,32 @@
#define FAN_PIN 16
#endif
-#define X_STOP_PIN 35
-#if ENABLED(SDSUPPORT)
- #define Y_STOP_PIN 37 // Move Ystop to Estop socket
-#else
- #define Y_STOP_PIN 8 // Ystop in Ystop socket
-#endif
-#define Z_STOP_PIN 36
-
-#define TEMP_0_PIN 1 // Analog Input
-#define TEMP_BED_PIN 0 // Analog Input
-
-#define FILWIDTH_PIN 2 // Analog Input
-
-////LCD Pin Setup////
-
+//
+// Misc. Functions
+//
#define SDSS 26
+#define FILWIDTH_PIN 2 // Analog Input
+//
+// LCD / Controller
+//
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
- //we have no buzzer installed
+ // we have no buzzer installed
#define BEEPER_PIN -1
- //LCD Pins
+ // LCD Pins
#if ENABLED(LCD_I2C_PANELOLU2)
- #define BTN_EN1 27 //RX1 - fastio.h pin mapping 27
- #define BTN_EN2 26 //TX1 - fastio.h pin mapping 26
- #define BTN_ENC 43 //A3 - fastio.h pin mapping 43
- #define SDSS 40 //use SD card on Panelolu2 (Teensyduino pin mapping)
+ #define BTN_EN1 27 // RX1 - fastio.h pin mapping 27
+ #define BTN_EN2 26 // TX1 - fastio.h pin mapping 26
+ #define BTN_ENC 43 // A3 - fastio.h pin mapping 43
+ #define SDSS 40 // use SD card on Panelolu2 (Teensyduino pin mapping)
#else
#define BTN_EN1 16
#define BTN_EN2 17
- #define BTN_ENC 18//the click
+ #define BTN_ENC 18 // the click
#endif // LCD_I2C_PANELOLU2
- //not connected to a pin
+ // not connected to a pin
#define SD_DETECT_PIN -1
#define LCD_PINS_RS 9
@@ -118,14 +133,14 @@
#endif // ULTRA_LCD && NEWPANEL
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
- //FastIO
+ // FastIO
#define BEEPER_PIN 32
// Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 42 //Non-FastIO
- #define DOGLCD_CS 43 //Non-FastIO
+ #define DOGLCD_A0 42 // Non-FastIO
+ #define DOGLCD_CS 43 // Non-FastIO
#define LCD_SCREEN_ROT_180
- //The encoder and click button (FastIO Pins)
+ // The encoder and click button (FastIO Pins)
#define BTN_EN1 26
#define BTN_EN2 27
#define BTN_ENC 47
@@ -133,7 +148,7 @@
#define SDSS 45
#define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test)
- #define STAT_LED_RED_PIN 12 //Non-FastIO
- #define STAT_LED_BLUE_PIN 10 //Non-FastIO
+ #define STAT_LED_RED_PIN 12 // Non-FastIO
+ #define STAT_LED_BLUE_PIN 10 // Non-FastIO
#endif
diff --git a/Marlin/pins_PRINTRBOARD_REVF.h b/Marlin/pins_PRINTRBOARD_REVF.h
index 548b506121bf2d23283a5f7b4430c973746c2b31..fa5c3a615a7e8ee9b6d235f07ca8dae9c14a2063 100644
--- a/Marlin/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/pins_PRINTRBOARD_REVF.h
@@ -38,6 +38,16 @@
#define BOARD_NAME "Printrboard Rev F"
#define LARGE_FLASH true
+//
+// Limit Switches
+//
+#define X_STOP_PIN 35
+#define Y_STOP_PIN 12
+#define Z_STOP_PIN 36
+
+//
+// Steppers
+//
#define X_STEP_PIN 0
#define X_DIR_PIN 1
#define X_ENABLE_PIN 39
@@ -54,7 +64,28 @@
#define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19
-#define HEATER_0_PIN 21 // Extruder
+// uncomment to enable an I2C based DAC like on the Printrboard REVF
+#define DAC_STEPPER_CURRENT
+// Number of channels available for DAC, For Printrboar REVF there are 4
+#define DAC_STEPPER_ORDER { 3, 2, 1, 0 }
+
+#define DAC_STEPPER_SENSE 0.11
+#define DAC_STEPPER_ADDRESS 0
+#define DAC_STEPPER_MAX 3520
+#define DAC_STEPPER_VREF 1 // internal Vref, gain 1x = 2.048V
+#define DAC_STEPPER_GAIN 0
+#define DAC_OR_ADDRESS 0x00
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 1 // Analog Input (Extruder)
+#define TEMP_BED_PIN 0 // Analog Input (Bed)
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN 21 // Extruder
#define HEATER_1_PIN 46
#define HEATER_2_PIN 47
#define HEATER_BED_PIN 20
@@ -67,31 +98,15 @@
#define FAN_PIN 16
#endif
-#define X_STOP_PIN 35
-#define Y_STOP_PIN 12
-#define Z_STOP_PIN 36
-
-#define TEMP_0_PIN 1 // Extruder / Analog pin numbering
-#define TEMP_BED_PIN 0 // Bed / Analog pin numbering
-
-#define FILWIDTH_PIN 2 // ANALOG NUMBERING
-
-////LCD Pin Setup////
-
+//
+// Misc. Functions
+//
#define SDSS 20 // Teensylu pin mapping
+#define FILWIDTH_PIN 2 // Analog Input
-// uncomment to enable an I2C based DAC like on the Printrboard REVF
-#define DAC_STEPPER_CURRENT
-// Number of channels available for DAC, For Printrboar REVF there are 4
-#define DAC_STEPPER_ORDER { 3, 2, 1, 0 }
-
-#define DAC_STEPPER_SENSE 0.11
-#define DAC_STEPPER_ADDRESS 0
-#define DAC_STEPPER_MAX 3520
-#define DAC_STEPPER_VREF 1 //internal Vref, gain 1x = 2.048V
-#define DAC_STEPPER_GAIN 0
-#define DAC_OR_ADDRESS 0x00
-
+//
+// LCD / Controller
+//
#if ENABLED(ULTRA_LCD)
#define BEEPER_PIN -1
@@ -104,11 +119,11 @@
#define BTN_EN1 16
#define BTN_EN2 17
- #define BTN_ENC 18//the click
+ #define BTN_ENC 18 // the click
#define SD_DETECT_PIN -1
- //encoder rotation values
+ // encoder rotation values
#define encrot0 0
#define encrot1 2
#define encrot2 3
@@ -116,9 +131,9 @@
#endif
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
- #define BEEPER_PIN 32 //FastIO
- #define DOGLCD_A0 42 //Non-FastIO
- #define DOGLCD_CS 43 //Non-FastIO
+ #define BEEPER_PIN 32 // FastIO
+ #define DOGLCD_A0 42 // Non-FastIO
+ #define DOGLCD_CS 43 // Non-FastIO
#define LCD_SCREEN_ROT_180
// (FastIO Pins)
@@ -129,6 +144,6 @@
#define SDSS 45
#define SD_DETECT_PIN -1 // FastIO (Manual says 72)
- #define STAT_LED_RED_PIN 12 //Non-FastIO
- #define STAT_LED_BLUE_PIN 10 //Non-FastIO
+ #define STAT_LED_RED_PIN 12 // Non-FastIO
+ #define STAT_LED_BLUE_PIN 10 // Non-FastIO
#endif
diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h
index 3379e479a35f8e7566725a7f34264cf00c60e903..8289940752870db5994d0ba46bf006e6ae8062ba 100755
--- a/Marlin/pins_RAMBO.h
+++ b/Marlin/pins_RAMBO.h
@@ -56,6 +56,13 @@
#define SERVO2_PIN 24 // Motor header MX3
#define SERVO3_PIN 5 // PWM header pin 5
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+ #define Z_MIN_PROBE_PIN 30
+#endif
+
#if ENABLED(Z_PROBE_SLED)
#define SLED_PIN -1
#endif
@@ -70,43 +77,38 @@
#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
+
+// Microstepping pins - Mapping not from fastio.h (?)
+#define X_MS1_PIN 40
+#define X_MS2_PIN 41
+#define Y_MS1_PIN 69
+#define Y_MS2_PIN 39
+#define Z_MS1_PIN 68
+#define Z_MS2_PIN 67
+#define E0_MS1_PIN 65
+#define E0_MS2_PIN 66
#define E1_MS1_PIN 63
#define E1_MS2_PIN 64
@@ -116,9 +118,9 @@
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0
-#define TEMP_1_PIN 1
-#define TEMP_BED_PIN 2
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input
//
// Heaters / Fans
@@ -137,9 +139,12 @@
//
#define SDSS 53
#define LED_PIN 13
-#define FILWIDTH_PIN 3 // ANALOG NUMBERING
+#define FILWIDTH_PIN 3 // Analog Input
#define PS_ON_PIN 4
+//
+// LCD / Controller
+//
#if ENABLED(ULTRA_LCD)
#define KILL_PIN 80
@@ -155,9 +160,9 @@
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 44
- //NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
- // beeper/buzzer is connected to pin 33; however, the pin used in the
- // diagram is actually pin 44, so this is correct.
+ // NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
+ // beeper/buzzer is connected to pin 33; however, the pin used in the
+ // diagram is actually pin 44, so this is correct.
#define DOGLCD_A0 70
#define DOGLCD_CS 71
@@ -185,12 +190,12 @@
#endif // VIKI2/miniVIKI
- #else //!NEWPANEL - old style panel with shift register
+ #else // !NEWPANEL - old style panel with shift register
// No Beeper added
#define BEEPER_PIN 33
- //buttons are attached to a shift register
+ // buttons are attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h
index 5685add8a1a090da9f159558c1f03f657d2dbb78..00f93088c677048763b36f9d941657440e3efd2e 100644
--- a/Marlin/pins_RAMPS.h
+++ b/Marlin/pins_RAMPS.h
@@ -85,6 +85,8 @@
#define Z_MIN_PROBE_PIN 32
#endif
+#define SLED_PIN -1
+
//
// Steppers
//
@@ -111,24 +113,16 @@
//
// Temperature Sensors
//
-#define TEMP_0_PIN 13 // ANALOG NUMBERING
-#define TEMP_1_PIN 15 // ANALOG NUMBERING
-#define TEMP_BED_PIN 14 // ANALOG NUMBERING
+#define TEMP_0_PIN 13 // Analog Input
+#define TEMP_1_PIN 15 // Analog Input
+#define TEMP_BED_PIN 14 // Analog Input
-//
-// Misc. Functions
-//
-#define SDSS 53
-#define LED_PIN 13
-
-// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN 5 // ANALOG NUMBERING
-
-// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
-#define FIL_RUNOUT_PIN 4
-
-#define PS_ON_PIN 12
-#define SLED_PIN -1
+// 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
+#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
//
// Augmentation for auto-assigning RAMPS plugs
@@ -193,15 +187,29 @@
#define FAN_PIN 4 // IO pin. Buffer needed
#endif
+//
+// Misc. Functions
+//
+#define SDSS 53
+#define LED_PIN 13
+
+// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
+#define FILWIDTH_PIN 5 // Analog Input
+
+// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
+#define FIL_RUNOUT_PIN 4
+
+#define PS_ON_PIN 12
+
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 49 //CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 51 //SID (MOSI)
- #define LCD_PINS_D4 52 //SCK (CLK) clock
+ #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ #define LCD_PINS_D4 52 // SCK (CLK) clock
#elif ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
#define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42
@@ -309,11 +317,11 @@
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- //The encoder and click button
+ // The encoder and click button
#define BTN_EN1 40
#define BTN_EN2 63
#define BTN_ENC 59
- //not connected to a pin
+ // not connected to a pin
#define SD_DETECT_PIN 49
#else
@@ -350,10 +358,3 @@
#endif // NEWPANEL
#endif // ULTRA_LCD
-
-// 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
-#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
diff --git a/Marlin/pins_RAMPS_OLD.h b/Marlin/pins_RAMPS_OLD.h
index 238e484c655d58e27fe68cf86e1bf91a4cf42ed9..29812bbdf40731c871ae897a19ff85bc612bb1d7 100644
--- a/Marlin/pins_RAMPS_OLD.h
+++ b/Marlin/pins_RAMPS_OLD.h
@@ -69,18 +69,18 @@
#define E0_DIR_PIN 34
#define E0_ENABLE_PIN 30
-//
-// Misc. Functions
-//
-#define SDPOWER 48
-#define SDSS 53
-#define LED_PIN 13
-
//
// 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!!!!!!!!!
+#define TEMP_0_PIN 2 // Analog Input
+#define TEMP_BED_PIN 1 // Analog Input
+
+// 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
+#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
//
// Heaters / Fans
@@ -95,9 +95,9 @@
#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
-#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
+//
+// Misc. Functions
+//
+#define SDPOWER 48
+#define SDSS 53
+#define LED_PIN 13
diff --git a/Marlin/pins_RIGIDBOARD.h b/Marlin/pins_RIGIDBOARD.h
index a60e492ac08a231796e1aa948d87e7b9a0dae6d9..bcd1437c010498c2e8e4248f1b4ddabf993af092 100644
--- a/Marlin/pins_RIGIDBOARD.h
+++ b/Marlin/pins_RIGIDBOARD.h
@@ -26,21 +26,75 @@
#define BOARD_NAME "RigidBoard"
-#define RAMPS_D10_PIN 9 // EXTRUDER 1
-#define MOSFET_D_PIN 12 // EXTRUDER 2 or FAN
+//
+// Z Probe (when not Z_MIN_PIN)
+//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 19 // Z-MAX pin J14 End Stops
#endif
#include "pins_RAMPS.h"
+//
+// Steppers
+//
+// RigidBot swaps E0 / E1 plugs vs RAMPS 1.3
+#undef E0_STEP_PIN
+#undef E0_DIR_PIN
+#undef E0_ENABLE_PIN
+#define E0_STEP_PIN 36
+#define E0_DIR_PIN 34
+#define E0_ENABLE_PIN 30
+
+#undef E1_STEP_PIN
+#undef E1_DIR_PIN
+#undef E1_ENABLE_PIN
+#define E1_STEP_PIN 26
+#define E1_DIR_PIN 28
+#define E1_ENABLE_PIN 24
+
+#define STEPPER_RESET_PIN 41 // Stepper drivers have a reset on RigidBot
+
+//
+// Temperature Sensors
+//
#undef TEMP_0_PIN
#undef TEMP_1_PIN
-#define TEMP_0_PIN 14 // ANALOG NUMBERING
-#define TEMP_1_PIN 13 // ANALOG NUMBERING
+#undef TEMP_BED_PIN
+#define TEMP_0_PIN 14 // Analog Input
+#define TEMP_1_PIN 13 // Analog Input
+#define TEMP_BED_PIN 15 // Analog Input
-// LCD Panel options for the RigidBoard
+// SPI for Max6675 or Max31855 Thermocouple
+#undef MAX6675_SS
+#if DISABLED(SDSUPPORT)
+ #define MAX6675_SS 53 // Don't use pin 53 if there is even the remote possibility of using Display/SD card
+#else
+ #define MAX6675_SS 49 // Don't 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
+
+//
+// Heaters / Fans
+//
+#define RAMPS_D10_PIN 9 // EXTRUDER 1
+#define MOSFET_D_PIN 12 // EXTRUDER 2 or FAN
+#undef HEATER_BED_PIN
+#define HEATER_BED_PIN 10
+
+#undef FAN_PIN
+#define FAN_PIN 8 // Same as RAMPS_13_EEF
+
+//
+// Misc. Functions
+//
+#undef PS_ON_PIN
+#define PS_ON_PIN -1
+
+//
+// LCD / Controller
+//
+// LCD Panel options for the RigidBoard
#if ENABLED(RIGIDBOT_PANEL)
#undef BEEPER_PIN
@@ -77,41 +131,3 @@
#define KILL_PIN 32
#endif
-
-// SPI for Max6675 or Max31855 Thermocouple
-#undef MAX6675_SS
-#if ENABLED(SDSUPPORT)
- #define MAX6675_SS 49 // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
-#else
- #define MAX6675_SS 53 // Don't use pin 53 if there is even the remote possibility of using Display/SD card
-#endif
-
-// RigidBot swaps E0 / E1 plugs vs RAMPS 1.3
-
-#undef E0_STEP_PIN
-#undef E0_DIR_PIN
-#undef E0_ENABLE_PIN
-#define E0_STEP_PIN 36
-#define E0_DIR_PIN 34
-#define E0_ENABLE_PIN 30
-
-#undef E1_STEP_PIN
-#undef E1_DIR_PIN
-#undef E1_ENABLE_PIN
-#define E1_STEP_PIN 26
-#define E1_DIR_PIN 28
-#define E1_ENABLE_PIN 24
-
-#undef FAN_PIN
-#define FAN_PIN 8 // Same as RAMPS_13_EEF
-
-#undef PS_ON_PIN
-#define PS_ON_PIN -1
-
-#undef HEATER_BED_PIN
-#define HEATER_BED_PIN 10
-
-#undef TEMP_BED_PIN
-#define TEMP_BED_PIN 15 // ANALOG NUMBERING
-
-#define STEPPER_RESET_PIN 41 // Stepper drivers have a reset on RigidBot
diff --git a/Marlin/pins_RIGIDBOARD_V2.h b/Marlin/pins_RIGIDBOARD_V2.h
index 73c7eb7c7f584195dea15ebe4b419a16a26646db..501bcc285cb24bea7577bb40d21a26e7529dd394 100644
--- a/Marlin/pins_RIGIDBOARD_V2.h
+++ b/Marlin/pins_RIGIDBOARD_V2.h
@@ -29,12 +29,15 @@
#undef BOARD_NAME
#define BOARD_NAME "RigidBoard V2"
+//
+// Steppers
+//
// I2C based DAC like on the Printrboard REVF
#define DAC_STEPPER_CURRENT
// Channels available for DAC, For Rigidboard there are 4
#define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
-#define DAC_STEPPER_SENSE 0.05 //sense resistors on rigidboard stepper chips are .05 value
+#define DAC_STEPPER_SENSE 0.05 // sense resistors on rigidboard stepper chips are .05 value
#define DAC_STEPPER_ADDRESS 0
#define DAC_STEPPER_MAX 4096 // was 5000 but max allowable value is actually 4096
#define DAC_STEPPER_VREF 1 // internal Vref, gain 2x = 4.096V
diff --git a/Marlin/pins_RUMBA.h b/Marlin/pins_RUMBA.h
index 3c0e945d54e746fa0bf087b2e6f46c7e37d46c46..dcc5bee2e055a795f433d982c0fde0c454ac0080 100644
--- a/Marlin/pins_RUMBA.h
+++ b/Marlin/pins_RUMBA.h
@@ -35,6 +35,11 @@
#define DEFAULT_MACHINE_NAME "Rumba"
#define BOARD_NAME "Rumba"
+//
+// Servos
+//
+#define SERVO0_PIN 5
+
//
// Limit Switches
//
@@ -79,33 +84,34 @@
#define E2_DIR_PIN 28
#define E2_ENABLE_PIN 39
-//
-// Misc. Functions
-//
-#define LED_PIN 13
-
-#define PS_ON_PIN 45
-#define KILL_PIN 46
-
//
// Temperature Sensors
//
#if TEMP_SENSOR_0 == -1
- #define TEMP_0_PIN 6 // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used
+ #define TEMP_0_PIN 6 // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
#else
- #define TEMP_0_PIN 15 // ANALOG NUMBERING - default connector for thermistor *T0* on rumba board is used
+ #define TEMP_0_PIN 15 // Analog Input (default connector for thermistor *T0* on rumba board is used)
#endif
#if TEMP_SENSOR_1 == -1
- #define TEMP_1_PIN 5 // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used
+ #define TEMP_1_PIN 5 // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
#else
- #define TEMP_1_PIN 14 // ANALOG NUMBERING - default connector for thermistor *T1* on rumba board is used
+ #define TEMP_1_PIN 14 // Analog Input (default connector for thermistor *T1* on rumba board is used)
#endif
#if TEMP_SENSOR_2 == -1
- #define TEMP_2_PIN 7 // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple
+ #define TEMP_2_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple)
+#else
+ #define TEMP_2_PIN 13 // Analog Input (default connector for thermistor *T2* on rumba board is used)
+#endif
+
+// optional for extruder 4 or chamber:
+//#define TEMP_X_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used)
+
+#if TEMP_SENSOR_BED == -1
+ #define TEMP_BED_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple)
#else
- #define TEMP_2_PIN 13 // ANALOG NUMBERING - default connector for thermistor *T2* on rumba board is used
+ #define TEMP_BED_PIN 11 // Analog Input (default connector for thermistor *THB* on rumba board is used)
#endif
//
@@ -120,16 +126,17 @@
#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
-
-#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
- #define TEMP_BED_PIN 11 // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used
-#endif
-
+//
+// Misc. Functions
+//
#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 45
+#define KILL_PIN 46
+
+//
+// LCD / Controller
+//
#define SD_DETECT_PIN 49
#define BEEPER_PIN 44
#define LCD_PINS_RS 19
@@ -141,6 +148,3 @@
#define BTN_EN1 11
#define BTN_EN2 12
#define BTN_ENC 43
-
-#define SERVO0_PIN 5
-
diff --git a/Marlin/pins_SAINSMART_2IN1.h b/Marlin/pins_SAINSMART_2IN1.h
index 8d272ada4a2e4cc33ae2451b1e4eaf1654c3d0ed..b418308da87584c7266909e280b903571534727f 100644
--- a/Marlin/pins_SAINSMART_2IN1.h
+++ b/Marlin/pins_SAINSMART_2IN1.h
@@ -30,6 +30,9 @@
#define BOARD_NAME "Sainsmart"
+//
+// Heaters / Fans
+//
#define RAMPS_D10_PIN 9 // E
#define RAMPS_D9_PIN 7 // F PART FAN in front of board next to Extruder heat
// RAMPS_D8_PIN 8 // B
diff --git a/Marlin/pins_SANGUINOLOLU_11.h b/Marlin/pins_SANGUINOLOLU_11.h
index 15ed6a080a725f2299665de4d79337d522e80635..cd8d1ccda665dfc395e6ab8c6bbc9677453c9e6b 100644
--- a/Marlin/pins_SANGUINOLOLU_11.h
+++ b/Marlin/pins_SANGUINOLOLU_11.h
@@ -34,35 +34,44 @@
#define IS_MELZI (MB(MELZI) || MB(MELZI_MAKR3D))
+//
+// Limit Switches
+//
+#define X_STOP_PIN 18
+#define Y_STOP_PIN 19
+#define Z_STOP_PIN 20
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#if ENABLED(Z_PROBE_SLED)
+ #define SLED_PIN -1
+#endif
+
+//
+// Steppers
+//
#define X_STEP_PIN 15
#define X_DIR_PIN 21
-#define X_STOP_PIN 18
#define Y_STEP_PIN 22
#define Y_DIR_PIN 23
-#define Y_STOP_PIN 19
#define Z_STEP_PIN 3
#define Z_DIR_PIN 2
-#define Z_STOP_PIN 20
#define E0_STEP_PIN 1
#define E0_DIR_PIN 0
-#if MB(AZTEEG_X1) || MB(STB_11) || IS_MELZI
- #define FAN_PIN 4 // Works for Panelolu2 too
-#endif
-
-#if IS_MELZI
- #define LED_PIN 27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368.
-#elif MB(STB_11)
- #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
-#endif
-
-#if ENABLED(Z_PROBE_SLED)
- #define SLED_PIN -1
-#endif
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 7 // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN 6 // Analog Input (pin 34 bed)
+//
+// Heaters / Fans
+//
#define HEATER_0_PIN 13 // (extruder)
#if ENABLED(SANGUINOLOLU_V_1_2)
@@ -79,7 +88,7 @@
#else
- #define HEATER_BED_PIN 14 // (bed)
+ #define HEATER_BED_PIN 14 // (bed)
#define X_ENABLE_PIN -1
#define Y_ENABLE_PIN -1
#define Z_ENABLE_PIN -1
@@ -87,16 +96,29 @@
#endif
-#define TEMP_0_PIN 7 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder)
-#define TEMP_BED_PIN 6 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed)
-#define SDSS 31
+#if MB(AZTEEG_X1) || MB(STB_11) || IS_MELZI
+ #define FAN_PIN 4 // Works for Panelolu2 too
+#endif
+//
+// Misc. Functions
+//
/**
* On some broken versions of the Sanguino libraries the pin definitions are wrong,
* which then needs SDSS as pin 24. But you should upgrade your Sanguino libraries! See #368.
*/
//#define SDSS 24
+#define SDSS 31
+
+#if IS_MELZI
+ #define LED_PIN 27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368.
+#elif MB(STB_11)
+ #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
+#endif
+//
+// LCD / Controller
+//
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
// No buzzer installed
@@ -105,12 +127,12 @@
// LCD Pins
#if ENABLED(DOGLCD)
- #if ENABLED(U8GLIB_ST7920) //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
+ #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#if IS_MELZI // Melzi board
- #define LCD_PINS_RS 30 //CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 29 //SID (MOSI)
- #define LCD_PINS_D4 17 //SCK (CLK) clock
+ #define LCD_PINS_RS 30 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 29 // SID (MOSI)
+ #define LCD_PINS_D4 17 // SCK (CLK) clock
// Pin 27 is taken by LED_PIN, but Melzi LED does nothing with
// Marlin so this can be used for BEEPER_PIN. You can use this pin
// with M42 instead of BEEPER_PIN.
@@ -162,7 +184,7 @@
#else
#define BTN_ENC 16
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
- #endif //Panelolu2
+ #endif // Panelolu2
#define SD_DETECT_PIN -1
diff --git a/Marlin/pins_SAV_MKI.h b/Marlin/pins_SAV_MKI.h
index e3e24c92519ecfe40826649e223a31e54ee056c9..c2ad006317c1c25fee4eae463a86d8e98bcb545f 100644
--- a/Marlin/pins_SAV_MKI.h
+++ b/Marlin/pins_SAV_MKI.h
@@ -38,6 +38,22 @@
#define USBCON 1286 // Disable MarlinSerial etc.
#define LARGE_FLASH true
+//
+// Servos
+//
+#define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in servo.cpp)
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN 13
+#define Y_STOP_PIN 14
+//#define Z_STOP_PIN 15
+#define Z_STOP_PIN 36 // For inductive sensor.
+
+//
+// Steppers
+//
#define X_STEP_PIN 0
#define X_DIR_PIN 1
#define X_ENABLE_PIN 39
@@ -54,19 +70,25 @@
#define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 7 // Analog Input (Extruder)
+#define TEMP_BED_PIN 6 // Analog Input (Bed)
+
+//
+// Heaters / Fans
+//
#define HEATER_0_PIN 21 // Extruder
#define HEATER_BED_PIN 20 // Bed
-#define FAN_PIN 16 // Fan -- from Teensyduino environment.
- // For the fan and Teensyduino uses a different pin mapping.
-#define X_STOP_PIN 13
-#define Y_STOP_PIN 14
-//#define Z_STOP_PIN 15
-#define Z_STOP_PIN 36 // For inductive sensor.
-#define TEMP_0_PIN 7 // Extruder / Analog pin numbering
-#define TEMP_BED_PIN 6 // Bed / Analog pin numbering
+#define FAN_PIN 16 // Fan -- from Teensyduino environment.
+ // For the fan and Teensyduino uses a different pin mapping.
-#define SDSS 20 // PB0 - 8 in marlin env.
+//
+// Misc. Functions
+//
+#define SDSS 20 // PB0 - 8 in marlin env.
// Extension header pin mapping
// ----------------------------
@@ -94,6 +116,9 @@
#define EXT_AUX_A4_IO 44 // Digital IO, 42 (teensy), 44 (marlin)
+//
+// LCD / Controller
+//
#define BEEPER_PIN -1
#define LCD_PINS_RS -1
#define LCD_PINS_ENABLE -1
@@ -116,5 +141,3 @@
#define KILL_PIN EXT_AUX_A2_IO
#define HOME_PIN EXT_AUX_A4_IO
#endif // SAV_3DLCD || SAV_3DGLCD
-
-#define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in servo.cpp)
diff --git a/Marlin/pins_SETHI.h b/Marlin/pins_SETHI.h
index a710e1bf3515c3485b231e7250fbaedc2d7f14c7..12521f40a11c505cc8cdd893da1664bd050a3af6 100644
--- a/Marlin/pins_SETHI.h
+++ b/Marlin/pins_SETHI.h
@@ -64,8 +64,8 @@
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1
-#define TEMP_BED_PIN 2
+#define TEMP_0_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input
//
// Heaters / Fans
@@ -81,15 +81,18 @@
#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.
+// our pin for debugging.
#define DEBUG_PIN 0
-//our RS485 pins
+// our RS485 pins
#define TX_ENABLE_PIN 12
#define RX_ENABLE_PIN 13
diff --git a/Marlin/pins_TEENSY2.h b/Marlin/pins_TEENSY2.h
index 65992beecc81c6853c6498587e92d4c04fc9fb33..b7cf484be394ec9b1d20f10fdfc2f3b455462ae1 100644
--- a/Marlin/pins_TEENSY2.h
+++ b/Marlin/pins_TEENSY2.h
@@ -79,37 +79,55 @@
#define USBCON 1286 // Disable MarlinSerial etc.
#define LARGE_FLASH true
-#define X_STEP_PIN 28 // 0 Marlin
-#define X_DIR_PIN 29 // 1 Marlin
+//
+// Limit Switches
+//
+#define X_STOP_PIN 2
+#define Y_STOP_PIN 3
+#define Z_STOP_PIN 4
+
+//
+// Steppers
+//
+#define X_STEP_PIN 28 // 0 Marlin
+#define X_DIR_PIN 29 // 1 Marlin
#define X_ENABLE_PIN 26
-#define Y_STEP_PIN 30 // 2 Marlin
-#define Y_DIR_PIN 31 // 3
-#define Y_ENABLE_PIN 26 // Shared w/x
+#define Y_STEP_PIN 30 // 2 Marlin
+#define Y_DIR_PIN 31 // 3
+#define Y_ENABLE_PIN 26 // Shared w/x
-#define Z_STEP_PIN 32 // 4
-#define Z_DIR_PIN 33 // 5
+#define Z_STEP_PIN 32 // 4
+#define Z_DIR_PIN 33 // 5
#define Z_ENABLE_PIN 26 // Shared w/x
-#define E0_STEP_PIN 34 // 6
-#define E0_DIR_PIN 35 // 7
+#define E0_STEP_PIN 34 // 6
+#define E0_DIR_PIN 35 // 7
#define E0_ENABLE_PIN 26 // Shared w/x
-#define HEATER_0_PIN 15 // 21 // Extruder
-#define HEATER_BED_PIN 14 // 20 // Bed
-#define FAN_PIN 16 // 22 // Fan
-
-#define X_STOP_PIN 2
-#define Y_STOP_PIN 3
-#define Z_STOP_PIN 4
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 7 // Analog Input (Extruder)
+#define TEMP_BED_PIN 6 // Analog Input (Bed)
-#define TEMP_0_PIN 7 // Extruder / Analog pin numbering
-#define TEMP_BED_PIN 6 // Bed / Analog pin numbering
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN 15 // 21 // Extruder
+#define HEATER_BED_PIN 14 // 20 // Bed
+#define FAN_PIN 16 // 22 // Fan
+//
+// Misc. Functions
+//
#define SDSS 20 // 8
#define LED_PIN 6
#define PS_ON_PIN 27
+//
+// LCD / Controller
+//
#if ENABLED(ULTIPANEL)
#define LCD_PINS_RS 8
#define LCD_PINS_ENABLE 9
diff --git a/Marlin/pins_TEENSYLU.h b/Marlin/pins_TEENSYLU.h
index 2269b31576039ad9e150f5b63929d8aec7a11f00..b0fc8aec5f7e87763fd6393154bc957f91141be9 100644
--- a/Marlin/pins_TEENSYLU.h
+++ b/Marlin/pins_TEENSYLU.h
@@ -40,6 +40,16 @@
#define USBCON 1286 // Disable MarlinSerial etc.
#define LARGE_FLASH true
+//
+// Limit Switches
+//
+#define X_STOP_PIN 13
+#define Y_STOP_PIN 14
+#define Z_STOP_PIN 15
+
+//
+// Steppers
+//
#define X_STEP_PIN 0
#define X_DIR_PIN 1
#define X_ENABLE_PIN 39
@@ -56,6 +66,15 @@
#define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 7 // Analog Input (Extruder)
+#define TEMP_BED_PIN 6 // Analog Input (Bed)
+
+//
+// Heaters / Fans
+//
#define HEATER_0_PIN 21 // Extruder
#define HEATER_1_PIN 46
#define HEATER_2_PIN 47
@@ -69,23 +88,23 @@
#define FAN_PIN 16
#endif
-#define X_STOP_PIN 13
-#define Y_STOP_PIN 14
-#define Z_STOP_PIN 15
-#define TEMP_0_PIN 7 // Extruder / Analog pin numbering
-#define TEMP_BED_PIN 6 // Bed / Analog pin numbering
-
+//
+// Misc. Functions
+//
#define SDSS 8
+//
+// LCD / Controller
+//
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
#define BEEPER_PIN -1
#if ENABLED(LCD_I2C_PANELOLU2)
- #define BTN_EN1 27 //RX1 - fastio.h pin mapping 27
- #define BTN_EN2 26 //TX1 - fastio.h pin mapping 26
- #define BTN_ENC 43 //A3 - fastio.h pin mapping 43
- #define SDSS 40 //use SD card on Panelolu2 (Teensyduino pin mapping)
+ #define BTN_EN1 27 // RX1 - fastio.h pin mapping 27
+ #define BTN_EN2 26 // TX1 - fastio.h pin mapping 26
+ #define BTN_ENC 43 // A3 - fastio.h pin mapping 43
+ #define SDSS 40 // use SD card on Panelolu2 (Teensyduino pin mapping)
#endif // LCD_I2C_PANELOLU2
#define SD_DETECT_PIN -1
diff --git a/Marlin/pins_ULTIMAIN_2.h b/Marlin/pins_ULTIMAIN_2.h
index e1b0ecea02ff1bb0121f3a3459b5e7c397f838fa..731f6f88fe7b44de236e4efd014ea1969233b7ea 100644
--- a/Marlin/pins_ULTIMAIN_2.h
+++ b/Marlin/pins_ULTIMAIN_2.h
@@ -65,16 +65,16 @@
#define MOTOR_CURRENT_PWM_XY_PIN 44
#define MOTOR_CURRENT_PWM_Z_PIN 45
#define MOTOR_CURRENT_PWM_E_PIN 46
-//Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
+// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
#define MOTOR_CURRENT_PWM_RANGE 2000
#define DEFAULT_PWM_MOTOR_CURRENT {1300, 1300, 1250}
//
// Temperature Sensors
//
-#define TEMP_0_PIN 8
-#define TEMP_1_PIN 9
-#define TEMP_BED_PIN 10
+#define TEMP_0_PIN 8 // Analog Input
+#define TEMP_1_PIN 9 // Analog Input
+#define TEMP_BED_PIN 10 // Analog Input
//
// Heaters / Fans
@@ -86,15 +86,17 @@
#define FAN_PIN 7
//
-// SD Card
+// Misc. Functions
//
#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.
+//
+// LCD / Controller
+//
#define BEEPER_PIN 18
#define LCD_PINS_RS 20
diff --git a/Marlin/pins_ULTIMAKER.h b/Marlin/pins_ULTIMAKER.h
index f7ad15ef7ec0c19ef619faba140cdff15d75a3a5..4b4b31ad8c93d6e26703c55adf1a79b5ed65f7e7 100644
--- a/Marlin/pins_ULTIMAKER.h
+++ b/Marlin/pins_ULTIMAKER.h
@@ -82,9 +82,9 @@
//
// Temperature Sensors
//
-#define TEMP_0_PIN 8
-#define TEMP_1_PIN 9
-#define TEMP_BED_PIN 10
+#define TEMP_0_PIN 8 // Analog Input
+#define TEMP_1_PIN 9 // Analog Input
+#define TEMP_BED_PIN 10 // Analog Input
//
// Heaters / Fans
@@ -93,11 +93,15 @@
#define HEATER_1_PIN 3
#define HEATER_BED_PIN 4
+#define FAN_PIN 7
+
+//
+// Misc. Functions
+//
#define SDSS 53
#define LED_PIN 13
-#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.
+#define SUICIDE_PIN 54 // PIN that has to be turned on right after start, to keep power flowing.
//
// LCD / Controller
@@ -115,16 +119,16 @@
#define LCD_PINS_D6 5
#define LCD_PINS_D7 6
- //buttons are directly attached
+ // buttons are directly attached
#define BTN_EN1 40
#define BTN_EN2 42
#define BTN_ENC 19
#define SD_DETECT_PIN 38
- #else //!NEWPANEL - Old style panel with shift register
+ #else // !NEWPANEL - Old style panel with shift register
- //buttons are attached to a shift register
+ // buttons are attached to a shift register
#define SHIFT_CLK 38
#define SHIFT_LD 42
#define SHIFT_OUT 40
diff --git a/Marlin/pins_ULTIMAKER_OLD.h b/Marlin/pins_ULTIMAKER_OLD.h
index cb0f763198706b15c62737f99353419e604daccf..b42ba69585c6bb1447e80404780e99ddfce8dc2f 100644
--- a/Marlin/pins_ULTIMAKER_OLD.h
+++ b/Marlin/pins_ULTIMAKER_OLD.h
@@ -77,8 +77,8 @@
//
// Temperature Sensors
//
-#define TEMP_0_PIN 8
-#define TEMP_1_PIN 1
+#define TEMP_0_PIN 8 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
//
// Heaters / Fans