Pārlūkot izejas kodu

Format some pins files

Scott Lahteine 4 gadus atpakaļ
vecāks
revīzija
2c325c2a7d
100 mainītis faili ar 5352 papildinājumiem un 5365 dzēšanām
  1. 28
    28
      Marlin/src/pins/esp32/pins_E4D.h
  2. 28
    28
      Marlin/src/pins/esp32/pins_ESP32.h
  3. 34
    34
      Marlin/src/pins/esp32/pins_MRR_ESPA.h
  4. 66
    66
      Marlin/src/pins/esp32/pins_MRR_ESPE.h
  5. 228
    228
      Marlin/src/pins/linux/pins_RAMPS_LINUX.h
  6. 55
    55
      Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
  7. 45
    45
      Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
  8. 38
    43
      Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
  9. 68
    69
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
  10. 122
    122
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
  11. 103
    103
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
  12. 22
    22
      Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
  13. 66
    66
      Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
  14. 117
    117
      Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
  15. 121
    121
      Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
  16. 159
    159
      Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
  17. 45
    46
      Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
  18. 45
    46
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
  19. 73
    73
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
  20. 58
    58
      Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
  21. 103
    103
      Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
  22. 10
    10
      Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
  23. 41
    41
      Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
  24. 57
    57
      Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
  25. 24
    24
      Marlin/src/pins/mega/pins_CHEAPTRONIC.h
  26. 56
    56
      Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
  27. 66
    66
      Marlin/src/pins/mega/pins_CNCONTROLS_11.h
  28. 69
    69
      Marlin/src/pins/mega/pins_CNCONTROLS_12.h
  29. 39
    39
      Marlin/src/pins/mega/pins_CNCONTROLS_15.h
  30. 34
    34
      Marlin/src/pins/mega/pins_EINSTART-S.h
  31. 52
    52
      Marlin/src/pins/mega/pins_ELEFU_3.h
  32. 60
    60
      Marlin/src/pins/mega/pins_GT2560_REV_A.h
  33. 57
    57
      Marlin/src/pins/mega/pins_GT2560_V3.h
  34. 7
    7
      Marlin/src/pins/mega/pins_GT2560_V3_A20.h
  35. 4
    4
      Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
  36. 63
    63
      Marlin/src/pins/mega/pins_HJC2560C_REV2.h
  37. 33
    33
      Marlin/src/pins/mega/pins_LEAPFROG.h
  38. 36
    36
      Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
  39. 55
    55
      Marlin/src/pins/mega/pins_MEGACONTROLLER.h
  40. 48
    48
      Marlin/src/pins/mega/pins_MEGATRONICS.h
  41. 57
    57
      Marlin/src/pins/mega/pins_MEGATRONICS_2.h
  42. 82
    82
      Marlin/src/pins/mega/pins_MEGATRONICS_3.h
  43. 103
    103
      Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
  44. 54
    54
      Marlin/src/pins/mega/pins_MINITRONICS.h
  45. 50
    50
      Marlin/src/pins/mega/pins_OVERLORD.h
  46. 50
    50
      Marlin/src/pins/mega/pins_PICA.h
  47. 4
    4
      Marlin/src/pins/mega/pins_PICAOLD.h
  48. 46
    46
      Marlin/src/pins/mega/pins_SILVER_GATE.h
  49. 35
    35
      Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
  50. 62
    62
      Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
  51. 71
    71
      Marlin/src/pins/rambo/pins_EINSY_RETRO.h
  52. 76
    76
      Marlin/src/pins/rambo/pins_MINIRAMBO.h
  53. 96
    96
      Marlin/src/pins/rambo/pins_RAMBO.h
  54. 71
    71
      Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
  55. 28
    28
      Marlin/src/pins/ramps/pins_3DRAG.h
  56. 16
    16
      Marlin/src/pins/ramps/pins_AZTEEG_X3.h
  57. 47
    47
      Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
  58. 5
    5
      Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
  59. 23
    24
      Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
  60. 35
    35
      Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
  61. 5
    5
      Marlin/src/pins/ramps/pins_FELIX2.h
  62. 62
    62
      Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
  63. 14
    14
      Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
  64. 63
    63
      Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
  65. 65
    67
      Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
  66. 92
    92
      Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
  67. 13
    13
      Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
  68. 5
    5
      Marlin/src/pins/ramps/pins_K8400.h
  69. 40
    40
      Marlin/src/pins/ramps/pins_K8800.h
  70. 10
    10
      Marlin/src/pins/ramps/pins_MKS_BASE_14.h
  71. 7
    7
      Marlin/src/pins/ramps/pins_MKS_BASE_16.h
  72. 18
    18
      Marlin/src/pins/ramps/pins_MKS_BASE_common.h
  73. 14
    14
      Marlin/src/pins/ramps/pins_MKS_GEN_13.h
  74. 16
    16
      Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
  75. 241
    241
      Marlin/src/pins/ramps/pins_RAMPS.h
  76. 13
    13
      Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
  77. 5
    5
      Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
  78. 37
    37
      Marlin/src/pins/ramps/pins_RAMPS_OLD.h
  79. 11
    11
      Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
  80. 30
    30
      Marlin/src/pins/ramps/pins_RIGIDBOARD.h
  81. 6
    6
      Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
  82. 9
    9
      Marlin/src/pins/ramps/pins_RL200.h
  83. 79
    79
      Marlin/src/pins/ramps/pins_RUMBA.h
  84. 7
    7
      Marlin/src/pins/ramps/pins_TANGO.h
  85. 31
    31
      Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
  86. 228
    228
      Marlin/src/pins/ramps/pins_TT_OSCAR.h
  87. 50
    50
      Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
  88. 61
    61
      Marlin/src/pins/ramps/pins_ULTIMAKER.h
  89. 86
    86
      Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
  90. 5
    5
      Marlin/src/pins/ramps/pins_VORON.h
  91. 23
    23
      Marlin/src/pins/ramps/pins_ZRIB_V20.h
  92. 94
    94
      Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
  93. 31
    31
      Marlin/src/pins/sam/pins_ADSK.h
  94. 68
    68
      Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
  95. 78
    80
      Marlin/src/pins/sam/pins_ARCHIM1.h
  96. 93
    93
      Marlin/src/pins/sam/pins_ARCHIM2.h
  97. 46
    46
      Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
  98. 74
    74
      Marlin/src/pins/sam/pins_DUE3DOM.h
  99. 76
    76
      Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
  100. 0
    0
      Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h

+ 28
- 28
Marlin/src/pins/esp32/pins_E4D.h Parādīt failu

@@ -42,49 +42,49 @@
42 42
 //
43 43
 // Limit Switches
44 44
 //
45
-#define X_MIN_PIN          34
46
-#define Y_MIN_PIN          35
47
-#define Z_MIN_PIN          16   // 15
45
+#define X_MIN_PIN                             34
46
+#define Y_MIN_PIN                             35
47
+#define Z_MIN_PIN                             16  // 15
48 48
 
49 49
 //
50 50
 // Steppers
51 51
 //
52
-#define X_STEP_PIN         12   // 34//27
53
-#define X_DIR_PIN          13   // 35//26
54
-#define X_ENABLE_PIN       17   // 0//17//25 // used free pin
55
-//#define X_CS_PIN            0
52
+#define X_STEP_PIN                            12  // 34//27
53
+#define X_DIR_PIN                             13  // 35//26
54
+#define X_ENABLE_PIN                          17  // 0//17//25 // used free pin
55
+//#define X_CS_PIN                             0
56 56
 
57
-#define Y_STEP_PIN         32   // 33
58
-#define Y_DIR_PIN          33   // 32
59
-#define Y_ENABLE_PIN       X_ENABLE_PIN
60
-//#define Y_CS_PIN           13
57
+#define Y_STEP_PIN                            32  // 33
58
+#define Y_DIR_PIN                             33  // 32
59
+#define Y_ENABLE_PIN                X_ENABLE_PIN
60
+//#define Y_CS_PIN                            13
61 61
 
62
-#define Z_STEP_PIN         25   // 14
63
-#define Z_DIR_PIN          26   // 12
64
-#define Z_ENABLE_PIN       X_ENABLE_PIN
65
-//#define Z_CS_PIN            5   // SS_PIN
62
+#define Z_STEP_PIN                            25  // 14
63
+#define Z_DIR_PIN                             26  // 12
64
+#define Z_ENABLE_PIN                X_ENABLE_PIN
65
+//#define Z_CS_PIN                             5  // SS_PIN
66 66
 
67
-#define E0_STEP_PIN        27   // 16
68
-#define E0_DIR_PIN         14   // 17
69
-#define E0_ENABLE_PIN      X_ENABLE_PIN
70
-//#define E0_CS_PIN          21
67
+#define E0_STEP_PIN                           27  // 16
68
+#define E0_DIR_PIN                            14  // 17
69
+#define E0_ENABLE_PIN               X_ENABLE_PIN
70
+//#define E0_CS_PIN                           21
71 71
 
72 72
 //
73 73
 // Temperature Sensors
74 74
 //
75
-#define TEMP_0_PIN         36   // Analog Input
76
-#define TEMP_BED_PIN       39   // Analog Input
75
+#define TEMP_0_PIN                            36  // Analog Input
76
+#define TEMP_BED_PIN                          39  // Analog Input
77 77
 
78 78
 //
79 79
 // Heaters / Fans
80 80
 //
81
-#define HEATER_0_PIN        2   // 4//2//(D8)
82
-#define FAN_PIN             0   // 2//15//13 (D9)
83
-#define HEATER_BED_PIN     15   // 15//0 //(D10)
81
+#define HEATER_0_PIN                           2  // 4//2//(D8)
82
+#define FAN_PIN                                0  // 2//15//13 (D9)
83
+#define HEATER_BED_PIN                        15  // 15//0 //(D10)
84 84
 
85 85
 // SPI
86
-#define SDSS                 5
86
+#define SDSS                                   5
87 87
 #define I2S_STEPPER_STREAM
88
-#define I2S_WS              23
89
-#define I2S_BCK             22
90
-#define I2S_DATA            21
88
+#define I2S_WS                                23
89
+#define I2S_BCK                               22
90
+#define I2S_DATA                              21

+ 28
- 28
Marlin/src/pins/esp32/pins_ESP32.h Parādīt failu

@@ -35,52 +35,52 @@
35 35
 // I2S (steppers & other output-only pins)
36 36
 //
37 37
 #define I2S_STEPPER_STREAM
38
-#define I2S_WS              25
39
-#define I2S_BCK             26
40
-#define I2S_DATA            27
38
+#define I2S_WS                                25
39
+#define I2S_BCK                               26
40
+#define I2S_DATA                              27
41 41
 
42 42
 //
43 43
 // Limit Switches
44 44
 //
45
-#define X_MIN_PIN           34
46
-#define Y_MIN_PIN           35
47
-#define Z_MIN_PIN           15
45
+#define X_MIN_PIN                             34
46
+#define Y_MIN_PIN                             35
47
+#define Z_MIN_PIN                             15
48 48
 
49 49
 //
50 50
 // Steppers
51 51
 //
52
-#define X_STEP_PIN         128
53
-#define X_DIR_PIN          129
54
-#define X_ENABLE_PIN       130
55
-//#define X_CS_PIN           0
52
+#define X_STEP_PIN                           128
53
+#define X_DIR_PIN                            129
54
+#define X_ENABLE_PIN                         130
55
+//#define X_CS_PIN                             0
56 56
 
57
-#define Y_STEP_PIN         131
58
-#define Y_DIR_PIN          132
59
-#define Y_ENABLE_PIN       133
60
-//#define Y_CS_PIN          13
57
+#define Y_STEP_PIN                           131
58
+#define Y_DIR_PIN                            132
59
+#define Y_ENABLE_PIN                         133
60
+//#define Y_CS_PIN                            13
61 61
 
62
-#define Z_STEP_PIN         134
63
-#define Z_DIR_PIN          135
64
-#define Z_ENABLE_PIN       136
65
-//#define Z_CS_PIN           5 // SS_PIN
62
+#define Z_STEP_PIN                           134
63
+#define Z_DIR_PIN                            135
64
+#define Z_ENABLE_PIN                         136
65
+//#define Z_CS_PIN                             5  // SS_PIN
66 66
 
67
-#define E0_STEP_PIN        137
68
-#define E0_DIR_PIN         138
69
-#define E0_ENABLE_PIN      139
70
-//#define E0_CS_PIN         21
67
+#define E0_STEP_PIN                          137
68
+#define E0_DIR_PIN                           138
69
+#define E0_ENABLE_PIN                        139
70
+//#define E0_CS_PIN                           21
71 71
 
72 72
 //
73 73
 // Temperature Sensors
74 74
 //
75
-#define TEMP_0_PIN          36   // Analog Input
76
-#define TEMP_BED_PIN        39   // Analog Input
75
+#define TEMP_0_PIN                            36  // Analog Input
76
+#define TEMP_BED_PIN                          39  // Analog Input
77 77
 
78 78
 //
79 79
 // Heaters / Fans
80 80
 //
81
-#define HEATER_0_PIN         2
82
-#define FAN_PIN             13
83
-#define HEATER_BED_PIN       4
81
+#define HEATER_0_PIN                           2
82
+#define FAN_PIN                               13
83
+#define HEATER_BED_PIN                         4
84 84
 
85 85
 // SPI
86
-#define SDSS                 5
86
+#define SDSS                                   5

+ 34
- 34
Marlin/src/pins/esp32/pins_MRR_ESPA.h Parādīt failu

@@ -45,66 +45,66 @@
45 45
 #ifdef I2S_STEPPER_STREAM
46 46
   #undef I2S_STEPPER_STREAM
47 47
 #endif
48
-#define I2S_WS              -1
49
-#define I2S_BCK             -1
50
-#define I2S_DATA            -1
48
+#define I2S_WS                                -1
49
+#define I2S_BCK                               -1
50
+#define I2S_DATA                              -1
51 51
 
52 52
 //
53 53
 // Limit Switches
54 54
 //
55
-#define X_STOP_PIN         34
56
-#define Y_STOP_PIN         35
57
-#define Z_STOP_PIN         15
55
+#define X_STOP_PIN                            34
56
+#define Y_STOP_PIN                            35
57
+#define Z_STOP_PIN                            15
58 58
 
59 59
 //
60 60
 // Steppers
61 61
 //
62
-#define X_STEP_PIN         27
63
-#define X_DIR_PIN          26
64
-#define X_ENABLE_PIN       25
65
-//#define X_CS_PIN           21
62
+#define X_STEP_PIN                            27
63
+#define X_DIR_PIN                             26
64
+#define X_ENABLE_PIN                          25
65
+//#define X_CS_PIN                            21
66 66
 
67
-#define Y_STEP_PIN         33
68
-#define Y_DIR_PIN          32
69
-#define Y_ENABLE_PIN       X_ENABLE_PIN
70
-//#define Y_CS_PIN           22
67
+#define Y_STEP_PIN                            33
68
+#define Y_DIR_PIN                             32
69
+#define Y_ENABLE_PIN                X_ENABLE_PIN
70
+//#define Y_CS_PIN                            22
71 71
 
72
-#define Z_STEP_PIN         14
73
-#define Z_DIR_PIN          12
74
-#define Z_ENABLE_PIN       X_ENABLE_PIN
75
-//#define Z_CS_PIN            5 // SS_PIN
72
+#define Z_STEP_PIN                            14
73
+#define Z_DIR_PIN                             12
74
+#define Z_ENABLE_PIN                X_ENABLE_PIN
75
+//#define Z_CS_PIN                             5  // SS_PIN
76 76
 
77
-#define E0_STEP_PIN        16
78
-#define E0_DIR_PIN         17
79
-#define E0_ENABLE_PIN      X_ENABLE_PIN
80
-//#define E0_CS_PIN          21
77
+#define E0_STEP_PIN                           16
78
+#define E0_DIR_PIN                            17
79
+#define E0_ENABLE_PIN               X_ENABLE_PIN
80
+//#define E0_CS_PIN                           21
81 81
 
82 82
 //
83 83
 // Temperature Sensors
84 84
 //
85
-#define TEMP_0_PIN         36   // Analog Input
86
-#define TEMP_BED_PIN       39   // Analog Input
85
+#define TEMP_0_PIN                            36  // Analog Input
86
+#define TEMP_BED_PIN                          39  // Analog Input
87 87
 
88 88
 //
89 89
 // Heaters / Fans
90 90
 //
91
-#define HEATER_0_PIN        2
92
-#define FAN_PIN            13
93
-#define HEATER_BED_PIN      4
91
+#define HEATER_0_PIN                           2
92
+#define FAN_PIN                               13
93
+#define HEATER_BED_PIN                         4
94 94
 
95 95
 //
96 96
 // MicroSD card
97 97
 //
98
-#define MOSI_PIN           23
99
-#define MISO_PIN           19
100
-#define SCK_PIN            18
101
-#define SDSS                5
102
-#define USES_SHARED_SPI  // SPI is shared by SD card with TMC SPI drivers
98
+#define MOSI_PIN                              23
99
+#define MISO_PIN                              19
100
+#define SCK_PIN                               18
101
+#define SDSS                                   5
102
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
103 103
 
104 104
 // Hardware serial pins
105 105
 // Add the following to Configuration.h or Configuration_adv.h to assign
106 106
 // specific pins to hardware Serial1.
107 107
 // Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
108 108
 // MRR ESPA does not have enough spare pins for such reassignment.
109
-//#define HARDWARE_SERIAL1_RX 21
110
-//#define HARDWARE_SERIAL1_TX 22
109
+//#define HARDWARE_SERIAL1_RX                 21
110
+//#define HARDWARE_SERIAL1_TX                 22

+ 66
- 66
Marlin/src/pins/esp32/pins_MRR_ESPE.h Parādīt failu

@@ -43,9 +43,9 @@
43 43
 //
44 44
 // Limit Switches
45 45
 //
46
-#define X_STOP_PIN         35
47
-#define Y_STOP_PIN         32
48
-#define Z_STOP_PIN         33
46
+#define X_STOP_PIN                            35
47
+#define Y_STOP_PIN                            32
48
+#define Z_STOP_PIN                            33
49 49
 
50 50
 //
51 51
 // Enable I2S stepper stream
@@ -53,72 +53,72 @@
53 53
 #undef I2S_STEPPER_STREAM
54 54
 #define I2S_STEPPER_STREAM
55 55
 
56
-#undef LIN_ADVANCE  // Currently, I2S stream does not work with linear advance
56
+#undef LIN_ADVANCE                                // Currently, I2S stream does not work with linear advance
57 57
 
58
-#define I2S_WS             26
59
-#define I2S_BCK            25
60
-#define I2S_DATA           27
58
+#define I2S_WS                                26
59
+#define I2S_BCK                               25
60
+#define I2S_DATA                              27
61 61
 
62 62
 //
63 63
 // Steppers
64 64
 //
65
-#define X_STEP_PIN        129
66
-#define X_DIR_PIN         130
67
-#define X_ENABLE_PIN      128
68
-//#define X_CS_PIN           21
69
-
70
-#define Y_STEP_PIN        132
71
-#define Y_DIR_PIN         133
72
-#define Y_ENABLE_PIN      131
73
-//#define Y_CS_PIN           22
74
-
75
-#define Z_STEP_PIN        135
76
-#define Z_DIR_PIN         136
77
-#define Z_ENABLE_PIN      134
78
-//#define Z_CS_PIN            5 // SS_PIN
79
-
80
-#define E0_STEP_PIN       138
81
-#define E0_DIR_PIN        139
82
-#define E0_ENABLE_PIN     137
83
-//#define E0_CS_PIN          21
84
-
85
-#define E1_STEP_PIN       141
86
-#define E1_DIR_PIN        142
87
-#define E1_ENABLE_PIN     140
88
-//#define E1_CS_PIN          22
89
-
90
-#define Z2_STEP_PIN       141
91
-#define Z2_DIR_PIN        142
92
-#define Z2_ENABLE_PIN     140
93
-//#define Z2_CS_PIN            5
65
+#define X_STEP_PIN                           129
66
+#define X_DIR_PIN                            130
67
+#define X_ENABLE_PIN                         128
68
+//#define X_CS_PIN                            21
69
+
70
+#define Y_STEP_PIN                           132
71
+#define Y_DIR_PIN                            133
72
+#define Y_ENABLE_PIN                         131
73
+//#define Y_CS_PIN                            22
74
+
75
+#define Z_STEP_PIN                           135
76
+#define Z_DIR_PIN                            136
77
+#define Z_ENABLE_PIN                         134
78
+//#define Z_CS_PIN                             5  // SS_PIN
79
+
80
+#define E0_STEP_PIN                          138
81
+#define E0_DIR_PIN                           139
82
+#define E0_ENABLE_PIN                        137
83
+//#define E0_CS_PIN                           21
84
+
85
+#define E1_STEP_PIN                          141
86
+#define E1_DIR_PIN                           142
87
+#define E1_ENABLE_PIN                        140
88
+//#define E1_CS_PIN                           22
89
+
90
+#define Z2_STEP_PIN                          141
91
+#define Z2_DIR_PIN                           142
92
+#define Z2_ENABLE_PIN                        140
93
+//#define Z2_CS_PIN                            5
94 94
 
95 95
 //
96 96
 // Temperature Sensors
97 97
 //
98
-#define TEMP_0_PIN         36   // Analog Input
99
-#define TEMP_1_PIN         34   // Analog Input
100
-#define TEMP_BED_PIN       39   // Analog Input
98
+#define TEMP_0_PIN                            36  // Analog Input
99
+#define TEMP_1_PIN                            34  // Analog Input
100
+#define TEMP_BED_PIN                          39  // Analog Input
101 101
 
102 102
 //
103 103
 // Heaters / Fans
104 104
 //
105
-#define HEATER_0_PIN      145 // 2
106
-#define FAN_PIN           146 // 15
107
-#define HEATER_BED_PIN    144 // 4
105
+#define HEATER_0_PIN                         145  // 2
106
+#define FAN_PIN                              146  // 15
107
+#define HEATER_BED_PIN                       144  // 4
108 108
 
109
-#define CONTROLLER_FAN_PIN 147
110
-//#define E0_AUTO_FAN_PIN 148 // need to update Configuration_adv.h @section extruder
111
-//#define E1_AUTO_FAN_PIN 149 // need to update Configuration_adv.h @section extruder
112
-#define FAN1_PIN 149
109
+#define CONTROLLER_FAN_PIN                   147
110
+//#define E0_AUTO_FAN_PIN                    148  // need to update Configuration_adv.h @section extruder
111
+//#define E1_AUTO_FAN_PIN                    149  // need to update Configuration_adv.h @section extruder
112
+#define FAN1_PIN                             149
113 113
 
114 114
 //
115 115
 // MicroSD card
116 116
 //
117
-#define MOSI_PIN           23
118
-#define MISO_PIN           19
119
-#define SCK_PIN            18
120
-#define SDSS                5
121
-#define USES_SHARED_SPI  // SPI is shared by SD card with TMC SPI drivers
117
+#define MOSI_PIN                              23
118
+#define MISO_PIN                              19
119
+#define SCK_PIN                               18
120
+#define SDSS                                   5
121
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
122 122
 
123 123
 //////////////////////////
124 124
 // LCDs and Controllers //
@@ -126,21 +126,21 @@
126 126
 
127 127
 #if HAS_GRAPHICAL_LCD
128 128
 
129
-  #define LCD_PINS_RS        13
130
-  #define LCD_PINS_ENABLE    17
131
-  #define LCD_PINS_D4        16
129
+  #define LCD_PINS_RS                         13
130
+  #define LCD_PINS_ENABLE                     17
131
+  #define LCD_PINS_D4                         16
132 132
 
133 133
   #if ENABLED(CR10_STOCKDISPLAY)
134 134
 
135
-    #define BEEPER_PIN      151
135
+    #define BEEPER_PIN                       151
136 136
 
137 137
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
138 138
 
139
-    #define BEEPER_PIN      151
139
+    #define BEEPER_PIN                       151
140 140
 
141
-    //#define LCD_PINS_D5     150
142
-    //#define LCD_PINS_D6     152
143
-    //#define LCD_PINS_D7     153
141
+    //#define LCD_PINS_D5                    150
142
+    //#define LCD_PINS_D6                    152
143
+    //#define LCD_PINS_D7                    153
144 144
 
145 145
   #else
146 146
 
@@ -148,9 +148,9 @@
148 148
 
149 149
   #endif
150 150
 
151
-  #define BTN_EN1             0
152
-  #define BTN_EN2            12
153
-  #define BTN_ENC            14
151
+  #define BTN_EN1                              0
152
+  #define BTN_EN2                             12
153
+  #define BTN_ENC                             14
154 154
 
155 155
 #endif // HAS_GRAPHICAL_LCD
156 156
 
@@ -159,7 +159,7 @@
159 159
 // specific pins to hardware Serial1 and Serial2.
160 160
 // Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
161 161
 // MRR ESPA does not have enough spare pins for such reassignment.
162
-//#define HARDWARE_SERIAL1_RX 21
163
-//#define HARDWARE_SERIAL1_TX 22
164
-//#define HARDWARE_SERIAL2_RX  2
165
-//#define HARDWARE_SERIAL2_TX  4
162
+//#define HARDWARE_SERIAL1_RX                 21
163
+//#define HARDWARE_SERIAL1_TX                 22
164
+//#define HARDWARE_SERIAL2_RX                  2
165
+//#define HARDWARE_SERIAL2_TX                  4

+ 228
- 228
Marlin/src/pins/linux/pins_RAMPS_LINUX.h Parādīt failu

@@ -49,7 +49,7 @@
49 49
   #define BOARD_INFO_NAME "RAMPS 1.4"
50 50
 #endif
51 51
 
52
-#define E2END 0xFFF // 4KB
52
+#define E2END 0xFFF                               // 4KB
53 53
 
54 54
 #define IS_RAMPS_EFB
55 55
 
@@ -57,85 +57,85 @@
57 57
 // Servos
58 58
 //
59 59
 #ifdef IS_RAMPS_13
60
-  #define SERVO0_PIN        7   // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
60
+  #define SERVO0_PIN                           7  // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
61 61
 #else
62
-  #define SERVO0_PIN       11
62
+  #define SERVO0_PIN                          11
63 63
 #endif
64
-#define SERVO1_PIN          6
65
-#define SERVO2_PIN          5
64
+#define SERVO1_PIN                             6
65
+#define SERVO2_PIN                             5
66 66
 #ifndef SERVO3_PIN
67
-  #define SERVO3_PIN        4
67
+  #define SERVO3_PIN                           4
68 68
 #endif
69 69
 
70 70
 //
71 71
 // Limit Switches
72 72
 //
73
-#define X_MIN_PIN           3
73
+#define X_MIN_PIN                              3
74 74
 #ifndef X_MAX_PIN
75
-  #define X_MAX_PIN         2
75
+  #define X_MAX_PIN                            2
76 76
 #endif
77
-#define Y_MIN_PIN          14
78
-#define Y_MAX_PIN          15
79
-#define Z_MIN_PIN          18
80
-#define Z_MAX_PIN          19
77
+#define Y_MIN_PIN                             14
78
+#define Y_MAX_PIN                             15
79
+#define Z_MIN_PIN                             18
80
+#define Z_MAX_PIN                             19
81 81
 
82 82
 //
83 83
 // Z Probe (when not Z_MIN_PIN)
84 84
 //
85 85
 #ifndef Z_MIN_PROBE_PIN
86
-  #define Z_MIN_PROBE_PIN  32
86
+  #define Z_MIN_PROBE_PIN                     32
87 87
 #endif
88 88
 
89 89
 //
90 90
 // Steppers
91 91
 //
92
-#define X_STEP_PIN         54
93
-#define X_DIR_PIN          55
94
-#define X_ENABLE_PIN       38
92
+#define X_STEP_PIN                            54
93
+#define X_DIR_PIN                             55
94
+#define X_ENABLE_PIN                          38
95 95
 #ifndef X_CS_PIN
96
-  #define X_CS_PIN         53
96
+  #define X_CS_PIN                            53
97 97
 #endif
98 98
 
99
-#define Y_STEP_PIN         60
100
-#define Y_DIR_PIN          61
101
-#define Y_ENABLE_PIN       56
99
+#define Y_STEP_PIN                            60
100
+#define Y_DIR_PIN                             61
101
+#define Y_ENABLE_PIN                          56
102 102
 #ifndef Y_CS_PIN
103
-  #define Y_CS_PIN         49
103
+  #define Y_CS_PIN                            49
104 104
 #endif
105 105
 
106
-#define Z_STEP_PIN         46
107
-#define Z_DIR_PIN          48
108
-#define Z_ENABLE_PIN       62
106
+#define Z_STEP_PIN                            46
107
+#define Z_DIR_PIN                             48
108
+#define Z_ENABLE_PIN                          62
109 109
 #ifndef Z_CS_PIN
110
-  #define Z_CS_PIN         40
110
+  #define Z_CS_PIN                            40
111 111
 #endif
112 112
 
113
-#define E0_STEP_PIN        26
114
-#define E0_DIR_PIN         28
115
-#define E0_ENABLE_PIN      24
113
+#define E0_STEP_PIN                           26
114
+#define E0_DIR_PIN                            28
115
+#define E0_ENABLE_PIN                         24
116 116
 #ifndef E0_CS_PIN
117
-  #define E0_CS_PIN        42
117
+  #define E0_CS_PIN                           42
118 118
 #endif
119 119
 
120
-#define E1_STEP_PIN        36
121
-#define E1_DIR_PIN         34
122
-#define E1_ENABLE_PIN      30
120
+#define E1_STEP_PIN                           36
121
+#define E1_DIR_PIN                            34
122
+#define E1_ENABLE_PIN                         30
123 123
 #ifndef E1_CS_PIN
124
-  #define E1_CS_PIN        44
124
+  #define E1_CS_PIN                           44
125 125
 #endif
126 126
 
127 127
 //
128 128
 // Temperature Sensors
129 129
 //
130
-#define TEMP_0_PIN          0   // Analog Input
131
-#define TEMP_1_PIN          1   // Analog Input
132
-#define TEMP_BED_PIN        2   // Analog Input
130
+#define TEMP_0_PIN                             0  // Analog Input
131
+#define TEMP_1_PIN                             1  // Analog Input
132
+#define TEMP_BED_PIN                           2  // Analog Input
133 133
 
134 134
 // SPI for Max6675 or Max31855 Thermocouple
135 135
 #if DISABLED(SDSUPPORT)
136
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
136
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
137 137
 #else
138
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
138
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
139 139
 #endif
140 140
 
141 141
 //
@@ -159,72 +159,72 @@
159 159
 // Heaters / Fans
160 160
 //
161 161
 #ifndef MOSFET_D_PIN
162
-  #define MOSFET_D_PIN     -1
162
+  #define MOSFET_D_PIN                        -1
163 163
 #endif
164 164
 #ifndef RAMPS_D8_PIN
165
-  #define RAMPS_D8_PIN      8
165
+  #define RAMPS_D8_PIN                         8
166 166
 #endif
167 167
 #ifndef RAMPS_D9_PIN
168
-  #define RAMPS_D9_PIN      9
168
+  #define RAMPS_D9_PIN                         9
169 169
 #endif
170 170
 #ifndef RAMPS_D10_PIN
171
-  #define RAMPS_D10_PIN    10
171
+  #define RAMPS_D10_PIN                       10
172 172
 #endif
173 173
 
174
-#define HEATER_0_PIN     RAMPS_D10_PIN
175
-
176
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
177
-  #define FAN_PIN        RAMPS_D9_PIN
178
-  #define HEATER_BED_PIN RAMPS_D8_PIN
179
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
180
-  #define HEATER_1_PIN   RAMPS_D9_PIN
181
-  #define FAN_PIN        RAMPS_D8_PIN
182
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
183
-  #define HEATER_1_PIN   RAMPS_D9_PIN
184
-  #define HEATER_BED_PIN RAMPS_D8_PIN
185
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
186
-  #define FAN_PIN        RAMPS_D9_PIN
187
-  #define FAN1_PIN       RAMPS_D8_PIN
188
-#elif ENABLED(IS_RAMPS_SF)                     // Spindle, Fan
189
-  #define FAN_PIN        RAMPS_D8_PIN
190
-#else                                          // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
191
-  #define FAN_PIN        RAMPS_D9_PIN
192
-  #define HEATER_BED_PIN RAMPS_D8_PIN
174
+#define HEATER_0_PIN               RAMPS_D10_PIN
175
+
176
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
177
+  #define FAN_PIN                   RAMPS_D9_PIN
178
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
179
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
180
+  #define HEATER_1_PIN              RAMPS_D9_PIN
181
+  #define FAN_PIN                   RAMPS_D8_PIN
182
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
183
+  #define HEATER_1_PIN              RAMPS_D9_PIN
184
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
185
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
186
+  #define FAN_PIN                   RAMPS_D9_PIN
187
+  #define FAN1_PIN                  RAMPS_D8_PIN
188
+#elif ENABLED(IS_RAMPS_SF)                        // Spindle, Fan
189
+  #define FAN_PIN                   RAMPS_D8_PIN
190
+#else                                             // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
191
+  #define FAN_PIN                   RAMPS_D9_PIN
192
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
193 193
   #if HOTENDS == 1
194
-    #define FAN1_PIN     MOSFET_D_PIN
194
+    #define FAN1_PIN                MOSFET_D_PIN
195 195
   #else
196
-    #define HEATER_1_PIN MOSFET_D_PIN
196
+    #define HEATER_1_PIN            MOSFET_D_PIN
197 197
   #endif
198 198
 #endif
199 199
 
200 200
 #ifndef FAN_PIN
201
-  #define FAN_PIN           4   // IO pin. Buffer needed
201
+  #define FAN_PIN                              4  // IO pin. Buffer needed
202 202
 #endif
203 203
 
204 204
 //
205 205
 // Misc. Functions
206 206
 //
207
-#define SDSS               53
208
-#define LED_PIN            13
207
+#define SDSS                                  53
208
+#define LED_PIN                               13
209 209
 
210 210
 #ifndef FILWIDTH_PIN
211
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
211
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
212 212
 #endif
213 213
 
214 214
 // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
215 215
 #ifndef FIL_RUNOUT_PIN
216
-  #define FIL_RUNOUT_PIN    4
216
+  #define FIL_RUNOUT_PIN                       4
217 217
 #endif
218 218
 
219 219
 #ifndef PS_ON_PIN
220
-  #define PS_ON_PIN        12
220
+  #define PS_ON_PIN                           12
221 221
 #endif
222 222
 
223 223
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
224
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
225
-    #define CASE_LIGHT_PIN    6   // Hardware PWM
226
-  #elif HAS_FREE_AUX2_PINS        // try to use AUX 2
227
-    #define CASE_LIGHT_PIN   44   // Hardware PWM
224
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
225
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
226
+  #elif HAS_FREE_AUX2_PINS                        // try to use AUX 2
227
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
228 228
   #endif
229 229
 #endif
230 230
 
@@ -232,14 +232,14 @@
232 232
 // M3/M4/M5 - Spindle/Laser Control
233 233
 //
234 234
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
235
-  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
236
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
237
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
238
-    #define SPINDLE_DIR_PIN           5
239
-  #elif HAS_FREE_AUX2_PINS                // try to use AUX 2
240
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
241
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
242
-    #define SPINDLE_DIR_PIN          65
235
+  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0     // Prefer the servo connector
236
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
237
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
238
+    #define SPINDLE_DIR_PIN                    5
239
+  #elif HAS_FREE_AUX2_PINS                        // try to use AUX 2
240
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
241
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
242
+    #define SPINDLE_DIR_PIN                   65
243 243
   #endif
244 244
 #endif
245 245
 
@@ -247,13 +247,13 @@
247 247
 // Průša i3 MK2 Multiplexer Support
248 248
 //
249 249
 #ifndef E_MUX0_PIN
250
-  #define E_MUX0_PIN 40   // Z_CS_PIN
250
+  #define E_MUX0_PIN                          40  // Z_CS_PIN
251 251
 #endif
252 252
 #ifndef E_MUX1_PIN
253
-  #define E_MUX1_PIN 42   // E0_CS_PIN
253
+  #define E_MUX1_PIN                          42  // E0_CS_PIN
254 254
 #endif
255 255
 #ifndef E_MUX2_PIN
256
-  #define E_MUX2_PIN 44   // E1_CS_PIN
256
+  #define E_MUX2_PIN                          44  // E1_CS_PIN
257 257
 #endif
258 258
 
259 259
 /**
@@ -261,13 +261,13 @@
261 261
  */
262 262
 #if ENABLED(TMC_USE_SW_SPI)
263 263
   #ifndef TMC_SW_MOSI
264
-    #define TMC_SW_MOSI    66
264
+    #define TMC_SW_MOSI                       66
265 265
   #endif
266 266
   #ifndef TMC_SW_MISO
267
-    #define TMC_SW_MISO    44
267
+    #define TMC_SW_MISO                       44
268 268
   #endif
269 269
   #ifndef TMC_SW_SCK
270
-    #define TMC_SW_SCK     64
270
+    #define TMC_SW_SCK                        64
271 271
   #endif
272 272
 #endif
273 273
 
@@ -295,91 +295,91 @@
295 295
    */
296 296
 
297 297
   #ifndef X_SERIAL_TX_PIN
298
-    #define X_SERIAL_TX_PIN  40
298
+    #define X_SERIAL_TX_PIN                   40
299 299
   #endif
300 300
   #ifndef X_SERIAL_RX_PIN
301
-    #define X_SERIAL_RX_PIN  63
301
+    #define X_SERIAL_RX_PIN                   63
302 302
   #endif
303 303
   #ifndef X2_SERIAL_TX_PIN
304
-    #define X2_SERIAL_TX_PIN -1
304
+    #define X2_SERIAL_TX_PIN                  -1
305 305
   #endif
306 306
   #ifndef X2_SERIAL_RX_PIN
307
-    #define X2_SERIAL_RX_PIN -1
307
+    #define X2_SERIAL_RX_PIN                  -1
308 308
   #endif
309 309
 
310 310
   #ifndef Y_SERIAL_TX_PIN
311
-    #define Y_SERIAL_TX_PIN  59
311
+    #define Y_SERIAL_TX_PIN                   59
312 312
   #endif
313 313
   #ifndef Y_SERIAL_RX_PIN
314
-    #define Y_SERIAL_RX_PIN  64
314
+    #define Y_SERIAL_RX_PIN                   64
315 315
   #endif
316 316
   #ifndef Y2_SERIAL_TX_PIN
317
-    #define Y2_SERIAL_TX_PIN -1
317
+    #define Y2_SERIAL_TX_PIN                  -1
318 318
   #endif
319 319
   #ifndef Y2_SERIAL_RX_PIN
320
-    #define Y2_SERIAL_RX_PIN -1
320
+    #define Y2_SERIAL_RX_PIN                  -1
321 321
   #endif
322 322
 
323 323
   #ifndef Z_SERIAL_TX_PIN
324
-    #define Z_SERIAL_TX_PIN  42
324
+    #define Z_SERIAL_TX_PIN                   42
325 325
   #endif
326 326
   #ifndef Z_SERIAL_RX_PIN
327
-    #define Z_SERIAL_RX_PIN  65
327
+    #define Z_SERIAL_RX_PIN                   65
328 328
   #endif
329 329
   #ifndef Z2_SERIAL_TX_PIN
330
-    #define Z2_SERIAL_TX_PIN -1
330
+    #define Z2_SERIAL_TX_PIN                  -1
331 331
   #endif
332 332
   #ifndef Z2_SERIAL_RX_PIN
333
-    #define Z2_SERIAL_RX_PIN -1
333
+    #define Z2_SERIAL_RX_PIN                  -1
334 334
   #endif
335 335
 
336 336
   #ifndef E0_SERIAL_TX_PIN
337
-    #define E0_SERIAL_TX_PIN 44
337
+    #define E0_SERIAL_TX_PIN                  44
338 338
   #endif
339 339
   #ifndef E0_SERIAL_RX_PIN
340
-    #define E0_SERIAL_RX_PIN 66
340
+    #define E0_SERIAL_RX_PIN                  66
341 341
   #endif
342 342
   #ifndef E1_SERIAL_TX_PIN
343
-    #define E1_SERIAL_TX_PIN -1
343
+    #define E1_SERIAL_TX_PIN                  -1
344 344
   #endif
345 345
   #ifndef E1_SERIAL_RX_PIN
346
-    #define E1_SERIAL_RX_PIN -1
346
+    #define E1_SERIAL_RX_PIN                  -1
347 347
   #endif
348 348
   #ifndef E2_SERIAL_TX_PIN
349
-    #define E2_SERIAL_TX_PIN -1
349
+    #define E2_SERIAL_TX_PIN                  -1
350 350
   #endif
351 351
   #ifndef E2_SERIAL_RX_PIN
352
-    #define E2_SERIAL_RX_PIN -1
352
+    #define E2_SERIAL_RX_PIN                  -1
353 353
   #endif
354 354
   #ifndef E3_SERIAL_TX_PIN
355
-    #define E3_SERIAL_TX_PIN -1
355
+    #define E3_SERIAL_TX_PIN                  -1
356 356
   #endif
357 357
   #ifndef E3_SERIAL_RX_PIN
358
-    #define E3_SERIAL_RX_PIN -1
358
+    #define E3_SERIAL_RX_PIN                  -1
359 359
   #endif
360 360
   #ifndef E4_SERIAL_TX_PIN
361
-    #define E4_SERIAL_TX_PIN -1
361
+    #define E4_SERIAL_TX_PIN                  -1
362 362
   #endif
363 363
   #ifndef E4_SERIAL_RX_PIN
364
-    #define E4_SERIAL_RX_PIN -1
364
+    #define E4_SERIAL_RX_PIN                  -1
365 365
   #endif
366 366
   #ifndef E5_SERIAL_TX_PIN
367
-    #define E5_SERIAL_TX_PIN -1
367
+    #define E5_SERIAL_TX_PIN                  -1
368 368
   #endif
369 369
   #ifndef E5_SERIAL_RX_PIN
370
-    #define E5_SERIAL_RX_PIN -1
370
+    #define E5_SERIAL_RX_PIN                  -1
371 371
   #endif
372 372
   #ifndef E6_SERIAL_TX_PIN
373
-    #define E6_SERIAL_TX_PIN -1
373
+    #define E6_SERIAL_TX_PIN                  -1
374 374
   #endif
375 375
   #ifndef E6_SERIAL_RX_PIN
376
-    #define E6_SERIAL_RX_PIN -1
376
+    #define E6_SERIAL_RX_PIN                  -1
377 377
   #endif
378 378
   #ifndef E7_SERIAL_TX_PIN
379
-    #define E7_SERIAL_TX_PIN -1
379
+    #define E7_SERIAL_TX_PIN                  -1
380 380
   #endif
381 381
   #ifndef E7_SERIAL_RX_PIN
382
-    #define E7_SERIAL_RX_PIN -1
382
+    #define E7_SERIAL_RX_PIN                  -1
383 383
   #endif
384 384
 #endif
385 385
 
@@ -394,62 +394,62 @@
394 394
   //
395 395
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
396 396
 
397
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
398
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
399
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
397
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
398
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
399
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
400 400
 
401 401
   #elif BOTH(NEWPANEL, PANEL_ONE)
402 402
 
403
-    #define LCD_PINS_RS         40
404
-    #define LCD_PINS_ENABLE     42
405
-    #define LCD_PINS_D4         65
406
-    #define LCD_PINS_D5         66
407
-    #define LCD_PINS_D6         44
408
-    #define LCD_PINS_D7         64
403
+    #define LCD_PINS_RS                       40
404
+    #define LCD_PINS_ENABLE                   42
405
+    #define LCD_PINS_D4                       65
406
+    #define LCD_PINS_D5                       66
407
+    #define LCD_PINS_D6                       44
408
+    #define LCD_PINS_D7                       64
409 409
 
410 410
   #else
411 411
 
412 412
     #if ENABLED(CR10_STOCKDISPLAY)
413 413
 
414
-      #define LCD_PINS_RS       27
415
-      #define LCD_PINS_ENABLE   29
416
-      #define LCD_PINS_D4       25
414
+      #define LCD_PINS_RS                     27
415
+      #define LCD_PINS_ENABLE                 29
416
+      #define LCD_PINS_D4                     25
417 417
 
418 418
       #if DISABLED(NEWPANEL)
419
-        #define BEEPER_PIN      37
419
+        #define BEEPER_PIN                    37
420 420
       #endif
421 421
 
422 422
     #elif ENABLED(ZONESTAR_LCD)
423 423
 
424
-      #define LCD_PINS_RS       64
425
-      #define LCD_PINS_ENABLE   44
426
-      #define LCD_PINS_D4       63
427
-      #define LCD_PINS_D5       40
428
-      #define LCD_PINS_D6       42
429
-      #define LCD_PINS_D7       65
424
+      #define LCD_PINS_RS                     64
425
+      #define LCD_PINS_ENABLE                 44
426
+      #define LCD_PINS_D4                     63
427
+      #define LCD_PINS_D5                     40
428
+      #define LCD_PINS_D6                     42
429
+      #define LCD_PINS_D7                     65
430 430
 
431 431
     #else
432 432
 
433 433
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
434
-        #define LCD_PINS_DC     25   // Set as output on init
435
-        #define LCD_PINS_RS     27   // Pull low for 1s to init
434
+        #define LCD_PINS_DC                   25  // Set as output on init
435
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
436 436
         // DOGM SPI LCD Support
437
-        #define DOGLCD_CS       16
438
-        #define DOGLCD_MOSI     17
439
-        #define DOGLCD_SCK      23
440
-        #define DOGLCD_A0       LCD_PINS_DC
437
+        #define DOGLCD_CS                     16
438
+        #define DOGLCD_MOSI                   17
439
+        #define DOGLCD_SCK                    23
440
+        #define DOGLCD_A0            LCD_PINS_DC
441 441
       #else
442
-        #define LCD_PINS_RS     16
443
-        #define LCD_PINS_ENABLE 17
444
-        #define LCD_PINS_D4     23
445
-        #define LCD_PINS_D5     25
446
-        #define LCD_PINS_D6     27
442
+        #define LCD_PINS_RS                   16
443
+        #define LCD_PINS_ENABLE               17
444
+        #define LCD_PINS_D4                   23
445
+        #define LCD_PINS_D5                   25
446
+        #define LCD_PINS_D6                   27
447 447
       #endif
448 448
 
449
-      #define LCD_PINS_D7       29
449
+      #define LCD_PINS_D7                     29
450 450
 
451 451
       #if DISABLED(NEWPANEL)
452
-        #define BEEPER_PIN      33
452
+        #define BEEPER_PIN                    33
453 453
       #endif
454 454
 
455 455
     #endif
@@ -457,10 +457,10 @@
457 457
     #if DISABLED(NEWPANEL)
458 458
       // Buttons attached to a shift register
459 459
       // Not wired yet
460
-      //#define SHIFT_CLK       38
461
-      //#define SHIFT_LD        42
462
-      //#define SHIFT_OUT       40
463
-      //#define SHIFT_EN        17
460
+      //#define SHIFT_CLK                     38
461
+      //#define SHIFT_LD                      42
462
+      //#define SHIFT_OUT                     40
463
+      //#define SHIFT_EN                      17
464 464
     #endif
465 465
 
466 466
   #endif
@@ -472,85 +472,85 @@
472 472
 
473 473
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
474 474
 
475
-      #define BEEPER_PIN        37
475
+      #define BEEPER_PIN                      37
476 476
 
477 477
       #if ENABLED(CR10_STOCKDISPLAY)
478
-        #define BTN_EN1         17
479
-        #define BTN_EN2         23
478
+        #define BTN_EN1                       17
479
+        #define BTN_EN2                       23
480 480
       #else
481
-        #define BTN_EN1         31
482
-        #define BTN_EN2         33
481
+        #define BTN_EN1                       31
482
+        #define BTN_EN2                       33
483 483
       #endif
484 484
 
485
-      #define BTN_ENC           35
486
-      #define SD_DETECT_PIN     49
487
-      #define KILL_PIN          41
485
+      #define BTN_ENC                         35
486
+      #define SD_DETECT_PIN                   49
487
+      #define KILL_PIN                        41
488 488
 
489 489
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
490
-        #define LCD_BACKLIGHT_PIN 39
490
+        #define LCD_BACKLIGHT_PIN             39
491 491
       #endif
492 492
 
493 493
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
494 494
 
495
-      #define BTN_EN1           64
496
-      #define BTN_EN2           59
497
-      #define BTN_ENC           63
498
-      #define SD_DETECT_PIN     42
495
+      #define BTN_EN1                         64
496
+      #define BTN_EN2                         59
497
+      #define BTN_ENC                         63
498
+      #define SD_DETECT_PIN                   42
499 499
 
500 500
     #elif ENABLED(LCD_I2C_PANELOLU2)
501 501
 
502
-      #define BTN_EN1           47
503
-      #define BTN_EN2           43
504
-      #define BTN_ENC           32
505
-      #define LCD_SDSS          SDSS
506
-      #define KILL_PIN          41
502
+      #define BTN_EN1                         47
503
+      #define BTN_EN2                         43
504
+      #define BTN_ENC                         32
505
+      #define LCD_SDSS                      SDSS
506
+      #define KILL_PIN                        41
507 507
 
508 508
     #elif ENABLED(LCD_I2C_VIKI)
509 509
 
510
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
511
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
512
-      #define BTN_ENC           -1
510
+      #define BTN_EN1                         22  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
511
+      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
512
+      #define BTN_ENC                         -1
513 513
 
514
-      #define LCD_SDSS          SDSS
515
-      #define SD_DETECT_PIN     49
514
+      #define LCD_SDSS                      SDSS
515
+      #define SD_DETECT_PIN                   49
516 516
 
517 517
     #elif ANY(VIKI2, miniVIKI)
518 518
 
519
-      #define DOGLCD_CS         45
520
-      #define DOGLCD_A0         44
519
+      #define DOGLCD_CS                       45
520
+      #define DOGLCD_A0                       44
521 521
       #define LCD_SCREEN_ROT_180
522 522
 
523
-      #define BEEPER_PIN        33
524
-      #define STAT_LED_RED_PIN  32
525
-      #define STAT_LED_BLUE_PIN 35
523
+      #define BEEPER_PIN                      33
524
+      #define STAT_LED_RED_PIN                32
525
+      #define STAT_LED_BLUE_PIN               35
526 526
 
527
-      #define BTN_EN1           22
528
-      #define BTN_EN2            7
529
-      #define BTN_ENC           39
527
+      #define BTN_EN1                         22
528
+      #define BTN_EN2                          7
529
+      #define BTN_ENC                         39
530 530
 
531
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
532
-      #define KILL_PIN          31
531
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display sd interface, 72 for easy adapter board
532
+      #define KILL_PIN                        31
533 533
 
534 534
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
535 535
 
536
-      #define DOGLCD_CS         29
537
-      #define DOGLCD_A0         27
536
+      #define DOGLCD_CS                       29
537
+      #define DOGLCD_A0                       27
538 538
 
539
-      #define BEEPER_PIN        23
540
-      #define LCD_BACKLIGHT_PIN 33
539
+      #define BEEPER_PIN                      23
540
+      #define LCD_BACKLIGHT_PIN               33
541 541
 
542
-      #define BTN_EN1           35
543
-      #define BTN_EN2           37
544
-      #define BTN_ENC           31
542
+      #define BTN_EN1                         35
543
+      #define BTN_EN2                         37
544
+      #define BTN_ENC                         31
545 545
 
546
-      #define LCD_SDSS          SDSS
547
-      #define SD_DETECT_PIN     49
548
-      #define KILL_PIN          41
546
+      #define LCD_SDSS                      SDSS
547
+      #define SD_DETECT_PIN                   49
548
+      #define KILL_PIN                        41
549 549
 
550 550
     #elif ENABLED(MKS_MINI_12864)
551 551
 
552
-      #define DOGLCD_A0         27
553
-      #define DOGLCD_CS         25
552
+      #define DOGLCD_A0                       27
553
+      #define DOGLCD_CS                       25
554 554
 
555 555
       // GLCD features
556 556
       // Uncomment screen orientation
@@ -558,25 +558,25 @@
558 558
       //#define LCD_SCREEN_ROT_180
559 559
       //#define LCD_SCREEN_ROT_270
560 560
 
561
-      #define BEEPER_PIN        37
561
+      #define BEEPER_PIN                      37
562 562
       // not connected to a pin
563
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
563
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
564 564
 
565
-      #define BTN_EN1           31
566
-      #define BTN_EN2           33
567
-      #define BTN_ENC           35
565
+      #define BTN_EN1                         31
566
+      #define BTN_EN2                         33
567
+      #define BTN_ENC                         35
568 568
 
569
-      #define SD_DETECT_PIN     49
570
-      #define KILL_PIN          64
569
+      #define SD_DETECT_PIN                   49
570
+      #define KILL_PIN                        64
571 571
 
572 572
     #elif ENABLED(MINIPANEL)
573 573
 
574
-      #define BEEPER_PIN        42
574
+      #define BEEPER_PIN                      42
575 575
       // not connected to a pin
576
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
576
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
577 577
 
578
-      #define DOGLCD_A0         44
579
-      #define DOGLCD_CS         66
578
+      #define DOGLCD_A0                       44
579
+      #define DOGLCD_CS                       66
580 580
 
581 581
       // GLCD features
582 582
       // Uncomment screen orientation
@@ -584,16 +584,16 @@
584 584
       //#define LCD_SCREEN_ROT_180
585 585
       //#define LCD_SCREEN_ROT_270
586 586
 
587
-      #define BTN_EN1           40
588
-      #define BTN_EN2           63
589
-      #define BTN_ENC           59
587
+      #define BTN_EN1                         40
588
+      #define BTN_EN2                         63
589
+      #define BTN_ENC                         59
590 590
 
591
-      #define SD_DETECT_PIN     49
592
-      #define KILL_PIN          64
591
+      #define SD_DETECT_PIN                   49
592
+      #define KILL_PIN                        64
593 593
 
594 594
     #elif ENABLED(ZONESTAR_LCD)
595 595
 
596
-      #define ADC_KEYPAD_PIN    12
596
+      #define ADC_KEYPAD_PIN                  12
597 597
 
598 598
     #elif ENABLED(AZSMZ_12864)
599 599
 
@@ -602,29 +602,29 @@
602 602
     #else
603 603
 
604 604
       // Beeper on AUX-4
605
-      #define BEEPER_PIN        33
605
+      #define BEEPER_PIN                      33
606 606
 
607 607
       // Buttons are directly attached to AUX-2
608 608
       #if ENABLED(REPRAPWORLD_KEYPAD)
609
-        #define SHIFT_OUT       40
610
-        #define SHIFT_CLK       44
611
-        #define SHIFT_LD        42
612
-        #define BTN_EN1         64
613
-        #define BTN_EN2         59
614
-        #define BTN_ENC         63
609
+        #define SHIFT_OUT                     40
610
+        #define SHIFT_CLK                     44
611
+        #define SHIFT_LD                      42
612
+        #define BTN_EN1                       64
613
+        #define BTN_EN2                       59
614
+        #define BTN_ENC                       63
615 615
       #elif ENABLED(PANEL_ONE)
616
-        #define BTN_EN1         59   // AUX2 PIN 3
617
-        #define BTN_EN2         63   // AUX2 PIN 4
618
-        #define BTN_ENC         49   // AUX3 PIN 7
616
+        #define BTN_EN1                       59  // AUX2 PIN 3
617
+        #define BTN_EN2                       63  // AUX2 PIN 4
618
+        #define BTN_ENC                       49  // AUX3 PIN 7
619 619
       #else
620
-        #define BTN_EN1         37
621
-        #define BTN_EN2         35
622
-        #define BTN_ENC         31
620
+        #define BTN_EN1                       37
621
+        #define BTN_EN2                       35
622
+        #define BTN_ENC                       31
623 623
       #endif
624 624
 
625 625
       #if ENABLED(G3D_PANEL)
626
-        #define SD_DETECT_PIN   49
627
-        #define KILL_PIN        41
626
+        #define SD_DETECT_PIN                 49
627
+        #define KILL_PIN                      41
628 628
       #endif
629 629
 
630 630
     #endif

+ 55
- 55
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h Parādīt failu

@@ -40,84 +40,84 @@
40 40
 //
41 41
 // Servos
42 42
 //
43
-#define SERVO0_PIN         P1_23
43
+#define SERVO0_PIN                         P1_23
44 44
 
45 45
 //
46 46
 // Limit Switches
47 47
 //
48
-#define X_MIN_PIN          P1_24
49
-#define Y_MIN_PIN          P1_26
50
-#define Z_MIN_PIN          P1_28
51
-#define Z_MAX_PIN          P1_29
48
+#define X_MIN_PIN                          P1_24
49
+#define Y_MIN_PIN                          P1_26
50
+#define Z_MIN_PIN                          P1_28
51
+#define Z_MAX_PIN                          P1_29
52 52
 
53 53
 //
54 54
 // Steppers
55 55
 //
56
-#define X_STEP_PIN         P2_00
57
-#define X_DIR_PIN          P0_05
58
-#define X_ENABLE_PIN       P0_04
56
+#define X_STEP_PIN                         P2_00
57
+#define X_DIR_PIN                          P0_05
58
+#define X_ENABLE_PIN                       P0_04
59 59
 
60
-#define Y_STEP_PIN         P2_01
61
-#define Y_DIR_PIN          P0_11
62
-#define Y_ENABLE_PIN       P0_10
60
+#define Y_STEP_PIN                         P2_01
61
+#define Y_DIR_PIN                          P0_11
62
+#define Y_ENABLE_PIN                       P0_10
63 63
 
64
-#define Z_STEP_PIN         P2_02
65
-#define Z_DIR_PIN          P0_20
66
-#define Z_ENABLE_PIN       P0_19
64
+#define Z_STEP_PIN                         P2_02
65
+#define Z_DIR_PIN                          P0_20
66
+#define Z_ENABLE_PIN                       P0_19
67 67
 
68
-#define E0_STEP_PIN        P2_03
69
-#define E0_DIR_PIN         P0_22
70
-#define E0_ENABLE_PIN      P0_21
68
+#define E0_STEP_PIN                        P2_03
69
+#define E0_DIR_PIN                         P0_22
70
+#define E0_ENABLE_PIN                      P0_21
71 71
 
72
-#define E1_STEP_PIN        P2_08
73
-#define E1_DIR_PIN         P2_13
74
-#define E1_ENABLE_PIN      P4_29
72
+#define E1_STEP_PIN                        P2_08
73
+#define E1_DIR_PIN                         P2_13
74
+#define E1_ENABLE_PIN                      P4_29
75 75
 
76 76
 //
77 77
 // Temperature Sensors
78 78
 //  3.3V max when defined as an analog input
79 79
 //
80
-#define TEMP_0_PIN          P0_23_A0   // A0 (TH1)
81
-#define TEMP_BED_PIN        P0_24_A1   // A1 (TH2)
82
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
80
+#define TEMP_0_PIN                      P0_23_A0  // A0 (TH1)
81
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (TH2)
82
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
83 83
 
84 84
 //
85 85
 // Heaters / Fans
86 86
 //
87 87
 // EFB
88
-#define HEATER_0_PIN       P2_04
89
-#define HEATER_BED_PIN     P2_05
88
+#define HEATER_0_PIN                       P2_04
89
+#define HEATER_BED_PIN                     P2_05
90 90
 #ifndef FAN_PIN
91
-  #define FAN_PIN          P2_07
91
+  #define FAN_PIN                          P2_07
92 92
 #endif
93
-#define FAN1_PIN           P0_26
93
+#define FAN1_PIN                           P0_26
94 94
 
95
-#define LCD_SDSS           P0_16   // LCD SD chip select
96
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
95
+#define LCD_SDSS                           P0_16  // LCD SD chip select
96
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
97 97
 
98 98
 #if ENABLED(AZSMZ_12864)
99
-  #define BEEPER_PIN       P1_30
100
-  #define DOGLCD_A0        P2_06
101
-  #define DOGLCD_CS        P1_22
102
-  #define BTN_EN1          P4_28
103
-  #define BTN_EN2          P1_27
104
-  #define BTN_ENC          P3_26
99
+  #define BEEPER_PIN                       P1_30
100
+  #define DOGLCD_A0                        P2_06
101
+  #define DOGLCD_CS                        P1_22
102
+  #define BTN_EN1                          P4_28
103
+  #define BTN_EN2                          P1_27
104
+  #define BTN_ENC                          P3_26
105 105
   #ifndef SDCARD_CONNECTION
106
-    #define SDCARD_CONNECTION LCD
106
+    #define SDCARD_CONNECTION                LCD
107 107
   #endif
108 108
 #endif
109 109
 
110 110
 #if SD_CONNECTION_IS(LCD)
111
-  #define SCK_PIN          P0_15
112
-  #define MISO_PIN         P0_17
113
-  #define MOSI_PIN         P0_18
114
-  #define SS_PIN           LCD_SDSS
115
-  #define SD_DETECT_PIN    P3_25
111
+  #define SCK_PIN                          P0_15
112
+  #define MISO_PIN                         P0_17
113
+  #define MOSI_PIN                         P0_18
114
+  #define SS_PIN                        LCD_SDSS
115
+  #define SD_DETECT_PIN                    P3_25
116 116
 #elif SD_CONNECTION_IS(ONBOARD)
117
-  #define SCK_PIN          P0_07
118
-  #define MISO_PIN         P0_08
119
-  #define MOSI_PIN         P0_09
120
-  #define SS_PIN           ONBOARD_SD_CS_PIN
117
+  #define SCK_PIN                          P0_07
118
+  #define MISO_PIN                         P0_08
119
+  #define MOSI_PIN                         P0_09
120
+  #define SS_PIN               ONBOARD_SD_CS_PIN
121 121
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
122 122
   #error "No custom SD drive cable defined for this board."
123 123
 #endif
@@ -125,16 +125,16 @@
125 125
 //
126 126
 // Ethernet pins
127 127
 //
128
-#define ENET_MDIO          P1_17
129
-#define ENET_RX_ER         P1_14
130
-#define ENET_RXD1          P1_10
131
-#define ENET_MOC           P1_16
132
-#define REF_CLK            P1_15
133
-#define ENET_RXD0          P1_09
134
-#define ENET_CRS           P1_08
135
-#define ENET_TX_EN         P1_04
136
-#define ENET_TXD0          P1_00
137
-#define ENET_TXD1          P1_01
128
+#define ENET_MDIO                          P1_17
129
+#define ENET_RX_ER                         P1_14
130
+#define ENET_RXD1                          P1_10
131
+#define ENET_MOC                           P1_16
132
+#define REF_CLK                            P1_15
133
+#define ENET_RXD0                          P1_09
134
+#define ENET_CRS                           P1_08
135
+#define ENET_TX_EN                         P1_04
136
+#define ENET_TXD0                          P1_00
137
+#define ENET_TXD1                          P1_01
138 138
 
139 139
 /**
140 140
  *  PWMs

+ 45
- 45
Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h Parādīt failu

@@ -47,42 +47,42 @@
47 47
 //
48 48
 // Limit Switches
49 49
 //
50
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V, 1K series
51
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V, 1K series
52
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V, 1K series
53
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V, 1K series
54
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V, 1K series
55
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V, 1K series
50
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
51
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
52
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
53
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
54
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V, 1K series
55
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
56 56
 
57 57
 //
58 58
 // Steppers
59 59
 //
60
-#define X_STEP_PIN         P2_00
61
-#define X_DIR_PIN          P0_05
62
-#define X_ENABLE_PIN       P0_04
60
+#define X_STEP_PIN                         P2_00
61
+#define X_DIR_PIN                          P0_05
62
+#define X_ENABLE_PIN                       P0_04
63 63
 #ifndef X_CS_PIN
64
-  #define X_CS_PIN         P1_15   // ETH
64
+  #define X_CS_PIN                         P1_15  // ETH
65 65
 #endif
66 66
 
67
-#define Y_STEP_PIN         P2_01
68
-#define Y_DIR_PIN          P0_11
69
-#define Y_ENABLE_PIN       P0_10
67
+#define Y_STEP_PIN                         P2_01
68
+#define Y_DIR_PIN                          P0_11
69
+#define Y_ENABLE_PIN                       P0_10
70 70
 #ifndef Y_CS_PIN
71
-  #define Y_CS_PIN         P1_14   // ETH
71
+  #define Y_CS_PIN                         P1_14  // ETH
72 72
 #endif
73 73
 
74
-#define Z_STEP_PIN         P2_02
75
-#define Z_DIR_PIN          P0_20
76
-#define Z_ENABLE_PIN       P0_19
74
+#define Z_STEP_PIN                         P2_02
75
+#define Z_DIR_PIN                          P0_20
76
+#define Z_ENABLE_PIN                       P0_19
77 77
 #ifndef Z_CS_PIN
78
-  #define Z_CS_PIN         P1_16   // ETH
78
+  #define Z_CS_PIN                         P1_16  // ETH
79 79
 #endif
80 80
 
81
-#define E0_STEP_PIN        P2_03
82
-#define E0_DIR_PIN         P0_22
83
-#define E0_ENABLE_PIN      P0_21
81
+#define E0_STEP_PIN                        P2_03
82
+#define E0_DIR_PIN                         P0_22
83
+#define E0_ENABLE_PIN                      P0_21
84 84
 #ifndef E0_CS_PIN
85
-  #define E0_CS_PIN        P1_17   // ETH
85
+  #define E0_CS_PIN                        P1_17  // ETH
86 86
 #endif
87 87
 
88 88
 //
@@ -90,13 +90,13 @@
90 90
 //
91 91
 #if ENABLED(TMC_USE_SW_SPI)
92 92
   #ifndef TMC_SW_MOSI
93
-    #define TMC_SW_MOSI    P0_18   // ETH
93
+    #define TMC_SW_MOSI                    P0_18  // ETH
94 94
   #endif
95 95
   #ifndef TMC_SW_MISO
96
-    #define TMC_SW_MISO    P0_17   // ETH
96
+    #define TMC_SW_MISO                    P0_17  // ETH
97 97
   #endif
98 98
   #ifndef TMC_SW_SCK
99
-    #define TMC_SW_SCK     P0_15   // ETH
99
+    #define TMC_SW_SCK                     P0_15  // ETH
100 100
   #endif
101 101
 #endif
102 102
 
@@ -104,23 +104,23 @@
104 104
 // Temperature Sensors
105 105
 //  3.3V max when defined as an analog input
106 106
 //
107
-#define TEMP_0_PIN          P0_24_A1   // A0 (T0)
108
-#define TEMP_BED_PIN        P0_23_A0   // A1 (T1)
107
+#define TEMP_0_PIN                      P0_24_A1  // A0 (T0)
108
+#define TEMP_BED_PIN                    P0_23_A0  // A1 (T1)
109 109
 
110 110
 //
111 111
 // Heaters / Fans
112 112
 //
113
-#define HEATER_0_PIN       P2_07
114
-#define HEATER_BED_PIN     P2_05
113
+#define HEATER_0_PIN                       P2_07
114
+#define HEATER_BED_PIN                     P2_05
115 115
 #ifndef FAN_PIN
116
-  #define FAN_PIN          P2_04
116
+  #define FAN_PIN                          P2_04
117 117
 #endif
118 118
 
119 119
 //
120 120
 // Unused
121 121
 //
122
-//#define PIN_P2_10        P2_10   // IBOOT-1
123
-//#define PIN_P0_27        P0_27   // Onboard SD Detect
122
+//#define PIN_P2_10                        P2_10  // IBOOT-1
123
+//#define PIN_P0_27                        P0_27  // Onboard SD Detect
124 124
 
125 125
 /**
126 126
  * LCD / Controller
@@ -134,16 +134,16 @@
134 134
  */
135 135
 #if HAS_SPI_LCD
136 136
 
137
-  #define BEEPER_PIN       P1_31   // EXP1-1
137
+  #define BEEPER_PIN                       P1_31  // EXP1-1
138 138
 
139
-  #define BTN_EN1          P3_26   // EXP2-3
140
-  #define BTN_EN2          P3_25   // EXP2-5
141
-  #define BTN_ENC          P1_30   // EXP1-2
139
+  #define BTN_EN1                          P3_26  // EXP2-3
140
+  #define BTN_EN2                          P3_25  // EXP2-5
141
+  #define BTN_ENC                          P1_30  // EXP1-2
142 142
 
143
-  #define SD_DETECT_PIN    P0_27   // EXP2-7
144
-  #define LCD_PINS_RS      P0_16   // EXP1-4
145
-  #define LCD_PINS_ENABLE  P0_18   // (MOSI) EXP1-3
146
-  #define LCD_PINS_D4      P0_15   // (SCK)  EXP1-5
143
+  #define SD_DETECT_PIN                    P0_27  // EXP2-7
144
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
145
+  #define LCD_PINS_ENABLE                  P0_18  // (MOSI) EXP1-3
146
+  #define LCD_PINS_D4                      P0_15  // (SCK)  EXP1-5
147 147
 
148 148
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
149 149
     #error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
@@ -162,11 +162,11 @@
162 162
  * Hardware SPI can't be used because P0_17 (MISO) is not brought out on this board.
163 163
  */
164 164
 #if ENABLED(SDSUPPORT)
165
-  #define SCK_PIN          P0_15   // EXP1-5
166
-  #define MISO_PIN         P0_16   // EXP1-4
167
-  #define MOSI_PIN         P0_18   // EXP1-3
168
-  #define SS_PIN           P1_30   // EXP1-2
169
-  #define SDSS             SS_PIN
165
+  #define SCK_PIN                          P0_15  // EXP1-5
166
+  #define MISO_PIN                         P0_16  // EXP1-4
167
+  #define MOSI_PIN                         P0_18  // EXP1-3
168
+  #define SS_PIN                           P1_30  // EXP1-2
169
+  #define SDSS                            SS_PIN
170 170
 #endif
171 171
 
172 172
 /**

+ 38
- 43
Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h Parādīt failu

@@ -45,56 +45,53 @@
45 45
 //
46 46
 // Limit Switches
47 47
 //
48
-#define X_MIN_PIN         P1_24   // 10k pullup to 3.3V, 1K series
49
-#define X_MAX_PIN         P1_25   // 10k pullup to 3.3V, 1K series
50
-#define Y_MIN_PIN         P1_26   // 10k pullup to 3.3V, 1K series
51
-#define Y_MAX_PIN         P1_27   // 10k pullup to 3.3V, 1K series
52
-#define Z_MIN_PIN         P1_28   // 10k pullup to 3.3V, 1K series
53
-#define Z_MAX_PIN         P1_29   // 10k pullup to 3.3V, 1K series
54
-
48
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
49
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
50
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
51
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
52
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V, 1K series
53
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
55 54
 
56 55
 //
57 56
 // Steppers
58 57
 //
59
-#define X_STEP_PIN         P2_0
60
-#define X_DIR_PIN          P0_5
61
-#define X_ENABLE_PIN       P0_4
62
-
63
-#define Y_STEP_PIN         P2_1
64
-#define Y_DIR_PIN          P0_11
65
-#define Y_ENABLE_PIN       P0_10
58
+#define X_STEP_PIN                         P2_0
59
+#define X_DIR_PIN                          P0_5
60
+#define X_ENABLE_PIN                       P0_4
66 61
 
67
-#define Z_STEP_PIN         P2_2
68
-#define Z_DIR_PIN          P0_20
69
-#define Z_ENABLE_PIN       P0_19
62
+#define Y_STEP_PIN                         P2_1
63
+#define Y_DIR_PIN                          P0_11
64
+#define Y_ENABLE_PIN                       P0_10
70 65
 
71
-#define E0_STEP_PIN        P2_3
72
-#define E0_DIR_PIN         P0_22
73
-#define E0_ENABLE_PIN      P0_21
66
+#define Z_STEP_PIN                         P2_2
67
+#define Z_DIR_PIN                          P0_20
68
+#define Z_ENABLE_PIN                       P0_19
74 69
 
70
+#define E0_STEP_PIN                        P2_3
71
+#define E0_DIR_PIN                         P0_22
72
+#define E0_ENABLE_PIN                      P0_21
75 73
 
76 74
 //
77 75
 // Temperature Sensors
78 76
 //  3.3V max when defined as an analog input
79 77
 //
80
-#define TEMP_0_PIN          P0_23_A0   // A0 (T0)
81
-#define TEMP_BED_PIN        P0_24_A1   // A1 (T1)
82
-
78
+#define TEMP_0_PIN                      P0_23_A0  // A0 (T0)
79
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (T1)
83 80
 
84 81
 //
85 82
 // Heaters / Fans
86 83
 //
87
-#define HEATER_0_PIN       P2_7
88
-#define HEATER_BED_PIN     P2_5
84
+#define HEATER_0_PIN                       P2_7
85
+#define HEATER_BED_PIN                     P2_5
89 86
 #ifndef FAN_PIN
90
-  #define FAN_PIN          P2_4
87
+  #define FAN_PIN                          P2_4
91 88
 #endif
92 89
 
93 90
 //
94 91
 // Unused
95 92
 //
96
-//#define PIN_P2_10         P2_10   // IBOOT-1
97
-//#define PIN_P0_27         P0_27   // Onboard SD Detect
93
+//#define PIN_P2_10                        P2_10  // IBOOT-1
94
+//#define PIN_P0_27                        P0_27  // Onboard SD Detect
98 95
 
99 96
 /**
100 97
  * LCD / Controller
@@ -108,16 +105,16 @@
108 105
  */
109 106
 #if HAS_SPI_LCD
110 107
 
111
-  #define BEEPER_PIN          P1_31   // EXP1-1
108
+  #define BEEPER_PIN                       P1_31  // EXP1-1
112 109
 
113
-  #define BTN_EN1             P3_26   // EXP2-3
114
-  #define BTN_EN2             P3_25   // EXP2-5
115
-  #define BTN_ENC             P1_30   // EXP1-2
110
+  #define BTN_EN1                          P3_26  // EXP2-3
111
+  #define BTN_EN2                          P3_25  // EXP2-5
112
+  #define BTN_ENC                          P1_30  // EXP1-2
116 113
 
117
-  #define SD_DETECT_PIN       P0_27   // EXP2-7
118
-  #define LCD_PINS_RS         P0_16   // EXP1-4
119
-  #define LCD_PINS_ENABLE     P0_18   // (MOSI) EXP1-3
120
-  #define LCD_PINS_D4         P0_15   // (SCK)  EXP1-5
114
+  #define SD_DETECT_PIN                    P0_27  // EXP2-7
115
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
116
+  #define LCD_PINS_ENABLE                  P0_18  // (MOSI) EXP1-3
117
+  #define LCD_PINS_D4                      P0_15  // (SCK)  EXP1-5
121 118
 
122 119
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
123 120
     #error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
@@ -129,7 +126,6 @@
129 126
 
130 127
 #endif // HAS_SPI_LCD
131 128
 
132
-
133 129
 /**
134 130
  * SD Card Reader
135 131
  *
@@ -138,15 +134,14 @@
138 134
  */
139 135
 #if ENABLED(SDSUPPORT)
140 136
 
141
-  #define SCK_PIN   P0_15   // EXP1-5
142
-  #define MISO_PIN  P0_16   // EXP1-4
143
-  #define MOSI_PIN  P0_18   // EXP1-3
144
-  #define SS_PIN    P1_30   // EXP1-2
145
-  #define SDSS      SS_PIN
137
+  #define SCK_PIN                          P0_15  // EXP1-5
138
+  #define MISO_PIN                         P0_16  // EXP1-4
139
+  #define MOSI_PIN                         P0_18  // EXP1-3
140
+  #define SS_PIN                           P1_30  // EXP1-2
141
+  #define SDSS                            SS_PIN
146 142
 
147 143
 #endif // SDSUPPORT
148 144
 
149
-
150 145
 /**
151 146
  *  PWMS
152 147
  *

+ 68
- 69
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h Parādīt failu

@@ -33,31 +33,31 @@
33 33
 // Limit Switches
34 34
 //
35 35
 
36
-#define X_MIN_PIN          P1_29
37
-#define X_MAX_PIN          P1_28
38
-#define Y_MIN_PIN          P1_27
39
-#define Y_MAX_PIN          P1_26
40
-#define Z_MIN_PIN          P1_25
41
-#define Z_MAX_PIN          P1_24
36
+#define X_MIN_PIN                          P1_29
37
+#define X_MAX_PIN                          P1_28
38
+#define Y_MIN_PIN                          P1_27
39
+#define Y_MAX_PIN                          P1_26
40
+#define Z_MIN_PIN                          P1_25
41
+#define Z_MAX_PIN                          P1_24
42 42
 
43 43
 //
44 44
 // Steppers
45 45
 //
46
-#define X_STEP_PIN         P0_04
47
-#define X_DIR_PIN          P0_05
48
-#define X_ENABLE_PIN       P4_28
46
+#define X_STEP_PIN                         P0_04
47
+#define X_DIR_PIN                          P0_05
48
+#define X_ENABLE_PIN                       P4_28
49 49
 
50
-#define Y_STEP_PIN         P2_01
51
-#define Y_DIR_PIN          P2_02
52
-#define Y_ENABLE_PIN       P2_00
50
+#define Y_STEP_PIN                         P2_01
51
+#define Y_DIR_PIN                          P2_02
52
+#define Y_ENABLE_PIN                       P2_00
53 53
 
54
-#define Z_STEP_PIN         P0_20
55
-#define Z_DIR_PIN          P0_21
56
-#define Z_ENABLE_PIN       P0_19
54
+#define Z_STEP_PIN                         P0_20
55
+#define Z_DIR_PIN                          P0_21
56
+#define Z_ENABLE_PIN                       P0_19
57 57
 
58
-#define E0_STEP_PIN        P0_11
59
-#define E0_DIR_PIN         P2_13
60
-#define E0_ENABLE_PIN      P2_12
58
+#define E0_STEP_PIN                        P0_11
59
+#define E0_DIR_PIN                         P2_13
60
+#define E0_ENABLE_PIN                      P2_12
61 61
 
62 62
 /**
63 63
  * LCD / Controller
@@ -73,19 +73,19 @@
73 73
  */
74 74
 
75 75
 #if HAS_SPI_LCD
76
-  #define BTN_EN1          P3_26
77
-  #define BTN_EN2          P3_25
78
-  #define BTN_ENC          P2_11
76
+  #define BTN_EN1                          P3_26
77
+  #define BTN_EN2                          P3_25
78
+  #define BTN_ENC                          P2_11
79 79
 
80
-  #define SD_DETECT_PIN    P1_31
81
-  #define LCD_SDSS         P1_23
82
-  #define LCD_PINS_RS      P0_16
83
-  #define LCD_PINS_ENABLE  P0_18
84
-  #define LCD_PINS_D4      P0_15
80
+  #define SD_DETECT_PIN                    P1_31
81
+  #define LCD_SDSS                         P1_23
82
+  #define LCD_PINS_RS                      P0_16
83
+  #define LCD_PINS_ENABLE                  P0_18
84
+  #define LCD_PINS_D4                      P0_15
85 85
 
86 86
   #if ENABLED(MKS_MINI_12864)
87
-    #define DOGLCD_CS      P2_06
88
-    #define DOGLCD_A0      P0_16
87
+    #define DOGLCD_CS                      P2_06
88
+    #define DOGLCD_A0                      P0_16
89 89
   #endif
90 90
 #endif
91 91
 
@@ -97,14 +97,14 @@
97 97
 // https://www.facebook.com/groups/505736576548648/permalink/630639874058317/
98 98
 #ifndef SDCARD_CONNECTION
99 99
   #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
100
-    #define SDCARD_CONNECTION LCD
100
+    #define SDCARD_CONNECTION                LCD
101 101
   #else
102
-    #define SDCARD_CONNECTION ONBOARD
102
+    #define SDCARD_CONNECTION            ONBOARD
103 103
   #endif
104 104
 #endif
105 105
 
106 106
 #if SD_CONNECTION_IS(LCD)
107
-  #define SS_PIN           P1_23
107
+  #define SS_PIN                           P1_23
108 108
 #endif
109 109
 
110 110
 // Trinamic driver support
@@ -137,49 +137,48 @@
137 137
   // When using any TMC SPI-based drivers, software SPI is used
138 138
   // because pins may be shared with the display or SD card.
139 139
   #define TMC_USE_SW_SPI
140
-  #define TMC_SW_MOSI       P0_18
141
-  #define TMC_SW_MISO       P0_17
140
+  #define TMC_SW_MOSI                      P0_18
141
+  #define TMC_SW_MISO                      P0_17
142 142
   // To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
143
-  #define TMC_SW_SCK        P0_15
143
+  #define TMC_SW_SCK                       P0_15
144 144
   // If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
145
-  //#define TMC_SW_SCK        P2_06
145
+  //#define TMC_SW_SCK                     P2_06
146 146
 
147 147
   #if ENABLED(SOFTWARE_DRIVER_ENABLE)
148 148
 
149 149
     // Software enable allows the enable pins to be repurposed as chip-select pins.
150 150
     // Note: Requires the driver modules to be modified to always be enabled with the enable pin removed.
151 151
     #if AXIS_DRIVER_TYPE_X(TMC2130)
152
-      #define X_CS_PIN         P4_28
153
-      #undef  X_ENABLE_PIN
154
-      #define X_ENABLE_PIN     -1
152
+      #define X_CS_PIN                     P4_28
153
+      #undef X_ENABLE_PIN
154
+      #define X_ENABLE_PIN                 -1
155 155
     #endif
156 156
 
157 157
     #if AXIS_DRIVER_TYPE_Y(TMC2130)
158
-      #define Y_CS_PIN         P2_00
159
-      #undef  Y_ENABLE_PIN
160
-      #define Y_ENABLE_PIN     -1
158
+      #define Y_CS_PIN                     P2_00
159
+      #undef Y_ENABLE_PIN
160
+      #define Y_ENABLE_PIN                 -1
161 161
     #endif
162 162
 
163 163
     #if AXIS_DRIVER_TYPE_Z(TMC2130)
164
-      #define Z_CS_PIN         P0_19
165
-      #undef  Z_ENABLE_PIN
166
-      #define Z_ENABLE_PIN     -1
164
+      #define Z_CS_PIN                     P0_19
165
+      #undef Z_ENABLE_PIN
166
+      #define Z_ENABLE_PIN                 -1
167 167
     #endif
168 168
 
169 169
     #if AXIS_DRIVER_TYPE_E0(TMC2130)
170
-      #define E0_CS_PIN        P2_12
171
-      #undef  E0_ENABLE_PIN
172
-      #define E0_ENABLE_PIN    -1
170
+      #define E0_CS_PIN                    P2_12
171
+      #undef E0_ENABLE_PIN
172
+      #define E0_ENABLE_PIN                -1
173 173
     #endif
174 174
 
175
-
176 175
     #if AXIS_DRIVER_TYPE_E1(TMC2130)
177
-      #define E1_CS_PIN        P0_10
178
-      #undef  E1_ENABLE_PIN
179
-      #define E1_ENABLE_PIN    -1
176
+      #define E1_CS_PIN                    P0_10
177
+      #undef E1_ENABLE_PIN
178
+      #define E1_ENABLE_PIN                -1
180 179
     #endif
181 180
 
182
-  #else // !SOFTWARE_DRIVER_ENABLE
181
+  #else                                           // !SOFTWARE_DRIVER_ENABLE
183 182
 
184 183
     // A chip-select pin is needed for each driver.
185 184
 
@@ -192,11 +191,11 @@
192 191
       #if SD_CONNECTION_IS(LCD)
193 192
         #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS."
194 193
       #endif
195
-      #define X_CS_PIN      P1_23
196
-      #define Y_CS_PIN      P3_26
197
-      #define Z_CS_PIN      P2_11
198
-      #define E0_CS_PIN     P3_25
199
-      #define E1_CS_PIN     P1_31
194
+      #define X_CS_PIN                     P1_23
195
+      #define Y_CS_PIN                     P3_26
196
+      #define Z_CS_PIN                     P2_11
197
+      #define E0_CS_PIN                    P3_25
198
+      #define E1_CS_PIN                    P1_31
200 199
     #endif
201 200
 
202 201
     // Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -207,16 +206,16 @@
207 206
       #if SD_CONNECTION_IS(LCD)
208 207
         #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
209 208
       #endif
210
-      #define X_CS_PIN      P0_02
211
-      #define Y_CS_PIN      P0_03
212
-      #define Z_CS_PIN      P2_06
209
+      #define X_CS_PIN                     P0_02
210
+      #define Y_CS_PIN                     P0_03
211
+      #define Z_CS_PIN                     P2_06
213 212
       // We use SD_DETECT_PIN for E0
214 213
       #undef SD_DETECT_PIN
215
-      #define E0_CS_PIN     P1_31
214
+      #define E0_CS_PIN                    P1_31
216 215
       // We use LCD_SDSS pin for E1
217
-      #undef  LCD_SDSS
218
-      #define LCD_SDSS      -1
219
-      #define E1_CS_PIN     P1_23
216
+      #undef LCD_SDSS
217
+      #define LCD_SDSS                     -1
218
+      #define E1_CS_PIN                    P1_23
220 219
     #endif
221 220
 
222 221
     // Example 3: Use the driver enable pins for chip-select.
@@ -224,11 +223,11 @@
224 223
     //            advanced features (like driver monitoring) will not be available.
225 224
     //#define SKR_USE_ENABLE_CS
226 225
     #if ENABLED(SKR_USE_ENABLE_FOR_CS)
227
-      #define X_CS_PIN      X_ENABLE_PIN
228
-      #define Y_CS_PIN      Y_ENABLE_PIN
229
-      #define Z_CS_PIN      Z_ENABLE_PIN
230
-      #define E0_CS_PIN     E0_ENABLE_PIN
231
-      #define E1_CS_PIN     E1_ENABLE_PIN
226
+      #define X_CS_PIN              X_ENABLE_PIN
227
+      #define Y_CS_PIN              Y_ENABLE_PIN
228
+      #define Z_CS_PIN              Z_ENABLE_PIN
229
+      #define E0_CS_PIN            E0_ENABLE_PIN
230
+      #define E1_CS_PIN            E1_ENABLE_PIN
232 231
     #endif
233 232
 
234 233
   #endif // SOFTWARE_DRIVER_ENABLE

+ 122
- 122
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h Parādīt failu

@@ -32,107 +32,107 @@
32 32
 /**
33 33
  * Trinamic Stallguard pins
34 34
  */
35
-#define X_DIAG_PIN           P1_29   // X-
36
-#define Y_DIAG_PIN           P1_27   // Y-
37
-#define Z_DIAG_PIN           P1_25   // Z-
38
-#define E0_DIAG_PIN          P1_28   // X+
39
-#define E1_DIAG_PIN          P1_26   // Y+
35
+#define X_DIAG_PIN                         P1_29  // X-
36
+#define Y_DIAG_PIN                         P1_27  // Y-
37
+#define Z_DIAG_PIN                         P1_25  // Z-
38
+#define E0_DIAG_PIN                        P1_28  // X+
39
+#define E1_DIAG_PIN                        P1_26  // Y+
40 40
 
41 41
 /**
42 42
  * Limit Switches
43 43
  */
44 44
 #if X_STALL_SENSITIVITY
45
-  #define X_STOP_PIN         X_DIAG_PIN
45
+  #define X_STOP_PIN                  X_DIAG_PIN
46 46
   #if X_HOME_DIR < 0
47
-    #define X_MAX_PIN        P1_28   // X+
47
+    #define X_MAX_PIN                      P1_28  // X+
48 48
   #else
49
-    #define X_MIN_PIN        P1_28   // X+
49
+    #define X_MIN_PIN                      P1_28  // X+
50 50
   #endif
51 51
 #else
52
-  #define X_MIN_PIN          P1_29   // X-
53
-  #define X_MAX_PIN          P1_28   // X+
52
+  #define X_MIN_PIN                        P1_29  // X-
53
+  #define X_MAX_PIN                        P1_28  // X+
54 54
 #endif
55 55
 
56 56
 #if Y_STALL_SENSITIVITY
57
-  #define Y_STOP_PIN         Y_DIAG_PIN
57
+  #define Y_STOP_PIN                  Y_DIAG_PIN
58 58
   #if Y_HOME_DIR < 0
59
-    #define Y_MAX_PIN        P1_26   // Y+
59
+    #define Y_MAX_PIN                      P1_26  // Y+
60 60
   #else
61
-    #define Y_MIN_PIN        P1_26   // Y+
61
+    #define Y_MIN_PIN                      P1_26  // Y+
62 62
   #endif
63 63
 #else
64
-  #define Y_MIN_PIN          P1_27   // Y-
65
-  #define Y_MAX_PIN          P1_26   // Y+
64
+  #define Y_MIN_PIN                        P1_27  // Y-
65
+  #define Y_MAX_PIN                        P1_26  // Y+
66 66
 #endif
67 67
 
68 68
 #if Z_STALL_SENSITIVITY
69
-  #define Z_STOP_PIN         Z_DIAG_PIN
69
+  #define Z_STOP_PIN                  Z_DIAG_PIN
70 70
   #if Z_HOME_DIR < 0
71
-    #define Z_MAX_PIN        P1_24   // Z+
71
+    #define Z_MAX_PIN                      P1_24  // Z+
72 72
   #else
73
-    #define Z_MIN_PIN        P1_24   // Z+
73
+    #define Z_MIN_PIN                      P1_24  // Z+
74 74
   #endif
75 75
 #else
76
-  #define Z_MIN_PIN          P1_25   // Z-
77
-  #define Z_MAX_PIN          P1_24   // Z+
76
+  #define Z_MIN_PIN                        P1_25  // Z-
77
+  #define Z_MAX_PIN                        P1_24  // Z+
78 78
 #endif
79 79
 
80
-#define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups
80
+#define ONBOARD_ENDSTOPPULLUPS                    // Board has built-in pullups
81 81
 
82 82
 //
83 83
 // Servos
84 84
 //
85 85
 #ifndef SERVO0_PIN
86
-  #define SERVO0_PIN       P2_00
86
+  #define SERVO0_PIN                       P2_00
87 87
 #endif
88 88
 
89 89
 //
90 90
 // Z Probe (when not Z_MIN_PIN)
91 91
 //
92 92
 #ifndef Z_MIN_PROBE_PIN
93
-  #define Z_MIN_PROBE_PIN  P1_24
93
+  #define Z_MIN_PROBE_PIN                  P1_24
94 94
 #endif
95 95
 
96 96
 //
97 97
 // Filament Runout Sensor
98 98
 //
99 99
 #ifndef FIL_RUNOUT_PIN
100
-  #define FIL_RUNOUT_PIN   P1_28
100
+  #define FIL_RUNOUT_PIN                   P1_28
101 101
 #endif
102 102
 
103 103
 //
104 104
 // Steppers
105 105
 //
106
-#define X_STEP_PIN         P2_02
107
-#define X_DIR_PIN          P2_06
108
-#define X_ENABLE_PIN       P2_01
106
+#define X_STEP_PIN                         P2_02
107
+#define X_DIR_PIN                          P2_06
108
+#define X_ENABLE_PIN                       P2_01
109 109
 #ifndef X_CS_PIN
110
-  #define X_CS_PIN         P1_17
110
+  #define X_CS_PIN                         P1_17
111 111
 #endif
112 112
 
113
-#define Y_STEP_PIN         P0_19
114
-#define Y_DIR_PIN          P0_20
115
-#define Y_ENABLE_PIN       P2_08
113
+#define Y_STEP_PIN                         P0_19
114
+#define Y_DIR_PIN                          P0_20
115
+#define Y_ENABLE_PIN                       P2_08
116 116
 #ifndef Y_CS_PIN
117
-  #define Y_CS_PIN         P1_15
117
+  #define Y_CS_PIN                         P1_15
118 118
 #endif
119 119
 
120
-#define Z_STEP_PIN         P0_22
121
-#define Z_DIR_PIN          P2_11
122
-#define Z_ENABLE_PIN       P0_21
120
+#define Z_STEP_PIN                         P0_22
121
+#define Z_DIR_PIN                          P2_11
122
+#define Z_ENABLE_PIN                       P0_21
123 123
 #ifndef Z_CS_PIN
124
-  #define Z_CS_PIN         P1_10
124
+  #define Z_CS_PIN                         P1_10
125 125
 #endif
126 126
 
127
-#define E0_STEP_PIN        P2_13
128
-#define E0_DIR_PIN         P0_11
129
-#define E0_ENABLE_PIN      P2_12
127
+#define E0_STEP_PIN                        P2_13
128
+#define E0_DIR_PIN                         P0_11
129
+#define E0_ENABLE_PIN                      P2_12
130 130
 #ifndef E0_CS_PIN
131
-  #define E0_CS_PIN        P1_08
131
+  #define E0_CS_PIN                        P1_08
132 132
 #endif
133 133
 
134 134
 #ifndef E1_CS_PIN
135
-  #define E1_CS_PIN        P1_01
135
+  #define E1_CS_PIN                        P1_01
136 136
 #endif
137 137
 
138 138
 //
@@ -140,13 +140,13 @@
140 140
 //
141 141
 #if ENABLED(TMC_USE_SW_SPI)
142 142
   #ifndef TMC_SW_MOSI
143
-    #define TMC_SW_MOSI    P4_28
143
+    #define TMC_SW_MOSI                    P4_28
144 144
   #endif
145 145
   #ifndef TMC_SW_MISO
146
-    #define TMC_SW_MISO    P0_05
146
+    #define TMC_SW_MISO                    P0_05
147 147
   #endif
148 148
   #ifndef TMC_SW_SCK
149
-    #define TMC_SW_SCK     P0_04
149
+    #define TMC_SW_SCK                     P0_04
150 150
   #endif
151 151
 #endif
152 152
 
@@ -172,20 +172,20 @@
172 172
   //
173 173
   // Software serial
174 174
   //
175
-  #define X_SERIAL_TX_PIN  P4_29
176
-  #define X_SERIAL_RX_PIN  P1_17
175
+  #define X_SERIAL_TX_PIN                  P4_29
176
+  #define X_SERIAL_RX_PIN                  P1_17
177 177
 
178
-  #define Y_SERIAL_TX_PIN  P1_16
179
-  #define Y_SERIAL_RX_PIN  P1_15
178
+  #define Y_SERIAL_TX_PIN                  P1_16
179
+  #define Y_SERIAL_RX_PIN                  P1_15
180 180
 
181
-  #define Z_SERIAL_TX_PIN  P1_14
182
-  #define Z_SERIAL_RX_PIN  P1_10
181
+  #define Z_SERIAL_TX_PIN                  P1_14
182
+  #define Z_SERIAL_RX_PIN                  P1_10
183 183
 
184
-  #define E0_SERIAL_TX_PIN P1_09
185
-  #define E0_SERIAL_RX_PIN P1_08
184
+  #define E0_SERIAL_TX_PIN                 P1_09
185
+  #define E0_SERIAL_RX_PIN                 P1_08
186 186
 
187
-  #define E1_SERIAL_TX_PIN P1_04
188
-  #define E1_SERIAL_RX_PIN P1_01
187
+  #define E1_SERIAL_TX_PIN                 P1_04
188
+  #define E1_SERIAL_RX_PIN                 P1_01
189 189
 
190 190
   // Reduce baud rate to improve software serial reliability
191 191
   #define TMC_BAUD_RATE 19200
@@ -202,23 +202,23 @@
202 202
  *               EXP2                                               EXP1
203 203
  */
204 204
 
205
-#define EXPA1_03_PIN        P1_23
206
-#define EXPA1_04_PIN        P1_22
207
-#define EXPA1_05_PIN        P1_21
208
-#define EXPA1_06_PIN        P1_20
209
-#define EXPA1_07_PIN        P1_19
210
-#define EXPA1_08_PIN        P1_18
211
-#define EXPA1_09_PIN        P0_28
212
-#define EXPA1_10_PIN        P1_30
213
-
214
-#define EXPA2_03_PIN        -1
215
-#define EXPA2_04_PIN        P1_31
216
-#define EXPA2_05_PIN        P0_18
217
-#define EXPA2_06_PIN        P3_25
218
-#define EXPA2_07_PIN        P0_16
219
-#define EXPA2_08_PIN        P3_26
220
-#define EXPA2_09_PIN        P0_15
221
-#define EXPA2_10_PIN        P0_17
205
+#define EXPA1_03_PIN                       P1_23
206
+#define EXPA1_04_PIN                       P1_22
207
+#define EXPA1_05_PIN                       P1_21
208
+#define EXPA1_06_PIN                       P1_20
209
+#define EXPA1_07_PIN                       P1_19
210
+#define EXPA1_08_PIN                       P1_18
211
+#define EXPA1_09_PIN                       P0_28
212
+#define EXPA1_10_PIN                       P1_30
213
+
214
+#define EXPA2_03_PIN                       -1
215
+#define EXPA2_04_PIN                       P1_31
216
+#define EXPA2_05_PIN                       P0_18
217
+#define EXPA2_06_PIN                       P3_25
218
+#define EXPA2_07_PIN                       P0_16
219
+#define EXPA2_08_PIN                       P3_26
220
+#define EXPA2_09_PIN                       P0_15
221
+#define EXPA2_10_PIN                       P0_17
222 222
 
223 223
 #if HAS_SPI_LCD
224 224
 
@@ -247,75 +247,75 @@
247 247
     *                   LCD                             LCD
248 248
     */
249 249
 
250
-    #define LCD_PINS_RS    EXPA1_03_PIN
250
+    #define LCD_PINS_RS             EXPA1_03_PIN
251 251
 
252
-    #define BTN_EN1        EXPA1_06_PIN
253
-    #define BTN_EN2        EXPA1_04_PIN
254
-    #define BTN_ENC        EXPA1_08_PIN
252
+    #define BTN_EN1                 EXPA1_06_PIN
253
+    #define BTN_EN2                 EXPA1_04_PIN
254
+    #define BTN_ENC                 EXPA1_08_PIN
255 255
 
256
-    #define LCD_PINS_ENABLE EXPA1_05_PIN
257
-    #define LCD_PINS_D4    EXPA1_07_PIN
256
+    #define LCD_PINS_ENABLE         EXPA1_05_PIN
257
+    #define LCD_PINS_D4             EXPA1_07_PIN
258 258
 
259 259
   #elif ENABLED(CR10_STOCKDISPLAY)
260 260
 
261
-    #define LCD_PINS_RS    EXPA1_04_PIN
261
+    #define LCD_PINS_RS             EXPA1_04_PIN
262 262
 
263
-    #define BTN_EN1        EXPA1_08_PIN
264
-    #define BTN_EN2        EXPA1_06_PIN
265
-    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
263
+    #define BTN_EN1                 EXPA1_08_PIN
264
+    #define BTN_EN2                 EXPA1_06_PIN
265
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
266 266
 
267
-    #define LCD_PINS_ENABLE EXPA1_03_PIN
268
-    #define LCD_PINS_D4    EXPA1_05_PIN
267
+    #define LCD_PINS_ENABLE         EXPA1_03_PIN
268
+    #define LCD_PINS_D4             EXPA1_05_PIN
269 269
 
270
-  #else // !CR10_STOCKDISPLAY
270
+  #else                                           // !CR10_STOCKDISPLAY
271 271
 
272
-    #define LCD_PINS_RS    EXPA1_07_PIN
272
+    #define LCD_PINS_RS             EXPA1_07_PIN
273 273
 
274
-    #define BTN_EN1        EXPA2_08_PIN   // (31) J3-2 & AUX-4
275
-    #define BTN_EN2        EXPA2_06_PIN   // (33) J3-4 & AUX-4
276
-    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
274
+    #define BTN_EN1                 EXPA2_08_PIN  // (31) J3-2 & AUX-4
275
+    #define BTN_EN2                 EXPA2_06_PIN  // (33) J3-4 & AUX-4
276
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
277 277
 
278
-    #define LCD_PINS_ENABLE EXPA1_08_PIN
279
-    #define LCD_PINS_D4    EXPA1_06_PIN
278
+    #define LCD_PINS_ENABLE         EXPA1_08_PIN
279
+    #define LCD_PINS_D4             EXPA1_06_PIN
280 280
 
281
-    #define LCD_SDSS       EXPA2_07_PIN   // (16) J3-7 & AUX-4
282
-    #define SD_DETECT_PIN  EXPA2_04_PIN   // (49) (NOT 5V tolerant)
281
+    #define LCD_SDSS                EXPA2_07_PIN  // (16) J3-7 & AUX-4
282
+    #define SD_DETECT_PIN           EXPA2_04_PIN  // (49) (NOT 5V tolerant)
283 283
 
284 284
     #if ENABLED(FYSETC_MINI_12864)
285
-      #define DOGLCD_CS    EXPA1_08_PIN
286
-      #define DOGLCD_A0    EXPA1_07_PIN
287
-      #define DOGLCD_SCK   EXPA2_09_PIN
288
-      #define DOGLCD_MOSI  EXPA2_05_PIN
285
+      #define DOGLCD_CS             EXPA1_08_PIN
286
+      #define DOGLCD_A0             EXPA1_07_PIN
287
+      #define DOGLCD_SCK            EXPA2_09_PIN
288
+      #define DOGLCD_MOSI           EXPA2_05_PIN
289 289
 
290
-      #define LCD_BACKLIGHT_PIN -1
290
+      #define LCD_BACKLIGHT_PIN            -1
291 291
 
292
-      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
293
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
292
+      #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
293
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
294 294
 
295
-      #define LCD_RESET_PIN EXPA1_06_PIN   // Must be high or open for LCD to operate normally.
295
+      #define LCD_RESET_PIN         EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
296 296
 
297 297
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
298 298
         #ifndef RGB_LED_R_PIN
299
-          #define RGB_LED_R_PIN EXPA1_05_PIN
299
+          #define RGB_LED_R_PIN     EXPA1_05_PIN
300 300
         #endif
301 301
         #ifndef RGB_LED_G_PIN
302
-          #define RGB_LED_G_PIN EXPA1_04_PIN
302
+          #define RGB_LED_G_PIN     EXPA1_04_PIN
303 303
         #endif
304 304
         #ifndef RGB_LED_B_PIN
305
-          #define RGB_LED_B_PIN EXPA1_03_PIN
305
+          #define RGB_LED_B_PIN     EXPA1_03_PIN
306 306
         #endif
307 307
       #elif ENABLED(FYSETC_MINI_12864_2_1)
308
-        #define NEOPIXEL_PIN    EXPA1_05_PIN
308
+        #define NEOPIXEL_PIN        EXPA1_05_PIN
309 309
       #endif
310 310
 
311
-    #else // !FYSETC_MINI_12864
311
+    #else                                         // !FYSETC_MINI_12864
312 312
 
313 313
       #if ENABLED(MKS_MINI_12864)
314 314
 
315
-        #define DOGLCD_CS    EXPA1_05_PIN
316
-        #define DOGLCD_A0    EXPA1_04_PIN
317
-        #define DOGLCD_SCK   EXPA2_09_PIN
318
-        #define DOGLCD_MOSI  EXPA2_05_PIN
315
+        #define DOGLCD_CS           EXPA1_05_PIN
316
+        #define DOGLCD_A0           EXPA1_04_PIN
317
+        #define DOGLCD_SCK          EXPA2_09_PIN
318
+        #define DOGLCD_MOSI         EXPA2_05_PIN
319 319
 
320 320
       #elif ENABLED(ENDER2_STOCKDISPLAY)
321 321
 
@@ -331,21 +331,21 @@
331 331
          *                    EXP1
332 332
          */
333 333
 
334
-        #define BTN_EN1      EXPA1_08_PIN
335
-        #define BTN_EN2      EXPA1_06_PIN
336
-        #define BTN_ENC      EXPA1_09_PIN
337
-        #define DOGLCD_CS    EXPA1_04_PIN
338
-        #define DOGLCD_A0    EXPA1_05_PIN
339
-        #define DOGLCD_SCK   EXPA1_10_PIN
340
-        #define DOGLCD_MOSI  EXPA1_03_PIN
334
+        #define BTN_EN1             EXPA1_08_PIN
335
+        #define BTN_EN2             EXPA1_06_PIN
336
+        #define BTN_ENC             EXPA1_09_PIN
337
+        #define DOGLCD_CS           EXPA1_04_PIN
338
+        #define DOGLCD_A0           EXPA1_05_PIN
339
+        #define DOGLCD_SCK          EXPA1_10_PIN
340
+        #define DOGLCD_MOSI         EXPA1_03_PIN
341 341
         #define FORCE_SOFT_SPI
342
-        #define LCD_BACKLIGHT_PIN -1
342
+        #define LCD_BACKLIGHT_PIN          -1
343 343
       #endif
344 344
 
345 345
       #if ENABLED(ULTIPANEL)
346
-        #define LCD_PINS_D5 EXPA1_05_PIN
347
-        #define LCD_PINS_D6 EXPA1_04_PIN
348
-        #define LCD_PINS_D7 EXPA1_03_PIN
346
+        #define LCD_PINS_D5         EXPA1_05_PIN
347
+        #define LCD_PINS_D6         EXPA1_04_PIN
348
+        #define LCD_PINS_D7         EXPA1_03_PIN
349 349
       #endif
350 350
 
351 351
     #endif // !FYSETC_MINI_12864
@@ -359,11 +359,11 @@
359 359
 //
360 360
 
361 361
 #ifndef SDCARD_CONNECTION
362
-  #define SDCARD_CONNECTION LCD
362
+  #define SDCARD_CONNECTION                  LCD
363 363
 #endif
364 364
 
365 365
 #if SD_CONNECTION_IS(LCD)
366
-  #define SS_PIN           EXPA2_07_PIN
366
+  #define SS_PIN                    EXPA2_07_PIN
367 367
 #endif
368 368
 
369 369
 /**

+ 103
- 103
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h Parādīt failu

@@ -37,58 +37,58 @@
37 37
 // SD Connection
38 38
 //
39 39
 #ifndef SDCARD_CONNECTION
40
-  #define SDCARD_CONNECTION LCD
40
+  #define SDCARD_CONNECTION                  LCD
41 41
 #endif
42 42
 
43 43
 //
44 44
 // Servos
45 45
 //
46
-#define SERVO0_PIN         P2_00
46
+#define SERVO0_PIN                         P2_00
47 47
 
48 48
 //
49 49
 // TMC StallGuard DIAG pins
50 50
 //
51
-#define X_DIAG_PIN         P1_29   // X-STOP
52
-#define Y_DIAG_PIN         P1_28   // Y-STOP
53
-#define Z_DIAG_PIN         P1_27   // Z-STOP
54
-#define E0_DIAG_PIN        P1_26   // E0DET
55
-#define E1_DIAG_PIN        P1_25   // E1DET
51
+#define X_DIAG_PIN                         P1_29  // X-STOP
52
+#define Y_DIAG_PIN                         P1_28  // Y-STOP
53
+#define Z_DIAG_PIN                         P1_27  // Z-STOP
54
+#define E0_DIAG_PIN                        P1_26  // E0DET
55
+#define E1_DIAG_PIN                        P1_25  // E1DET
56 56
 
57 57
 //
58 58
 // Limit Switches
59 59
 //
60 60
 #if X_STALL_SENSITIVITY
61
-  #define X_STOP_PIN       X_DIAG_PIN
61
+  #define X_STOP_PIN                  X_DIAG_PIN
62 62
   #if X_HOME_DIR < 0
63
-    #define X_MAX_PIN      P1_26   // E0DET
63
+    #define X_MAX_PIN                      P1_26  // E0DET
64 64
   #else
65
-    #define X_MIN_PIN      P1_26   // E0DET
65
+    #define X_MIN_PIN                      P1_26  // E0DET
66 66
   #endif
67 67
 #else
68
-  #define X_STOP_PIN       P1_29   // X-STOP
68
+  #define X_STOP_PIN                       P1_29  // X-STOP
69 69
 #endif
70 70
 
71 71
 #if Y_STALL_SENSITIVITY
72
-  #define Y_STOP_PIN       Y_DIAG_PIN
72
+  #define Y_STOP_PIN                  Y_DIAG_PIN
73 73
   #if Y_HOME_DIR < 0
74
-    #define Y_MAX_PIN      P1_25   // E1DET
74
+    #define Y_MAX_PIN                      P1_25  // E1DET
75 75
   #else
76
-    #define Y_MIN_PIN      P1_25   // E1DET
76
+    #define Y_MIN_PIN                      P1_25  // E1DET
77 77
   #endif
78 78
 #else
79
-  #define Y_STOP_PIN       P1_28   // Y-STOP
79
+  #define Y_STOP_PIN                       P1_28  // Y-STOP
80 80
 #endif
81 81
 
82 82
 #if Z_STALL_SENSITIVITY
83
-  #define Z_STOP_PIN       Z_DIAG_PIN
83
+  #define Z_STOP_PIN                  Z_DIAG_PIN
84 84
   #if Z_HOME_DIR < 0
85
-    #define Z_MAX_PIN      P1_00   // PWRDET
85
+    #define Z_MAX_PIN                      P1_00  // PWRDET
86 86
   #else
87
-    #define Z_MIN_PIN      P1_00   // PWRDET
87
+    #define Z_MIN_PIN                      P1_00  // PWRDET
88 88
   #endif
89 89
 #else
90 90
   #ifndef Z_STOP_PIN
91
-    #define Z_STOP_PIN     P1_27   // Z-STOP
91
+    #define Z_STOP_PIN                     P1_27  // Z-STOP
92 92
   #endif
93 93
 #endif
94 94
 
@@ -96,82 +96,82 @@
96 96
 // Z Probe (when not Z_MIN_PIN)
97 97
 //
98 98
 #ifndef Z_MIN_PROBE_PIN
99
-  #define Z_MIN_PROBE_PIN  P0_10
99
+  #define Z_MIN_PROBE_PIN                  P0_10
100 100
 #endif
101 101
 
102 102
 //
103 103
 // Filament Runout Sensor
104 104
 //
105
-#define FIL_RUNOUT_PIN     P1_26   // E0DET
106
-#define FIL_RUNOUT2_PIN    P1_25   // E1DET
105
+#define FIL_RUNOUT_PIN                     P1_26  // E0DET
106
+#define FIL_RUNOUT2_PIN                    P1_25  // E1DET
107 107
 
108 108
 //
109 109
 // Power Supply Control
110 110
 //
111 111
 #ifndef PS_ON_PIN
112
-  #define PS_ON_PIN        P1_00   // PWRDET
112
+  #define PS_ON_PIN                        P1_00  // PWRDET
113 113
 #endif
114 114
 
115 115
 //
116 116
 // Power Loss Detection
117 117
 //
118 118
 #ifndef POWER_LOSS_PIN
119
-  #define POWER_LOSS_PIN   P1_00   // PWRDET
119
+  #define POWER_LOSS_PIN                   P1_00  // PWRDET
120 120
 #endif
121 121
 
122 122
 //
123 123
 // Steppers
124 124
 //
125
-#define X_STEP_PIN         P2_02
126
-#define X_DIR_PIN          P2_06
127
-#define X_ENABLE_PIN       P2_01
125
+#define X_STEP_PIN                         P2_02
126
+#define X_DIR_PIN                          P2_06
127
+#define X_ENABLE_PIN                       P2_01
128 128
 #ifndef X_CS_PIN
129
-  #define X_CS_PIN         P1_10
129
+  #define X_CS_PIN                         P1_10
130 130
 #endif
131 131
 
132
-#define Y_STEP_PIN         P0_19
133
-#define Y_DIR_PIN          P0_20
134
-#define Y_ENABLE_PIN       P2_08
132
+#define Y_STEP_PIN                         P0_19
133
+#define Y_DIR_PIN                          P0_20
134
+#define Y_ENABLE_PIN                       P2_08
135 135
 #ifndef Y_CS_PIN
136
-  #define Y_CS_PIN         P1_09
136
+  #define Y_CS_PIN                         P1_09
137 137
 #endif
138 138
 
139
-#define Z_STEP_PIN         P0_22
140
-#define Z_DIR_PIN          P2_11
141
-#define Z_ENABLE_PIN       P0_21
139
+#define Z_STEP_PIN                         P0_22
140
+#define Z_DIR_PIN                          P2_11
141
+#define Z_ENABLE_PIN                       P0_21
142 142
 #ifndef Z_CS_PIN
143
-  #define Z_CS_PIN         P1_08
143
+  #define Z_CS_PIN                         P1_08
144 144
 #endif
145 145
 
146
-#define E0_STEP_PIN        P2_13
147
-#define E0_DIR_PIN         P0_11
148
-#define E0_ENABLE_PIN      P2_12
146
+#define E0_STEP_PIN                        P2_13
147
+#define E0_DIR_PIN                         P0_11
148
+#define E0_ENABLE_PIN                      P2_12
149 149
 #ifndef E0_CS_PIN
150
-  #define E0_CS_PIN        P1_04
150
+  #define E0_CS_PIN                        P1_04
151 151
 #endif
152 152
 
153
-#define E1_STEP_PIN        P1_15
154
-#define E1_DIR_PIN         P1_14
155
-#define E1_ENABLE_PIN      P1_16
153
+#define E1_STEP_PIN                        P1_15
154
+#define E1_DIR_PIN                         P1_14
155
+#define E1_ENABLE_PIN                      P1_16
156 156
 #ifndef E1_CS_PIN
157
-  #define E1_CS_PIN        P1_01
157
+  #define E1_CS_PIN                        P1_01
158 158
 #endif
159 159
 
160
-#define TEMP_1_PIN         P0_23_A0   // A2 (T2) - (69) - TEMP_1_PIN
161
-#define TEMP_BED_PIN       P0_25_A2   // A0 (T0) - (67) - TEMP_BED_PIN
160
+#define TEMP_1_PIN                      P0_23_A0  // A2 (T2) - (69) - TEMP_1_PIN
161
+#define TEMP_BED_PIN                    P0_25_A2  // A0 (T0) - (67) - TEMP_BED_PIN
162 162
 
163 163
 //
164 164
 // Software SPI pins for TMC2130 stepper drivers
165 165
 //
166 166
 #if ENABLED(TMC_USE_SW_SPI)
167 167
   #ifndef TMC_SW_MOSI
168
-    #define TMC_SW_MOSI    P1_17
168
+    #define TMC_SW_MOSI                    P1_17
169 169
   #endif
170 170
   #ifndef TMC_SW_MISO
171
-    #define TMC_SW_MISO    P0_05
171
+    #define TMC_SW_MISO                    P0_05
172 172
   #endif
173 173
   #ifndef TMC_SW_SCK
174
-    #define TMC_SW_SCK     P0_04
174
+    #define TMC_SW_SCK                     P0_04
175 175
   #endif
176 176
 #endif
177 177
 
@@ -197,23 +197,23 @@
197 197
   //
198 198
   // Software serial
199 199
   //
200
-  #define X_SERIAL_TX_PIN  P1_10
201
-  #define X_SERIAL_RX_PIN  P1_10
200
+  #define X_SERIAL_TX_PIN                  P1_10
201
+  #define X_SERIAL_RX_PIN                  P1_10
202 202
 
203
-  #define Y_SERIAL_TX_PIN  P1_09
204
-  #define Y_SERIAL_RX_PIN  P1_09
203
+  #define Y_SERIAL_TX_PIN                  P1_09
204
+  #define Y_SERIAL_RX_PIN                  P1_09
205 205
 
206
-  #define Z_SERIAL_TX_PIN  P1_08
207
-  #define Z_SERIAL_RX_PIN  P1_08
206
+  #define Z_SERIAL_TX_PIN                  P1_08
207
+  #define Z_SERIAL_RX_PIN                  P1_08
208 208
 
209
-  #define E0_SERIAL_TX_PIN P1_04
210
-  #define E0_SERIAL_RX_PIN P1_04
209
+  #define E0_SERIAL_TX_PIN                 P1_04
210
+  #define E0_SERIAL_RX_PIN                 P1_04
211 211
 
212
-  #define E1_SERIAL_TX_PIN P1_01
213
-  #define E1_SERIAL_RX_PIN P1_01
212
+  #define E1_SERIAL_TX_PIN                 P1_01
213
+  #define E1_SERIAL_RX_PIN                 P1_01
214 214
 
215
-  #define Z2_SERIAL_TX_PIN P1_01
216
-  #define Z2_SERIAL_RX_PIN P1_01
215
+  #define Z2_SERIAL_TX_PIN                 P1_01
216
+  #define Z2_SERIAL_RX_PIN                 P1_01
217 217
 
218 218
   // Reduce baud rate to improve software serial reliability
219 219
   #define TMC_BAUD_RATE 19200
@@ -223,7 +223,7 @@
223 223
 // SD Connection
224 224
 //
225 225
 #if SD_CONNECTION_IS(LCD)
226
-  #define SS_PIN           P0_16
226
+  #define SS_PIN                           P0_16
227 227
 #endif
228 228
 
229 229
 /**
@@ -239,82 +239,82 @@
239 239
 #if HAS_SPI_LCD
240 240
   #if ENABLED(ANET_FULL_GRAPHICS_LCD)
241 241
 
242
-    #define LCD_PINS_RS    P1_23
242
+    #define LCD_PINS_RS                    P1_23
243 243
 
244
-    #define BTN_EN1        P1_20
245
-    #define BTN_EN2        P1_22
246
-    #define BTN_ENC        P1_18
244
+    #define BTN_EN1                        P1_20
245
+    #define BTN_EN2                        P1_22
246
+    #define BTN_ENC                        P1_18
247 247
 
248
-    #define LCD_PINS_ENABLE P1_21
249
-    #define LCD_PINS_D4    P1_19
248
+    #define LCD_PINS_ENABLE                P1_21
249
+    #define LCD_PINS_D4                    P1_19
250 250
 
251 251
   #elif ENABLED(CR10_STOCKDISPLAY)
252
-    #define BTN_ENC        P0_28   // (58) open-drain
253
-    #define LCD_PINS_RS    P1_22
252
+    #define BTN_ENC                        P0_28  // (58) open-drain
253
+    #define LCD_PINS_RS                    P1_22
254 254
 
255
-    #define BTN_EN1        P1_18
256
-    #define BTN_EN2        P1_20
255
+    #define BTN_EN1                        P1_18
256
+    #define BTN_EN2                        P1_20
257 257
 
258
-    #define LCD_PINS_ENABLE P1_23
259
-    #define LCD_PINS_D4    P1_21
258
+    #define LCD_PINS_ENABLE                P1_23
259
+    #define LCD_PINS_D4                    P1_21
260 260
 
261 261
   #else
262
-    #define BTN_ENC        P0_28   // (58) open-drain
263
-    #define LCD_PINS_RS    P1_19
262
+    #define BTN_ENC                        P0_28  // (58) open-drain
263
+    #define LCD_PINS_RS                    P1_19
264 264
 
265
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
266
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
265
+    #define BTN_EN1                        P3_26  // (31) J3-2 & AUX-4
266
+    #define BTN_EN2                        P3_25  // (33) J3-4 & AUX-4
267 267
 
268
-    #define LCD_PINS_ENABLE P1_18
269
-    #define LCD_PINS_D4    P1_20
268
+    #define LCD_PINS_ENABLE                P1_18
269
+    #define LCD_PINS_D4                    P1_20
270 270
 
271
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
271
+    #define LCD_SDSS                       P0_16  // (16) J3-7 & AUX-4
272 272
 
273 273
     #if SD_CONNECTION_IS(LCD)
274
-      #define SD_DETECT_PIN P1_31  // (49) (NOT 5V tolerant)
274
+      #define SD_DETECT_PIN                P1_31  // (49) (NOT 5V tolerant)
275 275
     #endif
276 276
 
277 277
     #if ENABLED(FYSETC_MINI_12864)
278
-      #define DOGLCD_CS    P1_18
279
-      #define DOGLCD_A0    P1_19
280
-      #define DOGLCD_SCK   P0_15
281
-      #define DOGLCD_MOSI  P0_18
278
+      #define DOGLCD_CS                    P1_18
279
+      #define DOGLCD_A0                    P1_19
280
+      #define DOGLCD_SCK                   P0_15
281
+      #define DOGLCD_MOSI                  P0_18
282 282
 
283
-      #define LCD_BACKLIGHT_PIN -1
283
+      #define LCD_BACKLIGHT_PIN            -1
284 284
 
285
-      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
286
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
285
+      #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
286
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
287 287
 
288
-      #define LCD_RESET_PIN P1_20   // Must be high or open for LCD to operate normally.
288
+      #define LCD_RESET_PIN                P1_20  // Must be high or open for LCD to operate normally.
289 289
 
290 290
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
291 291
         #ifndef RGB_LED_R_PIN
292
-          #define RGB_LED_R_PIN P1_21
292
+          #define RGB_LED_R_PIN            P1_21
293 293
         #endif
294 294
         #ifndef RGB_LED_G_PIN
295
-          #define RGB_LED_G_PIN P1_22
295
+          #define RGB_LED_G_PIN            P1_22
296 296
         #endif
297 297
         #ifndef RGB_LED_B_PIN
298
-          #define RGB_LED_B_PIN P1_23
298
+          #define RGB_LED_B_PIN            P1_23
299 299
         #endif
300 300
       #elif ENABLED(FYSETC_MINI_12864_2_1)
301
-        #define NEOPIXEL_PIN    P1_21
301
+        #define NEOPIXEL_PIN               P1_21
302 302
       #endif
303 303
 
304
-    #else // !FYSETC_MINI_12864
304
+    #else                                         // !FYSETC_MINI_12864
305 305
 
306 306
       #if ENABLED(MKS_MINI_12864)
307
-        #define DOGLCD_CS   P1_21
308
-        #define DOGLCD_A0   P1_22
309
-        #define DOGLCD_SCK  P0_15
310
-        #define DOGLCD_MOSI P0_18
307
+        #define DOGLCD_CS                  P1_21
308
+        #define DOGLCD_A0                  P1_22
309
+        #define DOGLCD_SCK                 P0_15
310
+        #define DOGLCD_MOSI                P0_18
311 311
         #define FORCE_SOFT_SPI
312 312
       #endif
313 313
 
314 314
       #if ENABLED(ULTIPANEL)
315
-        #define LCD_PINS_D5 P1_21
316
-        #define LCD_PINS_D6 P1_22
317
-        #define LCD_PINS_D7 P1_23
315
+        #define LCD_PINS_D5                P1_21
316
+        #define LCD_PINS_D6                P1_22
317
+        #define LCD_PINS_D7                P1_23
318 318
       #endif
319 319
 
320 320
     #endif // !FYSETC_MINI_12864
@@ -327,7 +327,7 @@
327 327
 // Neopixel LED
328 328
 //
329 329
 #ifndef NEOPIXEL_PIN
330
-  #define NEOPIXEL_PIN      P1_24
330
+  #define NEOPIXEL_PIN                     P1_24
331 331
 #endif
332 332
 
333 333
 /**

+ 22
- 22
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h Parādīt failu

@@ -40,13 +40,13 @@
40 40
 // Steppers
41 41
 //
42 42
 #ifndef E1_STEP_PIN
43
-  #define E1_STEP_PIN      P0_01
43
+  #define E1_STEP_PIN                      P0_01
44 44
 #endif
45 45
 #ifndef E1_DIR_PIN
46
-  #define E1_DIR_PIN       P0_00
46
+  #define E1_DIR_PIN                       P0_00
47 47
 #endif
48 48
 #ifndef E1_ENABLE_PIN
49
-  #define E1_ENABLE_PIN    P0_10
49
+  #define E1_ENABLE_PIN                    P0_10
50 50
 #endif
51 51
 
52 52
 //
@@ -54,64 +54,64 @@
54 54
 //  3.3V max when defined as an analog input
55 55
 //
56 56
 #ifndef TEMP_0_PIN
57
-  #define TEMP_0_PIN       P0_24_A1   // A1 (T1) - (68) - TEMP_0_PIN
57
+  #define TEMP_0_PIN                    P0_24_A1  // A1 (T1) - (68) - TEMP_0_PIN
58 58
 #endif
59 59
 #ifndef TEMP_1_PIN
60
-  #define TEMP_1_PIN       P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
60
+  #define TEMP_1_PIN                    P0_25_A2  // A2 (T2) - (69) - TEMP_1_PIN
61 61
 #endif
62 62
 #ifndef TEMP_BED_PIN
63
-  #define TEMP_BED_PIN     P0_23_A0   // A0 (T0) - (67) - TEMP_BED_PIN
63
+  #define TEMP_BED_PIN                  P0_23_A0  // A0 (T0) - (67) - TEMP_BED_PIN
64 64
 #endif
65 65
 
66 66
 #if HOTENDS == 1 && TEMP_SENSOR_PROBE
67
-  #define TEMP_PROBE_PIN   TEMP_1_PIN
67
+  #define TEMP_PROBE_PIN              TEMP_1_PIN
68 68
 #endif
69 69
 
70 70
 //
71 71
 // Heaters / Fans
72 72
 //
73 73
 #ifndef HEATER_0_PIN
74
-  #define HEATER_0_PIN     P2_07
74
+  #define HEATER_0_PIN                     P2_07
75 75
 #endif
76 76
 #if HOTENDS == 1
77 77
   #ifndef FAN1_PIN
78
-    #define FAN1_PIN       P2_04
78
+    #define FAN1_PIN                       P2_04
79 79
   #endif
80 80
 #else
81 81
   #ifndef HEATER_1_PIN
82
-    #define HEATER_1_PIN   P2_04
82
+    #define HEATER_1_PIN                   P2_04
83 83
   #endif
84 84
 #endif
85 85
 #ifndef FAN_PIN
86
-  #define FAN_PIN          P2_03
86
+  #define FAN_PIN                          P2_03
87 87
 #endif
88 88
 #ifndef HEATER_BED_PIN
89
-  #define HEATER_BED_PIN   P2_05
89
+  #define HEATER_BED_PIN                   P2_05
90 90
 #endif
91 91
 
92 92
 //
93 93
 // LCD / Controller
94 94
 //
95 95
 #if HAS_SPI_LCD
96
-  #define BEEPER_PIN       P1_30   // (37) not 5V tolerant
96
+  #define BEEPER_PIN                       P1_30  // (37) not 5V tolerant
97 97
 #endif
98 98
 
99 99
 //
100 100
 // SD Support
101 101
 //
102
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
102
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
103 103
 
104 104
 #if SD_CONNECTION_IS(LCD)
105
-  #define SCK_PIN          P0_15
106
-  #define MISO_PIN         P0_17
107
-  #define MOSI_PIN         P0_18
105
+  #define SCK_PIN                          P0_15
106
+  #define MISO_PIN                         P0_17
107
+  #define MOSI_PIN                         P0_18
108 108
 #elif SD_CONNECTION_IS(ONBOARD)
109 109
   #undef SD_DETECT_PIN
110
-  #define SD_DETECT_PIN    P0_27
111
-  #define SCK_PIN          P0_07
112
-  #define MISO_PIN         P0_08
113
-  #define MOSI_PIN         P0_09
114
-  #define SS_PIN           ONBOARD_SD_CS_PIN
110
+  #define SD_DETECT_PIN                    P0_27
111
+  #define SCK_PIN                          P0_07
112
+  #define MISO_PIN                         P0_08
113
+  #define MOSI_PIN                         P0_09
114
+  #define SS_PIN               ONBOARD_SD_CS_PIN
115 115
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
116 116
   #error "No custom SD drive cable defined for this board."
117 117
 #endif

+ 66
- 66
Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h Parādīt failu

@@ -44,63 +44,63 @@
44 44
 //
45 45
 // Servos
46 46
 //
47
-#define SERVO0_PIN         P1_26   // PWM1[6]
48
-#define SERVO1_PIN         P1_18   // PWM1[1]
47
+#define SERVO0_PIN                         P1_26  // PWM1[6]
48
+#define SERVO1_PIN                         P1_18  // PWM1[1]
49 49
 
50 50
 //
51 51
 // Limit Switches
52 52
 //
53
-#define X_MIN_PIN          P0_00
54
-#define X_MAX_PIN          P0_01
55
-#define Y_MIN_PIN          P0_10
56
-#define Y_MAX_PIN          P0_21
57
-#define Z_MIN_PIN          P2_13
58
-#define Z_MAX_PIN          P2_22
53
+#define X_MIN_PIN                          P0_00
54
+#define X_MAX_PIN                          P0_01
55
+#define Y_MIN_PIN                          P0_10
56
+#define Y_MAX_PIN                          P0_21
57
+#define Z_MIN_PIN                          P2_13
58
+#define Z_MAX_PIN                          P2_22
59 59
 
60 60
 //
61 61
 // Steppers
62 62
 //
63 63
 
64
-#define X_STEP_PIN         P1_01
65
-#define X_DIR_PIN          P1_04
66
-#define X_ENABLE_PIN       P0_26
64
+#define X_STEP_PIN                         P1_01
65
+#define X_DIR_PIN                          P1_04
66
+#define X_ENABLE_PIN                       P0_26
67 67
 
68
-#define Y_STEP_PIN         P1_10
69
-#define Y_DIR_PIN          P1_14
70
-#define Y_ENABLE_PIN       P1_08
68
+#define Y_STEP_PIN                         P1_10
69
+#define Y_DIR_PIN                          P1_14
70
+#define Y_ENABLE_PIN                       P1_08
71 71
 
72
-#define Z_STEP_PIN         P1_17
73
-#define Z_DIR_PIN          P4_29
74
-#define Z_ENABLE_PIN       P1_15
72
+#define Z_STEP_PIN                         P1_17
73
+#define Z_DIR_PIN                          P4_29
74
+#define Z_ENABLE_PIN                       P1_15
75 75
 
76
-#define E0_STEP_PIN        P0_05
77
-#define E0_DIR_PIN         P2_00
78
-#define E0_ENABLE_PIN      P4_28
76
+#define E0_STEP_PIN                        P0_05
77
+#define E0_DIR_PIN                         P2_00
78
+#define E0_ENABLE_PIN                      P4_28
79 79
 
80
-#define E1_STEP_PIN        P2_03
81
-#define E1_DIR_PIN         P2_04
82
-#define E1_ENABLE_PIN      P2_01
80
+#define E1_STEP_PIN                        P2_03
81
+#define E1_DIR_PIN                         P2_04
82
+#define E1_ENABLE_PIN                      P2_01
83 83
 
84
-#define E2_STEP_PIN        P2_07
85
-#define E2_DIR_PIN         P2_08
86
-#define E2_ENABLE_PIN      P2_05
84
+#define E2_STEP_PIN                        P2_07
85
+#define E2_DIR_PIN                         P2_08
86
+#define E2_ENABLE_PIN                      P2_05
87 87
 
88 88
 //
89 89
 // TMC2208 UART pins
90 90
 //
91 91
 #if HAS_TMC_UART
92
-  #define X_SERIAL_TX_PIN  P1_00
93
-  #define X_SERIAL_RX_PIN  P1_00
94
-  #define Y_SERIAL_TX_PIN  P1_09
95
-  #define Y_SERIAL_RX_PIN  P1_09
96
-  #define Z_SERIAL_TX_PIN  P1_16
97
-  #define Z_SERIAL_RX_PIN  P1_16
98
-  #define E0_SERIAL_TX_PIN P0_04
99
-  #define E0_SERIAL_RX_PIN P0_04
100
-  #define E1_SERIAL_TX_PIN P2_02
101
-  #define E1_SERIAL_RX_PIN P2_02
102
-  #define E2_SERIAL_TX_PIN P2_06
103
-  #define E2_SERIAL_RX_PIN P2_06
92
+  #define X_SERIAL_TX_PIN                  P1_00
93
+  #define X_SERIAL_RX_PIN                  P1_00
94
+  #define Y_SERIAL_TX_PIN                  P1_09
95
+  #define Y_SERIAL_RX_PIN                  P1_09
96
+  #define Z_SERIAL_TX_PIN                  P1_16
97
+  #define Z_SERIAL_RX_PIN                  P1_16
98
+  #define E0_SERIAL_TX_PIN                 P0_04
99
+  #define E0_SERIAL_RX_PIN                 P0_04
100
+  #define E1_SERIAL_TX_PIN                 P2_02
101
+  #define E1_SERIAL_RX_PIN                 P2_02
102
+  #define E2_SERIAL_TX_PIN                 P2_06
103
+  #define E2_SERIAL_RX_PIN                 P2_06
104 104
 
105 105
   // Reduce baud rate to improve software serial reliability
106 106
   #define TMC_BAUD_RATE 19200
@@ -112,36 +112,36 @@
112 112
 // Temperature Sensors
113 113
 //  3.3V max when defined as an analog input
114 114
 //
115
-#define TEMP_0_PIN          P0_24_A1   // AD0[0] on P0_23
116
-#define TEMP_BED_PIN        P0_23_A0   // AD0[1] on P0_24
115
+#define TEMP_0_PIN                      P0_24_A1  // AD0[0] on P0_23
116
+#define TEMP_BED_PIN                    P0_23_A0  // AD0[1] on P0_24
117 117
 
118 118
 //
119 119
 // Heaters / Fans
120 120
 //
121
-#define HEATER_BED_PIN     P1_19 // Not a PWM pin, software PWM required
122
-#define HEATER_0_PIN       P3_26 // PWM1[3]
123
-#define FAN_PIN            P3_25 // Part cooling fan - connected to PWM1[2]
124
-#define E0_AUTO_FAN_PIN    P0_27 // Extruder cooling fan
121
+#define HEATER_BED_PIN                     P1_19  // Not a PWM pin, software PWM required
122
+#define HEATER_0_PIN                       P3_26  // PWM1[3]
123
+#define FAN_PIN                            P3_25  // Part cooling fan - connected to PWM1[2]
124
+#define E0_AUTO_FAN_PIN                    P0_27  // Extruder cooling fan
125 125
 
126 126
 //
127 127
 // Misc. Functions
128 128
 //
129
-#define LED_PIN            P1_31
129
+#define LED_PIN                            P1_31
130 130
 
131 131
 //
132 132
 // LCD
133 133
 //
134 134
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
135
-  #define BEEPER_PIN       P0_19
136
-  #define BTN_EN1          P1_23
137
-  #define BTN_EN2          P1_24
138
-  #define BTN_ENC          P1_25
139
-  #define LCD_PINS_RS      P0_20
140
-  #define LCD_PINS_ENABLE  P0_21
141
-  #define LCD_PINS_D4      P2_11
142
-  #define LCD_PINS_D5      P0_22
143
-  #define LCD_PINS_D6      P1_29
144
-  #define LCD_PINS_D7      P1_28
135
+  #define BEEPER_PIN                       P0_19
136
+  #define BTN_EN1                          P1_23
137
+  #define BTN_EN2                          P1_24
138
+  #define BTN_ENC                          P1_25
139
+  #define LCD_PINS_RS                      P0_20
140
+  #define LCD_PINS_ENABLE                  P0_21
141
+  #define LCD_PINS_D4                      P2_11
142
+  #define LCD_PINS_D5                      P0_22
143
+  #define LCD_PINS_D6                      P1_29
144
+  #define LCD_PINS_D7                      P1_28
145 145
 #endif
146 146
 
147 147
 //
@@ -149,21 +149,21 @@
149 149
 //
150 150
 
151 151
 #ifndef SDCARD_CONNECTION
152
-  #define SDCARD_CONNECTION LCD
152
+  #define SDCARD_CONNECTION                  LCD
153 153
 #endif
154 154
 
155
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
155
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
156 156
 
157 157
 #if SD_CONNECTION_IS(LCD)
158
-  #define SCK_PIN          P0_15
159
-  #define MISO_PIN         P0_17
160
-  #define MOSI_PIN         P0_18
161
-  #define SS_PIN           P0_16
158
+  #define SCK_PIN                          P0_15
159
+  #define MISO_PIN                         P0_17
160
+  #define MOSI_PIN                         P0_18
161
+  #define SS_PIN                           P0_16
162 162
 #elif SD_CONNECTION_IS(ONBOARD)
163 163
   #undef SD_DETECT_PIN
164
-  #define SD_DETECT_PIN    P0_27
165
-  #define SCK_PIN          P0_07
166
-  #define MISO_PIN         P0_08
167
-  #define MOSI_PIN         P0_09
168
-  #define SS_PIN           ONBOARD_SD_CS_PIN
164
+  #define SD_DETECT_PIN                    P0_27
165
+  #define SCK_PIN                          P0_07
166
+  #define MISO_PIN                         P0_08
167
+  #define MOSI_PIN                         P0_09
168
+  #define SS_PIN               ONBOARD_SD_CS_PIN
169 169
 #endif

+ 117
- 117
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h Parādīt failu

@@ -46,73 +46,73 @@
46 46
   //#define SDCARD_EEPROM_EMULATION
47 47
 #endif
48 48
 
49
-#define LED_PIN            P1_18   // Used as a status indicator
50
-#define LED2_PIN           P1_19
51
-#define LED3_PIN           P1_20
52
-#define LED4_PIN           P1_21
49
+#define LED_PIN                            P1_18  // Used as a status indicator
50
+#define LED2_PIN                           P1_19
51
+#define LED3_PIN                           P1_20
52
+#define LED4_PIN                           P1_21
53 53
 
54 54
 //
55 55
 // Servos
56 56
 //
57
-#define SERVO0_PIN         P1_23   // J8-3 (low jitter)
58
-#define SERVO1_PIN         P2_12   // J8-4
59
-#define SERVO2_PIN         P2_11   // J8-5
60
-#define SERVO3_PIN         P4_28   // J8-6
57
+#define SERVO0_PIN                         P1_23  // J8-3 (low jitter)
58
+#define SERVO1_PIN                         P2_12  // J8-4
59
+#define SERVO2_PIN                         P2_11  // J8-5
60
+#define SERVO3_PIN                         P4_28  // J8-6
61 61
 
62 62
 //
63 63
 // Limit Switches - Not Interrupt Capable
64 64
 //
65
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V, 1K series
66
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V, 1K series
67
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V, 1K series
68
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V, 1K series
69
-#define Z_MIN_PIN          P1_28   // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
70
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V, 1K series
65
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
66
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
67
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
68
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
69
+#define Z_MIN_PIN                          P1_28  // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
70
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
71 71
 
72 72
 #ifndef Z_MIN_PROBE_PIN
73
-  #define Z_MIN_PROBE_PIN  P4_28   // Connector J8
73
+  #define Z_MIN_PROBE_PIN                  P4_28  // Connector J8
74 74
 #endif
75 75
 
76 76
 //
77 77
 // Steppers
78 78
 //
79
-#define X_STEP_PIN         P2_00
80
-#define X_DIR_PIN          P0_05
81
-#define X_ENABLE_PIN       P0_04
79
+#define X_STEP_PIN                         P2_00
80
+#define X_DIR_PIN                          P0_05
81
+#define X_ENABLE_PIN                       P0_04
82 82
 
83
-#define Y_STEP_PIN         P2_01
84
-#define Y_DIR_PIN          P0_11
85
-#define Y_ENABLE_PIN       P0_10
83
+#define Y_STEP_PIN                         P2_01
84
+#define Y_DIR_PIN                          P0_11
85
+#define Y_ENABLE_PIN                       P0_10
86 86
 
87
-#define Z_STEP_PIN         P2_02
88
-#define Z_DIR_PIN          P0_20
89
-#define Z_ENABLE_PIN       P0_19
87
+#define Z_STEP_PIN                         P2_02
88
+#define Z_DIR_PIN                          P0_20
89
+#define Z_ENABLE_PIN                       P0_19
90 90
 
91
-#define E0_STEP_PIN        P2_03
92
-#define E0_DIR_PIN         P0_22
93
-#define E0_ENABLE_PIN      P0_21
91
+#define E0_STEP_PIN                        P2_03
92
+#define E0_DIR_PIN                         P0_22
93
+#define E0_ENABLE_PIN                      P0_21
94 94
 
95
-#define E1_STEP_PIN        P2_08
96
-#define E1_DIR_PIN         P2_13
97
-#define E1_ENABLE_PIN      P4_29
95
+#define E1_STEP_PIN                        P2_08
96
+#define E1_DIR_PIN                         P2_13
97
+#define E1_ENABLE_PIN                      P4_29
98 98
 
99 99
 //
100 100
 // Temperature Sensors
101 101
 // 3.3V max when defined as an analog input
102 102
 //
103
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
104
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
105
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
106
-#define TEMP_2_PIN          P0_26_A3   // A3 (TH4)
103
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
104
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
105
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
106
+#define TEMP_2_PIN                      P0_26_A3  // A3 (TH4)
107 107
 
108 108
 //
109 109
 // Heaters / Fans
110 110
 //
111
-#define HEATER_BED_PIN     P2_05
112
-#define HEATER_0_PIN       P2_07
113
-#define HEATER_1_PIN       P2_06
111
+#define HEATER_BED_PIN                     P2_05
112
+#define HEATER_0_PIN                       P2_07
113
+#define HEATER_1_PIN                       P2_06
114 114
 #ifndef FAN_PIN
115
-  #define FAN_PIN          P2_04
115
+  #define FAN_PIN                          P2_04
116 116
 #endif
117 117
 
118 118
 //
@@ -124,56 +124,56 @@
124 124
 // 5V
125 125
 // NC
126 126
 // GND
127
-#define PIN_P0_17          P0_17
128
-#define PIN_P0_16          P0_16
129
-#define PIN_P0_15          P0_15
127
+#define PIN_P0_17                          P0_17
128
+#define PIN_P0_16                          P0_16
129
+#define PIN_P0_15                          P0_15
130 130
 
131 131
 //
132 132
 // Connector J8
133 133
 //
134 134
 
135 135
 // GND
136
-#define PIN_P1_22          P1_22
137
-#define PIN_P1_23          P1_23   // PWM Capable
138
-#define PIN_P2_12          P2_12   // Interrupt Capable
139
-#define PIN_P2_11          P2_11   // Interrupt Capable
136
+#define PIN_P1_22                          P1_22
137
+#define PIN_P1_23                          P1_23  // PWM Capable
138
+#define PIN_P2_12                          P2_12  // Interrupt Capable
139
+#define PIN_P2_11                          P2_11  // Interrupt Capable
140 140
 
141 141
 //
142 142
 // Průša i3 MK2 Multi Material Multiplexer Support
143 143
 //
144 144
 #if ENABLED(MK2_MULTIPLEXER)
145
-  #define E_MUX0_PIN       P1_23   // J8-3
146
-  #define E_MUX1_PIN       P2_12   // J8-4
147
-  #define E_MUX2_PIN       P2_11   // J8-5
145
+  #define E_MUX0_PIN                       P1_23  // J8-3
146
+  #define E_MUX1_PIN                       P2_12  // J8-4
147
+  #define E_MUX2_PIN                       P2_11  // J8-5
148 148
 #endif
149 149
 
150 150
 //
151 151
 // Misc. Functions
152 152
 //
153
-#define PS_ON_PIN          P0_25   // TH3 Connector
153
+#define PS_ON_PIN                          P0_25  // TH3 Connector
154 154
 
155 155
 //
156 156
 // Ethernet pins
157 157
 //
158 158
 #ifndef ULTIPANEL
159
-  #define ENET_MDIO        P1_17   // J12-4
160
-  #define ENET_RX_ER       P1_14   // J12-6
161
-  #define ENET_RXD1        P1_10   // J12-8
159
+  #define ENET_MDIO                        P1_17  // J12-4
160
+  #define ENET_RX_ER                       P1_14  // J12-6
161
+  #define ENET_RXD1                        P1_10  // J12-8
162 162
 #endif
163 163
 
164
-#define ENET_MOC           P1_16   // J12-3
165
-#define REF_CLK            P1_15   // J12-5
166
-#define ENET_RXD0          P1_09   // J12-7
167
-#define ENET_CRS           P1_08   // J12-9
168
-#define ENET_TX_EN         P1_04   // J12-10
169
-#define ENET_TXD0          P1_00   // J12-11
170
-#define ENET_TXD1          P1_01   // J12-12
164
+#define ENET_MOC                           P1_16  // J12-3
165
+#define REF_CLK                            P1_15  // J12-5
166
+#define ENET_RXD0                          P1_09  // J12-7
167
+#define ENET_CRS                           P1_08  // J12-9
168
+#define ENET_TX_EN                         P1_04  // J12-10
169
+#define ENET_TXD0                          P1_00  // J12-11
170
+#define ENET_TXD1                          P1_01  // J12-12
171 171
 
172 172
 #ifndef SDCARD_CONNECTION
173
-  #define SDCARD_CONNECTION ONBOARD
173
+  #define SDCARD_CONNECTION              ONBOARD
174 174
 #endif
175 175
 
176
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
176
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
177 177
 
178 178
 #if SD_CONNECTION_IS(CUSTOM_CABLE)
179 179
 
@@ -189,27 +189,27 @@
189 189
    * If you can't find a pin to use for the LCD's SD_DETECT then comment out
190 190
    * SD_DETECT_PIN entirely and remove that wire from the the custom cable.
191 191
    */
192
-  #define SD_DETECT_PIN    P2_11   // J8-5 (moved from EXP2 P0.27)
193
-  #define SCK_PIN          P1_22   // J8-2 (moved from EXP2 P0.7)
194
-  #define MISO_PIN         P1_23   // J8-3 (moved from EXP2 P0.8)
195
-  #define MOSI_PIN         P2_12   // J8-4 (moved from EXP2 P0.9)
196
-  #define SS_PIN           P0_28
197
-  #define LPC_SOFTWARE_SPI  // With a custom cable we need software SPI because the
198
-                            // selected pins are not on a hardware SPI controller
192
+  #define SD_DETECT_PIN                    P2_11  // J8-5 (moved from EXP2 P0.27)
193
+  #define SCK_PIN                          P1_22  // J8-2 (moved from EXP2 P0.7)
194
+  #define MISO_PIN                         P1_23  // J8-3 (moved from EXP2 P0.8)
195
+  #define MOSI_PIN                         P2_12  // J8-4 (moved from EXP2 P0.9)
196
+  #define SS_PIN                           P0_28
197
+  #define LPC_SOFTWARE_SPI                        // With a custom cable we need software SPI because the
198
+                                                  // selected pins are not on a hardware SPI controller
199 199
 #elif SD_CONNECTION_IS(LCD)
200 200
   // use standard cable and header, SPI and SD detect sre shared with on-board SD card
201 201
   // hardware SPI is used for both SD cards. The detect pin is shred between the
202 202
   // LCD and onboard SD readers so we disable it.
203
-  #define SCK_PIN          P0_07
204
-  #define MISO_PIN         P0_08
205
-  #define MOSI_PIN         P0_09
206
-  #define SS_PIN           P0_28
203
+  #define SCK_PIN                          P0_07
204
+  #define MISO_PIN                         P0_08
205
+  #define MOSI_PIN                         P0_09
206
+  #define SS_PIN                           P0_28
207 207
 #elif SD_CONNECTION_IS(ONBOARD)
208
-  #define SD_DETECT_PIN    P0_27
209
-  #define SCK_PIN          P0_07
210
-  #define MISO_PIN         P0_08
211
-  #define MOSI_PIN         P0_09
212
-  #define SS_PIN           ONBOARD_SD_CS_PIN
208
+  #define SD_DETECT_PIN                    P0_27
209
+  #define SCK_PIN                          P0_07
210
+  #define MISO_PIN                         P0_08
211
+  #define MOSI_PIN                         P0_09
212
+  #define SS_PIN               ONBOARD_SD_CS_PIN
213 213
 #endif
214 214
 
215 215
 /**
@@ -226,17 +226,17 @@
226 226
  */
227 227
 
228 228
 #if HAS_SPI_LCD
229
-  #define BEEPER_PIN       P1_31   // EXP1.1
230
-  #define BTN_ENC          P1_30   // EXP1.2
231
-  #define BTN_EN1          P3_26   // EXP2.5
232
-  #define BTN_EN2          P3_25   // EXP2.3
233
-  #define LCD_PINS_RS      P0_16   // EXP1.4
234
-  #define LCD_SDSS         P0_28   // EXP2.4
235
-  #define LCD_PINS_ENABLE  P0_18   // EXP1.3
236
-  #define LCD_PINS_D4      P0_15   // EXP1.5
229
+  #define BEEPER_PIN                       P1_31  // EXP1.1
230
+  #define BTN_ENC                          P1_30  // EXP1.2
231
+  #define BTN_EN1                          P3_26  // EXP2.5
232
+  #define BTN_EN2                          P3_25  // EXP2.3
233
+  #define LCD_PINS_RS                      P0_16  // EXP1.4
234
+  #define LCD_SDSS                         P0_28  // EXP2.4
235
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1.3
236
+  #define LCD_PINS_D4                      P0_15  // EXP1.5
237 237
   #if ANY(VIKI2, miniVIKI)
238
-    #define DOGLCD_SCK     SCK_PIN
239
-    #define DOGLCD_MOSI    MOSI_PIN
238
+    #define DOGLCD_SCK                   SCK_PIN
239
+    #define DOGLCD_MOSI                 MOSI_PIN
240 240
   #endif
241 241
 
242 242
   #if ENABLED(FYSETC_MINI_12864)
@@ -251,26 +251,26 @@
251 251
      * Pins 6, 7 & 8 on EXP2 are no connects. That means a second special
252 252
      * cable will be needed if the RGB LEDs are to be active.
253 253
      */
254
-    #define DOGLCD_CS      LCD_PINS_ENABLE // EXP1.3  (LCD_EN on FYSETC schematic)
255
-    #define DOGLCD_A0      LCD_PINS_RS     // EXP1.4  (LCD_A0 on FYSETC schematic)
256
-    #define DOGLCD_SCK     P2_11           // J8-5  (SCK on FYSETC schematic)
257
-    #define DOGLCD_MOSI    P4_28           // J8-6  (MOSI on FYSETC schematic)
254
+    #define DOGLCD_CS            LCD_PINS_ENABLE  // EXP1.3  (LCD_EN on FYSETC schematic)
255
+    #define DOGLCD_A0                LCD_PINS_RS  // EXP1.4  (LCD_A0 on FYSETC schematic)
256
+    #define DOGLCD_SCK                     P2_11  // J8-5  (SCK on FYSETC schematic)
257
+    #define DOGLCD_MOSI                    P4_28  // J8-6  (MOSI on FYSETC schematic)
258 258
 
259
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
260
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
259
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
260
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
261 261
 
262 262
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
263 263
       #ifndef RGB_LED_R_PIN
264
-        #define RGB_LED_R_PIN P2_12        // J8-4  (LCD_D6 on FYSETC schematic)
264
+        #define RGB_LED_R_PIN              P2_12  // J8-4  (LCD_D6 on FYSETC schematic)
265 265
       #endif
266 266
       #ifndef RGB_LED_G_PIN
267
-        #define RGB_LED_G_PIN P1_23        // J8-3  (LCD_D5 on FYSETC schematic)
267
+        #define RGB_LED_G_PIN              P1_23  // J8-3  (LCD_D5 on FYSETC schematic)
268 268
       #endif
269 269
       #ifndef RGB_LED_B_PIN
270
-        #define RGB_LED_B_PIN P1_22        // J8-2  (LCD_D7 on FYSETC schematic)
270
+        #define RGB_LED_B_PIN              P1_22  // J8-2  (LCD_D7 on FYSETC schematic)
271 271
       #endif
272 272
     #elif ENABLED(FYSETC_MINI_12864_2_1)
273
-      #define NEOPIXEL_PIN P2_12
273
+      #define NEOPIXEL_PIN                 P2_12
274 274
     #endif
275 275
 
276 276
   #elif ENABLED(MINIPANEL)
@@ -291,24 +291,24 @@
291 291
 
292 292
 #if HAS_DRIVER(TMC2130)
293 293
   // J8
294
-  #define X_CS_PIN         P1_22
295
-  #define Y_CS_PIN         P1_23
296
-  #define Z_CS_PIN         P2_12
297
-  #define E0_CS_PIN        P2_11
298
-  #define E1_CS_PIN        P4_28
294
+  #define X_CS_PIN                         P1_22
295
+  #define Y_CS_PIN                         P1_23
296
+  #define Z_CS_PIN                         P2_12
297
+  #define E0_CS_PIN                        P2_11
298
+  #define E1_CS_PIN                        P4_28
299 299
 
300 300
 // Hardware SPI is on EXP2. See if you can make it work:
301 301
 // https://github.com/makerbase-mks/MKS-SBASE/issues/25
302 302
 #define TMC_USE_SW_SPI
303 303
 #if ENABLED(TMC_USE_SW_SPI)
304 304
   #ifndef TMC_SW_MOSI
305
-    #define TMC_SW_MOSI    P0_03   // AUX1
305
+    #define TMC_SW_MOSI                    P0_03  // AUX1
306 306
   #endif
307 307
   #ifndef TMC_SW_MISO
308
-    #define TMC_SW_MISO    P0_02   // AUX1
308
+    #define TMC_SW_MISO                    P0_02  // AUX1
309 309
   #endif
310 310
   #ifndef TMC_SW_SCK
311
-    #define TMC_SW_SCK     P0_26   // TH4
311
+    #define TMC_SW_SCK                     P0_26  // TH4
312 312
   #endif
313 313
  #endif
314 314
 #endif
@@ -322,24 +322,24 @@
322 322
    * Worst case you may have to give up the LCD
323 323
    * RX pins need to be interrupt capable
324 324
    */
325
-  #define X_SERIAL_TX_PIN  P1_22   // J8-2
326
-  #define X_SERIAL_RX_PIN  P2_12   // J8-4 Interrupt Capable
327
-  #define Y_SERIAL_TX_PIN  P1_23   // J8-3
328
-  #define Y_SERIAL_RX_PIN  P2_11   // J8-5 Interrupt Capable
329
-  #define Z_SERIAL_TX_PIN  P2_12   // J8-4
330
-  #define Z_SERIAL_RX_PIN  P0_25   // TH3
331
-  #define E0_SERIAL_TX_PIN P4_28   // J8-6
332
-  #define E0_SERIAL_RX_PIN P0_26   // TH4
325
+  #define X_SERIAL_TX_PIN                  P1_22  // J8-2
326
+  #define X_SERIAL_RX_PIN                  P2_12  // J8-4 Interrupt Capable
327
+  #define Y_SERIAL_TX_PIN                  P1_23  // J8-3
328
+  #define Y_SERIAL_RX_PIN                  P2_11  // J8-5 Interrupt Capable
329
+  #define Z_SERIAL_TX_PIN                  P2_12  // J8-4
330
+  #define Z_SERIAL_RX_PIN                  P0_25  // TH3
331
+  #define E0_SERIAL_TX_PIN                 P4_28  // J8-6
332
+  #define E0_SERIAL_RX_PIN                 P0_26  // TH4
333 333
 
334 334
   // Reduce baud rate to improve software serial reliability
335 335
   #define TMC_BAUD_RATE 19200
336 336
 #endif
337 337
 
338 338
 // UNUSED
339
-#define PIN_P0_27          P0_27   // EXP2/Onboard SD
340
-#define PIN_P0_28          P0_28   // EXP2
341
-#define PIN_P0_02          P0_02   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
342
-#define PIN_P0_03          P0_03   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
339
+#define PIN_P0_27                          P0_27  // EXP2/Onboard SD
340
+#define PIN_P0_28                          P0_28  // EXP2
341
+#define PIN_P0_02                          P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
342
+#define PIN_P0_03                          P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
343 343
 
344 344
 /**
345 345
  *  PWMs

+ 121
- 121
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h Parādīt failu

@@ -41,100 +41,100 @@
41 41
 //
42 42
 // Servos
43 43
 //
44
-#define SERVO0_PIN         P1_23   // SERVO P1.23
45
-#define SERVO1_PIN         P2_00   // SERVO P2.0
44
+#define SERVO0_PIN                         P1_23  // SERVO P1.23
45
+#define SERVO1_PIN                         P2_00  // SERVO P2.0
46 46
 
47 47
 //
48 48
 // Trinamic Stallguard pins
49 49
 //
50
-#define X_DIAG_PIN         P1_29   // X-
51
-#define Y_DIAG_PIN         P1_27   // Y-
52
-#define Z_DIAG_PIN         P1_25   // Z-
53
-#define E0_DIAG_PIN        P1_28   // X+
54
-#define E1_DIAG_PIN        P1_26   // Y+
50
+#define X_DIAG_PIN                         P1_29  // X-
51
+#define Y_DIAG_PIN                         P1_27  // Y-
52
+#define Z_DIAG_PIN                         P1_25  // Z-
53
+#define E0_DIAG_PIN                        P1_28  // X+
54
+#define E1_DIAG_PIN                        P1_26  // Y+
55 55
 
56 56
 //
57 57
 // Limit Switches
58 58
 //
59 59
 #if X_STALL_SENSITIVITY
60
-  #define X_STOP_PIN       X_DIAG_PIN
60
+  #define X_STOP_PIN                  X_DIAG_PIN
61 61
   #if X_HOME_DIR < 0
62
-    #define X_MAX_PIN      P1_28   // X+
62
+    #define X_MAX_PIN                      P1_28  // X+
63 63
   #else
64
-    #define X_MIN_PIN      P1_28   // X+
64
+    #define X_MIN_PIN                      P1_28  // X+
65 65
   #endif
66 66
 #else
67
-  #define X_MIN_PIN        P1_29   // X-
68
-  #define X_MAX_PIN        P1_28   // X+
67
+  #define X_MIN_PIN                        P1_29  // X-
68
+  #define X_MAX_PIN                        P1_28  // X+
69 69
 #endif
70 70
 
71 71
 #if Y_STALL_SENSITIVITY
72
-  #define Y_STOP_PIN       Y_DIAG_PIN
72
+  #define Y_STOP_PIN                  Y_DIAG_PIN
73 73
   #if Y_HOME_DIR < 0
74
-    #define Y_MAX_PIN      P1_26   // Y+
74
+    #define Y_MAX_PIN                      P1_26  // Y+
75 75
   #else
76
-    #define Y_MIN_PIN      P1_26   // Y+
76
+    #define Y_MIN_PIN                      P1_26  // Y+
77 77
   #endif
78 78
 #else
79
-  #define Y_MIN_PIN        P1_27   // Y-
80
-  #define Y_MAX_PIN        P1_26   // Y+
79
+  #define Y_MIN_PIN                        P1_27  // Y-
80
+  #define Y_MAX_PIN                        P1_26  // Y+
81 81
 #endif
82 82
 
83 83
 #if Z_STALL_SENSITIVITY
84
-  #define Z_STOP_PIN       Z_DIAG_PIN
84
+  #define Z_STOP_PIN                  Z_DIAG_PIN
85 85
   #if Z_HOME_DIR < 0
86
-    #define Z_MAX_PIN      P1_24   // Z+
86
+    #define Z_MAX_PIN                      P1_24  // Z+
87 87
   #else
88
-    #define Z_MIN_PIN      P1_24   // Z+
88
+    #define Z_MIN_PIN                      P1_24  // Z+
89 89
   #endif
90 90
 #else
91
-  #define Z_MIN_PIN        P1_25   // Z-
92
-  #define Z_MAX_PIN        P1_24   // Z+
91
+  #define Z_MIN_PIN                        P1_25  // Z-
92
+  #define Z_MAX_PIN                        P1_24  // Z+
93 93
 #endif
94 94
 
95 95
 //
96 96
 // Z Probe (when not Z_MIN_PIN)
97 97
 //
98 98
 #ifndef Z_MIN_PROBE_PIN
99
-  #define Z_MIN_PROBE_PIN  P1_24
99
+  #define Z_MIN_PROBE_PIN                  P1_24
100 100
 #endif
101 101
 
102 102
 //
103 103
 // Steppers
104 104
 //
105
-#define X_STEP_PIN         P2_02
106
-#define X_DIR_PIN          P2_03
107
-#define X_ENABLE_PIN       P2_01
105
+#define X_STEP_PIN                         P2_02
106
+#define X_DIR_PIN                          P2_03
107
+#define X_ENABLE_PIN                       P2_01
108 108
 #ifndef X_CS_PIN
109
-  #define X_CS_PIN         P1_01
109
+  #define X_CS_PIN                         P1_01
110 110
 #endif
111 111
 
112
-#define Y_STEP_PIN         P0_19
113
-#define Y_DIR_PIN          P0_20
114
-#define Y_ENABLE_PIN       P2_08
112
+#define Y_STEP_PIN                         P0_19
113
+#define Y_DIR_PIN                          P0_20
114
+#define Y_ENABLE_PIN                       P2_08
115 115
 #ifndef Y_CS_PIN
116
-  #define Y_CS_PIN         P1_08
116
+  #define Y_CS_PIN                         P1_08
117 117
 #endif
118 118
 
119
-#define Z_STEP_PIN         P0_22
120
-#define Z_DIR_PIN          P2_11
121
-#define Z_ENABLE_PIN       P0_21
119
+#define Z_STEP_PIN                         P0_22
120
+#define Z_DIR_PIN                          P2_11
121
+#define Z_ENABLE_PIN                       P0_21
122 122
 #ifndef Z_CS_PIN
123
-  #define Z_CS_PIN         P1_10
123
+  #define Z_CS_PIN                         P1_10
124 124
 #endif
125 125
 
126
-#define E0_STEP_PIN        P2_13
127
-#define E0_DIR_PIN         P0_11
128
-#define E0_ENABLE_PIN      P2_12
126
+#define E0_STEP_PIN                        P2_13
127
+#define E0_DIR_PIN                         P0_11
128
+#define E0_ENABLE_PIN                      P2_12
129 129
 #ifndef E0_CS_PIN
130
-  #define E0_CS_PIN        P1_15
130
+  #define E0_CS_PIN                        P1_15
131 131
 #endif
132 132
 
133
-#define E1_STEP_PIN        P0_01
134
-#define E1_DIR_PIN         P0_00
135
-#define E1_ENABLE_PIN      P0_10
133
+#define E1_STEP_PIN                        P0_01
134
+#define E1_DIR_PIN                         P0_00
135
+#define E1_ENABLE_PIN                      P0_10
136 136
 #ifndef E1_CS_PIN
137
-  #define E1_CS_PIN        P1_17
137
+  #define E1_CS_PIN                        P1_17
138 138
 #endif
139 139
 
140 140
 //
@@ -142,13 +142,13 @@
142 142
 //
143 143
 #if ENABLED(TMC_USE_SW_SPI)
144 144
   #ifndef TMC_SW_MOSI
145
-    #define TMC_SW_MOSI    P4_28
145
+    #define TMC_SW_MOSI                    P4_28
146 146
   #endif
147 147
   #ifndef TMC_SW_MISO
148
-    #define TMC_SW_MISO    P0_05
148
+    #define TMC_SW_MISO                    P0_05
149 149
   #endif
150 150
   #ifndef TMC_SW_SCK
151
-    #define TMC_SW_SCK     P0_04
151
+    #define TMC_SW_SCK                     P0_04
152 152
   #endif
153 153
 #endif
154 154
 
@@ -175,23 +175,23 @@
175 175
   // Software serial
176 176
   //
177 177
 
178
-  #define X_SERIAL_TX_PIN  P1_04
179
-  #define X_SERIAL_RX_PIN  P1_01
178
+  #define X_SERIAL_TX_PIN                  P1_04
179
+  #define X_SERIAL_RX_PIN                  P1_01
180 180
 
181
-  #define Y_SERIAL_TX_PIN  P1_09
182
-  #define Y_SERIAL_RX_PIN  P1_08
181
+  #define Y_SERIAL_TX_PIN                  P1_09
182
+  #define Y_SERIAL_RX_PIN                  P1_08
183 183
 
184
-  #define Z_SERIAL_TX_PIN  P1_14
185
-  #define Z_SERIAL_RX_PIN  P1_10
184
+  #define Z_SERIAL_TX_PIN                  P1_14
185
+  #define Z_SERIAL_RX_PIN                  P1_10
186 186
 
187
-  #define E0_SERIAL_TX_PIN P1_16
188
-  #define E0_SERIAL_RX_PIN P1_15
187
+  #define E0_SERIAL_TX_PIN                 P1_16
188
+  #define E0_SERIAL_RX_PIN                 P1_15
189 189
 
190
-  #define E1_SERIAL_TX_PIN P4_29
191
-  #define E1_SERIAL_RX_PIN P1_17
190
+  #define E1_SERIAL_TX_PIN                 P4_29
191
+  #define E1_SERIAL_RX_PIN                 P1_17
192 192
 
193
-  #define Z2_SERIAL_TX_PIN P4_29
194
-  #define Z2_SERIAL_RX_PIN P1_17
193
+  #define Z2_SERIAL_TX_PIN                 P4_29
194
+  #define Z2_SERIAL_RX_PIN                 P1_17
195 195
 
196 196
   // Reduce baud rate to improve software serial reliability
197 197
   #define TMC_BAUD_RATE 19200
@@ -201,35 +201,35 @@
201 201
 // Temperature Sensors
202 202
 // 3.3V max when defined as an analog input
203 203
 //
204
-#define TEMP_0_PIN         P0_23_A0   // Analog Input A0 (TH1)
205
-#define TEMP_BED_PIN       P0_24_A1   // Analog Input A1 (TB)
206
-#define TEMP_1_PIN         P0_25_A2   // Analog Input A2 (TH2)
204
+#define TEMP_0_PIN                      P0_23_A0  // Analog Input A0 (TH1)
205
+#define TEMP_BED_PIN                    P0_24_A1  // Analog Input A1 (TB)
206
+#define TEMP_1_PIN                      P0_25_A2  // Analog Input A2 (TH2)
207 207
 
208 208
 //
209 209
 // Heaters / Fans
210 210
 //
211
-#define HEATER_BED_PIN     P2_05
212
-#define HEATER_0_PIN       P2_07
211
+#define HEATER_BED_PIN                     P2_05
212
+#define HEATER_0_PIN                       P2_07
213 213
 #if HOTENDS == 1
214 214
   #ifndef FAN1_PIN
215
-    #define FAN1_PIN       P2_06
215
+    #define FAN1_PIN                       P2_06
216 216
   #endif
217 217
 #else
218 218
   #ifndef HEATER_1_PIN
219
-    #define HEATER_1_PIN   P2_06
219
+    #define HEATER_1_PIN                   P2_06
220 220
   #endif
221 221
 #endif
222 222
 #ifndef FAN_PIN
223
-  #define FAN_PIN          P2_04
223
+  #define FAN_PIN                          P2_04
224 224
 #endif
225 225
 
226 226
 //
227 227
 // Misc. Functions
228 228
 //
229
-#define LED_PIN            P1_18   // Used as a status indicator
230
-#define LED2_PIN           P1_19
231
-#define LED3_PIN           P1_20
232
-#define LED4_PIN           P1_21
229
+#define LED_PIN                            P1_18  // Used as a status indicator
230
+#define LED2_PIN                           P1_19
231
+#define LED3_PIN                           P1_20
232
+#define LED4_PIN                           P1_21
233 233
 
234 234
 /**
235 235
  *                _____                                            _____
@@ -242,83 +242,83 @@
242 242
  *                EXP1                                             EXP2
243 243
  */
244 244
 #if HAS_SPI_LCD
245
-  #define BEEPER_PIN       P1_31
246
-  #define BTN_ENC          P1_30
245
+  #define BEEPER_PIN                       P1_31
246
+  #define BTN_ENC                          P1_30
247 247
 
248 248
   #if ENABLED(CR10_STOCKDISPLAY)
249
-    #define LCD_PINS_RS    P1_00
249
+    #define LCD_PINS_RS                    P1_00
250 250
 
251
-    #define BTN_EN1        P0_18
252
-    #define BTN_EN2        P0_15
251
+    #define BTN_EN1                        P0_18
252
+    #define BTN_EN2                        P0_15
253 253
 
254
-    #define LCD_PINS_ENABLE P1_22
255
-    #define LCD_PINS_D4    P0_17
254
+    #define LCD_PINS_ENABLE                P1_22
255
+    #define LCD_PINS_D4                    P0_17
256 256
 
257 257
   #else
258 258
 
259
-    #define BTN_EN1        P3_25
260
-    #define BTN_EN2        P3_26
259
+    #define BTN_EN1                        P3_25
260
+    #define BTN_EN2                        P3_26
261 261
 
262
-    #define LCD_SDSS       P0_28
262
+    #define LCD_SDSS                       P0_28
263 263
 
264 264
     #if ENABLED(MKS_12864OLED_SSD1306)
265 265
 
266
-      #define LCD_PINS_DC  P0_17
267
-      #define DOGLCD_CS    P0_16
268
-      #define DOGLCD_A0    LCD_PINS_DC
269
-      #define DOGLCD_SCK   P0_15
270
-      #define DOGLCD_MOSI  P0_18
266
+      #define LCD_PINS_DC                  P0_17
267
+      #define DOGLCD_CS                    P0_16
268
+      #define DOGLCD_A0              LCD_PINS_DC
269
+      #define DOGLCD_SCK                   P0_15
270
+      #define DOGLCD_MOSI                  P0_18
271 271
 
272
-      #define LCD_PINS_RS  P1_00
273
-      #define LCD_PINS_D7  P1_22
274
-      #define KILL_PIN     -1 // NC
272
+      #define LCD_PINS_RS                  P1_00
273
+      #define LCD_PINS_D7                  P1_22
274
+      #define KILL_PIN                     -1     // NC
275 275
 
276
-    #else // !MKS_12864OLED_SSD1306
276
+    #else                                         // !MKS_12864OLED_SSD1306
277 277
 
278
-      #define LCD_PINS_RS  P0_16
278
+      #define LCD_PINS_RS                  P0_16
279 279
 
280
-      #define LCD_PINS_ENABLE P0_18
281
-      #define LCD_PINS_D4  P0_15
280
+      #define LCD_PINS_ENABLE              P0_18
281
+      #define LCD_PINS_D4                  P0_15
282 282
 
283 283
       #if ENABLED(FYSETC_MINI_12864)
284 284
 
285
-        #define DOGLCD_CS  P0_18
286
-        #define DOGLCD_A0  P0_16
287
-        #define DOGLCD_SCK P0_07
288
-        #define DOGLCD_MOSI P1_20
285
+        #define DOGLCD_CS                  P0_18
286
+        #define DOGLCD_A0                  P0_16
287
+        #define DOGLCD_SCK                 P0_07
288
+        #define DOGLCD_MOSI                P1_20
289 289
 
290
-        #define LCD_BACKLIGHT_PIN -1
290
+        #define LCD_BACKLIGHT_PIN          -1
291 291
 
292
-        #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
293
-                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
292
+        #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
293
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
294 294
 
295
-        #define LCD_RESET_PIN P0_15   // Must be high or open for LCD to operate normally.
295
+        #define LCD_RESET_PIN              P0_15  // Must be high or open for LCD to operate normally.
296 296
 
297 297
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
298 298
           #ifndef RGB_LED_R_PIN
299
-            #define RGB_LED_R_PIN P0_17
299
+            #define RGB_LED_R_PIN          P0_17
300 300
           #endif
301 301
           #ifndef RGB_LED_G_PIN
302
-            #define RGB_LED_G_PIN P1_00
302
+            #define RGB_LED_G_PIN          P1_00
303 303
           #endif
304 304
           #ifndef RGB_LED_B_PIN
305
-            #define RGB_LED_B_PIN P1_22
305
+            #define RGB_LED_B_PIN          P1_22
306 306
           #endif
307 307
         #elif ENABLED(FYSETC_MINI_12864_2_1)
308
-          #define NEOPIXEL_PIN    P0_17
308
+          #define NEOPIXEL_PIN             P0_17
309 309
         #endif
310 310
 
311
-      #else // !FYSETC_MINI_12864
311
+      #else                                       // !FYSETC_MINI_12864
312 312
 
313 313
         #if ENABLED(MKS_MINI_12864)
314
-          #define DOGLCD_CS  P0_17
315
-          #define DOGLCD_A0  P1_00
314
+          #define DOGLCD_CS                P0_17
315
+          #define DOGLCD_A0                P1_00
316 316
         #endif
317 317
 
318 318
         #if ENABLED(ULTIPANEL)
319
-          #define LCD_PINS_D5 P0_17
320
-          #define LCD_PINS_D6 P1_00
321
-          #define LCD_PINS_D7 P1_22
319
+          #define LCD_PINS_D5              P0_17
320
+          #define LCD_PINS_D6              P1_00
321
+          #define LCD_PINS_D7              P1_22
322 322
         #endif
323 323
 
324 324
       #endif // !FYSETC_MINI_12864
@@ -330,20 +330,20 @@
330 330
 #endif // HAS_SPI_LCD
331 331
 
332 332
 #ifndef SDCARD_CONNECTION
333
-  #define SDCARD_CONNECTION ONBOARD
333
+  #define SDCARD_CONNECTION              ONBOARD
334 334
 #endif
335 335
 
336
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
336
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
337 337
 
338 338
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
339
-  #define SD_DETECT_PIN    P0_27
340
-  #define SCK_PIN          P0_07
341
-  #define MISO_PIN         P0_08
342
-  #define MOSI_PIN         P0_09
339
+  #define SD_DETECT_PIN                    P0_27
340
+  #define SCK_PIN                          P0_07
341
+  #define MISO_PIN                         P0_08
342
+  #define MOSI_PIN                         P0_09
343 343
   #if SD_CONNECTION_IS(ONBOARD)
344
-    #define SS_PIN         ONBOARD_SD_CS_PIN
344
+    #define SS_PIN             ONBOARD_SD_CS_PIN
345 345
   #else
346
-    #define SS_PIN         P0_28
346
+    #define SS_PIN                         P0_28
347 347
   #endif
348 348
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
349 349
   #error "No custom SD drive cable defined for this board."
@@ -352,6 +352,6 @@
352 352
 //
353 353
 // Other Pins
354 354
 //
355
-//#define PIN_P0_02          P0_02   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
356
-//#define PIN_P0_03          P0_03   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
357
-//#define PS_ON_PIN          P1_23   // SERVO P1.23
355
+//#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
356
+//#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
357
+//#define PS_ON_PIN                        P1_23  // SERVO P1.23

+ 159
- 159
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h Parādīt failu

@@ -51,58 +51,58 @@
51 51
 //
52 52
 // Servos
53 53
 //
54
-#define SERVO0_PIN         P1_20   // (11)
55
-#define SERVO1_PIN         P1_21   // ( 6) also on J5-1
56
-#define SERVO2_PIN         P1_19   // ( 5)
57
-#define SERVO3_PIN         P1_18   // ( 4) 5V output
54
+#define SERVO0_PIN                         P1_20  // (11)
55
+#define SERVO1_PIN                         P1_21  // ( 6) also on J5-1
56
+#define SERVO2_PIN                         P1_19  // ( 5)
57
+#define SERVO3_PIN                         P1_18  // ( 4) 5V output
58 58
 
59 59
 //
60 60
 // Limit Switches
61 61
 //
62
-#define X_MIN_PIN          P1_24   // ( 3) 10k pullup to 3.3V, 1K series
63
-#define X_MAX_PIN          P1_25   // ( 2) 10k pullup to 3.3V, 1K series
64
-#define Y_MIN_PIN          P1_26   // (14) 10k pullup to 3.3V, 1K series
65
-#define Y_MAX_PIN          P1_27   // (15) 10k pullup to 3.3V, 1K series
66
-#define Z_MIN_PIN          P1_29   // (18) 10k pullup to 3.3V, 1K series
67
-#define Z_MAX_PIN          P1_28   // (19) 10k pullup to 3.3V, 1K series
68
-#define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups
62
+#define X_MIN_PIN                          P1_24  // ( 3) 10k pullup to 3.3V, 1K series
63
+#define X_MAX_PIN                          P1_25  // ( 2) 10k pullup to 3.3V, 1K series
64
+#define Y_MIN_PIN                          P1_26  // (14) 10k pullup to 3.3V, 1K series
65
+#define Y_MAX_PIN                          P1_27  // (15) 10k pullup to 3.3V, 1K series
66
+#define Z_MIN_PIN                          P1_29  // (18) 10k pullup to 3.3V, 1K series
67
+#define Z_MAX_PIN                          P1_28  // (19) 10k pullup to 3.3V, 1K series
68
+#define ONBOARD_ENDSTOPPULLUPS                    // Board has built-in pullups
69 69
 
70 70
 //
71 71
 // Steppers
72 72
 //
73
-#define X_STEP_PIN         P2_01   // (54)
74
-#define X_DIR_PIN          P0_11   // (55)
75
-#define X_ENABLE_PIN       P0_10   // (38)
73
+#define X_STEP_PIN                         P2_01  // (54)
74
+#define X_DIR_PIN                          P0_11  // (55)
75
+#define X_ENABLE_PIN                       P0_10  // (38)
76 76
 #ifndef X_CS_PIN
77
-  #define X_CS_PIN         P1_01   // ETH
77
+  #define X_CS_PIN                         P1_01  // ETH
78 78
 #endif
79 79
 
80
-#define Y_STEP_PIN         P2_02   // (60)
81
-#define Y_DIR_PIN          P0_20   // (61)
82
-#define Y_ENABLE_PIN       P0_19   // (56)
80
+#define Y_STEP_PIN                         P2_02  // (60)
81
+#define Y_DIR_PIN                          P0_20  // (61)
82
+#define Y_ENABLE_PIN                       P0_19  // (56)
83 83
 #ifndef Y_CS_PIN
84
-  #define Y_CS_PIN         P1_04   // ETH
84
+  #define Y_CS_PIN                         P1_04  // ETH
85 85
 #endif
86 86
 
87
-#define Z_STEP_PIN         P2_03   // (46)
88
-#define Z_DIR_PIN          P0_22   // (48)
89
-#define Z_ENABLE_PIN       P0_21   // (62)
87
+#define Z_STEP_PIN                         P2_03  // (46)
88
+#define Z_DIR_PIN                          P0_22  // (48)
89
+#define Z_ENABLE_PIN                       P0_21  // (62)
90 90
 #ifndef Z_CS_PIN
91
-  #define Z_CS_PIN         P1_10   // ETH
91
+  #define Z_CS_PIN                         P1_10  // ETH
92 92
 #endif
93 93
 
94
-#define E0_STEP_PIN        P2_00   // (26)
95
-#define E0_DIR_PIN         P0_05   // (28)
96
-#define E0_ENABLE_PIN      P0_04   // (24)
94
+#define E0_STEP_PIN                        P2_00  // (26)
95
+#define E0_DIR_PIN                         P0_05  // (28)
96
+#define E0_ENABLE_PIN                      P0_04  // (24)
97 97
 #ifndef E0_CS_PIN
98
-  #define E0_CS_PIN        P1_14   // ETH
98
+  #define E0_CS_PIN                        P1_14  // ETH
99 99
 #endif
100 100
 
101
-#define E1_STEP_PIN        P2_08   // (36)
102
-#define E1_DIR_PIN         P2_13   // (34)
103
-#define E1_ENABLE_PIN      P4_29   // (30)
101
+#define E1_STEP_PIN                        P2_08  // (36)
102
+#define E1_DIR_PIN                         P2_13  // (34)
103
+#define E1_ENABLE_PIN                      P4_29  // (30)
104 104
 #ifndef E1_CS_PIN
105
-  #define E1_CS_PIN        -1
105
+  #define E1_CS_PIN                        -1
106 106
 #endif
107 107
 
108 108
 //
@@ -110,13 +110,13 @@
110 110
 //
111 111
 #if ENABLED(TMC_USE_SW_SPI)
112 112
   #ifndef TMC_SW_MOSI
113
-    #define TMC_SW_MOSI    P1_00   // ETH
113
+    #define TMC_SW_MOSI                    P1_00  // ETH
114 114
   #endif
115 115
   #ifndef TMC_SW_MISO
116
-    #define TMC_SW_MISO    P1_08   // ETH
116
+    #define TMC_SW_MISO                    P1_08  // ETH
117 117
   #endif
118 118
   #ifndef TMC_SW_SCK
119
-    #define TMC_SW_SCK     P1_09   // ETH
119
+    #define TMC_SW_SCK                     P1_09  // ETH
120 120
   #endif
121 121
 #endif
122 122
 
@@ -136,31 +136,31 @@
136 136
   // P2_13 E1-Dir
137 137
 
138 138
   #ifndef X_SERIAL_TX_PIN
139
-    #define X_SERIAL_TX_PIN  P0_01
139
+    #define X_SERIAL_TX_PIN                P0_01
140 140
   #endif
141 141
   #ifndef X_SERIAL_RX_PIN
142
-    #define X_SERIAL_RX_PIN  P0_01
142
+    #define X_SERIAL_RX_PIN                P0_01
143 143
   #endif
144 144
 
145 145
   #ifndef Y_SERIAL_TX_PIN
146
-    #define Y_SERIAL_TX_PIN  P0_00
146
+    #define Y_SERIAL_TX_PIN                P0_00
147 147
   #endif
148 148
   #ifndef Y_SERIAL_RX_PIN
149
-    #define Y_SERIAL_RX_PIN  P0_00
149
+    #define Y_SERIAL_RX_PIN                P0_00
150 150
   #endif
151 151
 
152 152
   #ifndef Z_SERIAL_TX_PIN
153
-    #define Z_SERIAL_TX_PIN  P2_13
153
+    #define Z_SERIAL_TX_PIN                P2_13
154 154
   #endif
155 155
   #ifndef Z_SERIAL_RX_PIN
156
-    #define Z_SERIAL_RX_PIN  P2_13
156
+    #define Z_SERIAL_RX_PIN                P2_13
157 157
   #endif
158 158
 
159 159
   #ifndef E0_SERIAL_TX_PIN
160
-    #define E0_SERIAL_TX_PIN P2_08
160
+    #define E0_SERIAL_TX_PIN               P2_08
161 161
   #endif
162 162
   #ifndef E0_SERIAL_RX_PIN
163
-    #define E0_SERIAL_RX_PIN P2_08
163
+    #define E0_SERIAL_RX_PIN               P2_08
164 164
   #endif
165 165
 
166 166
   // Reduce baud rate to improve software serial reliability
@@ -171,14 +171,14 @@
171 171
 // Temperature Sensors
172 172
 //  3.3V max when defined as an analog input
173 173
 //
174
-#define TEMP_0_PIN          P0_23_A0   // A0 (T0) - (67) - TEMP_0_PIN
175
-#define TEMP_BED_PIN        P0_24_A1   // A1 (T1) - (68) - TEMP_BED_PIN
176
-#define TEMP_1_PIN          P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
177
-#define TEMP_2_PIN          P0_26_A3   // A3 - (63) - J5-3 & AUX-2
178
-#define TEMP_3_PIN          P1_30_A4   // A4 - (37) - BUZZER_PIN
179
-//#define TEMP_4_PIN          P1_31_A5   // A5 - (49) - SD_DETECT_PIN
174
+#define TEMP_0_PIN                      P0_23_A0  // A0 (T0) - (67) - TEMP_0_PIN
175
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (T1) - (68) - TEMP_BED_PIN
176
+#define TEMP_1_PIN                      P0_25_A2  // A2 (T2) - (69) - TEMP_1_PIN
177
+#define TEMP_2_PIN                      P0_26_A3  // A3 - (63) - J5-3 & AUX-2
178
+#define TEMP_3_PIN                      P1_30_A4  // A4 - (37) - BUZZER_PIN
179
+//#define TEMP_4_PIN                    P1_31_A5  // A5 - (49) - SD_DETECT_PIN
180 180
 //#define ??                  P0_03_A6   // A6 - ( 0)  - RXD0 - J4-4 & AUX-1
181
-#define FILWIDTH_PIN        P0_02_A7   // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
181
+#define FILWIDTH_PIN                    P0_02_A7  // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
182 182
 
183 183
 //
184 184
 // Augmentation for auto-assigning RAMPS plugs
@@ -201,69 +201,69 @@
201 201
 // Heaters / Fans
202 202
 //
203 203
 #ifndef MOSFET_D_PIN
204
-  #define MOSFET_D_PIN     -1
204
+  #define MOSFET_D_PIN                     -1
205 205
 #endif
206 206
 #ifndef RAMPS_D8_PIN
207
-  #define RAMPS_D8_PIN     P2_07   // (8)
207
+  #define RAMPS_D8_PIN                     P2_07  // (8)
208 208
 #endif
209 209
 #ifndef RAMPS_D9_PIN
210
-  #define RAMPS_D9_PIN     P2_04   // (9)
210
+  #define RAMPS_D9_PIN                     P2_04  // (9)
211 211
 #endif
212 212
 #ifndef RAMPS_D10_PIN
213
-  #define RAMPS_D10_PIN    P2_05   // (10)
213
+  #define RAMPS_D10_PIN                    P2_05  // (10)
214 214
 #endif
215 215
 
216
-#define HEATER_0_PIN       RAMPS_D10_PIN
217
-
218
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
219
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
220
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
221
-  #define HEATER_1_PIN     RAMPS_D9_PIN
222
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
223
-  #define HEATER_1_PIN     RAMPS_D9_PIN
224
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
225
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
226
-  #define FAN1_PIN         RAMPS_D8_PIN
227
-#elif DISABLED(IS_RAMPS_SF)                    // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
228
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
216
+#define HEATER_0_PIN               RAMPS_D10_PIN
217
+
218
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
219
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
220
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
221
+  #define HEATER_1_PIN              RAMPS_D9_PIN
222
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
223
+  #define HEATER_1_PIN              RAMPS_D9_PIN
224
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
225
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
226
+  #define FAN1_PIN                  RAMPS_D8_PIN
227
+#elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
228
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
229 229
   #if HOTENDS == 1
230
-    #define FAN1_PIN       MOSFET_D_PIN
230
+    #define FAN1_PIN                MOSFET_D_PIN
231 231
   #else
232
-    #define HEATER_1_PIN   MOSFET_D_PIN
232
+    #define HEATER_1_PIN            MOSFET_D_PIN
233 233
   #endif
234 234
 #endif
235 235
 
236 236
 #ifndef FAN_PIN
237 237
   #if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF)          // Hotend, Fan, Bed or Hotend, Fan, Fan
238
-    #define FAN_PIN        RAMPS_D9_PIN
238
+    #define FAN_PIN                 RAMPS_D9_PIN
239 239
   #elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF)         // Hotend, Hotend, Fan or Spindle, Fan
240
-    #define FAN_PIN        RAMPS_D8_PIN
241
-  #elif ENABLED(IS_RAMPS_EEB)                  // Hotend, Hotend, Bed
242
-    #define FAN_PIN        P1_18               // (4) IO pin. Buffer needed
243
-  #else                                        // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
244
-    #define FAN_PIN        RAMPS_D9_PIN
240
+    #define FAN_PIN                 RAMPS_D8_PIN
241
+  #elif ENABLED(IS_RAMPS_EEB)                     // Hotend, Hotend, Bed
242
+    #define FAN_PIN                        P1_18  // (4) IO pin. Buffer needed
243
+  #else                                           // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
244
+    #define FAN_PIN                 RAMPS_D9_PIN
245 245
   #endif
246 246
 #endif
247 247
 
248 248
 //
249 249
 // Misc. Functions
250 250
 //
251
-#define LED_PIN            P4_28   // (13)
251
+#define LED_PIN                            P4_28  // (13)
252 252
 
253 253
 // define digital pin 5 for the filament runout sensor. Use the RAMPS 1.4 digital input 5 on the servos connector
254 254
 #ifndef FIL_RUNOUT_PIN
255
-  #define FIL_RUNOUT_PIN   P1_19   // (5)
255
+  #define FIL_RUNOUT_PIN                   P1_19  // (5)
256 256
 #endif
257 257
 
258
-#define PS_ON_PIN          P2_12   // (12)
258
+#define PS_ON_PIN                          P2_12  // (12)
259 259
 
260 260
 #if !defined(MAX6675_SS_PIN) && DISABLED(USE_ZMAX_PLUG)
261
-  #define MAX6675_SS_PIN   P1_28
261
+  #define MAX6675_SS_PIN                   P1_28
262 262
 #endif
263 263
 
264 264
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
265
-  #if !defined(NUM_SERVOS) || NUM_SERVOS < 4   // Try to use servo connector
266
-    #define CASE_LIGHT_PIN P1_18   // (4) MUST BE HARDWARE PWM
265
+  #if !defined(NUM_SERVOS) || NUM_SERVOS < 4      // Try to use servo connector
266
+    #define CASE_LIGHT_PIN                 P1_18  // (4) MUST BE HARDWARE PWM
267 267
   #endif
268 268
 #endif
269 269
 
@@ -279,19 +279,19 @@
279 279
       #error "LASER_FEATURE requires 3 free servo pins."
280 280
     #endif
281 281
   #endif
282
-  #define SPINDLE_LASER_ENA_PIN SERVO1_PIN   // (6) Pin should have a pullup/pulldown!
283
-  #define SPINDLE_LASER_PWM_PIN SERVO3_PIN   // (4) MUST BE HARDWARE PWM
284
-  #define SPINDLE_DIR_PIN       SERVO2_PIN   // (5)
282
+  #define SPINDLE_LASER_ENA_PIN       SERVO1_PIN  // (6) Pin should have a pullup/pulldown!
283
+  #define SPINDLE_LASER_PWM_PIN       SERVO3_PIN  // (4) MUST BE HARDWARE PWM
284
+  #define SPINDLE_DIR_PIN             SERVO2_PIN  // (5)
285 285
 #endif
286 286
 
287 287
 //
288 288
 // Průša i3 MK2 Multiplexer Support
289 289
 //
290 290
 #if SERIAL_PORT != 0 && SERIAL_PORT_2 != 0
291
-  #define E_MUX0_PIN       P0_03   // ( 0) Z_CS_PIN
292
-  #define E_MUX1_PIN       P0_02   // ( 1) E0_CS_PIN
291
+  #define E_MUX0_PIN                       P0_03  // ( 0) Z_CS_PIN
292
+  #define E_MUX1_PIN                       P0_02  // ( 1) E0_CS_PIN
293 293
 #endif
294
-#define E_MUX2_PIN         P0_26   // (63) E1_CS_PIN
294
+#define E_MUX2_PIN                         P0_26  // (63) E1_CS_PIN
295 295
 
296 296
 /**
297 297
  * LCD / Controller
@@ -322,101 +322,101 @@
322 322
   // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
323 323
   // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
324 324
 
325
-  #define BEEPER_PIN       P2_11   // J3-3 & AUX-4
325
+  #define BEEPER_PIN                       P2_11  // J3-3 & AUX-4
326 326
 
327
-  #define BTN_EN1          P0_16   // J3-7 & AUX-4
328
-  #define BTN_EN2          P1_23   // J3-5 & AUX-4
329
-  #define BTN_ENC          P3_25   // J3-4 & AUX-4
327
+  #define BTN_EN1                          P0_16  // J3-7 & AUX-4
328
+  #define BTN_EN2                          P1_23  // J3-5 & AUX-4
329
+  #define BTN_ENC                          P3_25  // J3-4 & AUX-4
330 330
 
331
-  #define LCD_PINS_RS      P0_15   // J3-9 & AUX-4 (CS)
332
-  #define LCD_PINS_ENABLE  P0_18   // J3-10 & AUX-3 (SID, MOSI)
333
-  #define LCD_PINS_D4      P2_06   // J3-8 & AUX-3 (SCK, CLK)
331
+  #define LCD_PINS_RS                      P0_15  // J3-9 & AUX-4 (CS)
332
+  #define LCD_PINS_ENABLE                  P0_18  // J3-10 & AUX-3 (SID, MOSI)
333
+  #define LCD_PINS_D4                      P2_06  // J3-8 & AUX-3 (SCK, CLK)
334 334
 
335 335
 #elif HAS_SPI_LCD
336 336
 
337
-  //#define SCK_PIN          P0_15   // (52)  system defined J3-9 & AUX-3
338
-  //#define MISO_PIN         P0_17   // (50)  system defined J3-10 & AUX-3
339
-  //#define MOSI_PIN         P0_18   // (51)  system defined J3-10 & AUX-3
340
-  //#define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS)
337
+  //#define SCK_PIN                        P0_15  // (52)  system defined J3-9 & AUX-3
338
+  //#define MISO_PIN                       P0_17  // (50)  system defined J3-10 & AUX-3
339
+  //#define MOSI_PIN                       P0_18  // (51)  system defined J3-10 & AUX-3
340
+  //#define SS_PIN                         P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS)
341 341
 
342 342
   #if ENABLED(FYSETC_MINI_12864)
343
-    #define BEEPER_PIN     P1_01
344
-    #define BTN_ENC        P1_04
343
+    #define BEEPER_PIN                     P1_01
344
+    #define BTN_ENC                        P1_04
345 345
   #else
346
-    #define BEEPER_PIN     P1_30   // (37) not 5V tolerant
347
-    #define BTN_ENC        P2_11   // (35) J3-3 & AUX-4
346
+    #define BEEPER_PIN                     P1_30  // (37) not 5V tolerant
347
+    #define BTN_ENC                        P2_11  // (35) J3-3 & AUX-4
348 348
   #endif
349 349
 
350
-  #define BTN_EN1          P3_26   // (31) J3-2 & AUX-4
351
-  #define BTN_EN2          P3_25   // (33) J3-4 & AUX-4
350
+  #define BTN_EN1                          P3_26  // (31) J3-2 & AUX-4
351
+  #define BTN_EN2                          P3_25  // (33) J3-4 & AUX-4
352 352
 
353
-  #define SD_DETECT_PIN    P1_31   // (49) J3-1 & AUX-3 (NOT 5V tolerant)
354
-  #define KILL_PIN         P1_22   // (41) J5-4 & AUX-4
355
-  #define LCD_PINS_RS      P0_16   // (16) J3-7 & AUX-4
356
-  #define LCD_SDSS         P0_16   // (16) J3-7 & AUX-4
353
+  #define SD_DETECT_PIN                    P1_31  // (49) J3-1 & AUX-3 (NOT 5V tolerant)
354
+  #define KILL_PIN                         P1_22  // (41) J5-4 & AUX-4
355
+  #define LCD_PINS_RS                      P0_16  // (16) J3-7 & AUX-4
356
+  #define LCD_SDSS                         P0_16  // (16) J3-7 & AUX-4
357 357
 
358 358
   #if ENABLED(NEWPANEL)
359 359
     #if ENABLED(REPRAPWORLD_KEYPAD)
360
-      #define SHIFT_OUT    P0_18   // (51) (MOSI) J3-10 & AUX-3
361
-      #define SHIFT_CLK    P0_15   // (52) (SCK)  J3-9 & AUX-3
362
-      #define SHIFT_LD     P1_31   // (49)        J3-1 & AUX-3 (NOT 5V tolerant)
360
+      #define SHIFT_OUT                    P0_18  // (51) (MOSI) J3-10 & AUX-3
361
+      #define SHIFT_CLK                    P0_15  // (52) (SCK)  J3-9 & AUX-3
362
+      #define SHIFT_LD                     P1_31  // (49)        J3-1 & AUX-3 (NOT 5V tolerant)
363 363
     #endif
364 364
   #else
365
-    //#define SHIFT_CLK      P3_26   // (31)  J3-2 & AUX-4
366
-    //#define SHIFT_LD       P3_25   // (33)  J3-4 & AUX-4
367
-    //#define SHIFT_OUT      P2_11   // (35)  J3-3 & AUX-4
368
-    //#define SHIFT_EN       P1_22   // (41)  J5-4 & AUX-4
365
+    //#define SHIFT_CLK                    P3_26  // (31)  J3-2 & AUX-4
366
+    //#define SHIFT_LD                     P3_25  // (33)  J3-4 & AUX-4
367
+    //#define SHIFT_OUT                    P2_11  // (35)  J3-3 & AUX-4
368
+    //#define SHIFT_EN                     P1_22  // (41)  J5-4 & AUX-4
369 369
   #endif
370 370
 
371 371
   #if ANY(VIKI2, miniVIKI)
372 372
     // #define LCD_SCREEN_ROT_180
373 373
 
374
-    #define DOGLCD_CS      P0_16   // (16)
375
-    #define DOGLCD_A0      P2_06   // (59) J3-8 & AUX-2
376
-    #define DOGLCD_SCK     SCK_PIN
377
-    #define DOGLCD_MOSI    MOSI_PIN
374
+    #define DOGLCD_CS                      P0_16  // (16)
375
+    #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
376
+    #define DOGLCD_SCK                   SCK_PIN
377
+    #define DOGLCD_MOSI                 MOSI_PIN
378 378
 
379
-    #define STAT_LED_BLUE_PIN P0_26 //(63)  may change if cable changes
380
-    #define STAT_LED_RED_PIN P1_21 // ( 6)  may change if cable changes
379
+    #define STAT_LED_BLUE_PIN              P0_26  //(63)  may change if cable changes
380
+    #define STAT_LED_RED_PIN               P1_21  // ( 6)  may change if cable changes
381 381
   #else
382 382
 
383 383
     #if ENABLED(FYSETC_MINI_12864)
384
-      #define DOGLCD_SCK   P0_15
385
-      #define DOGLCD_MOSI  P0_18
384
+      #define DOGLCD_SCK                   P0_15
385
+      #define DOGLCD_MOSI                  P0_18
386 386
 
387 387
       // EXP1 on LCD adapter is not usable - using Ethernet connector instead
388
-      #define DOGLCD_CS    P1_09
389
-      #define DOGLCD_A0    P1_14
390
-      //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
391
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
388
+      #define DOGLCD_CS                    P1_09
389
+      #define DOGLCD_A0                    P1_14
390
+      //#define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
391
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
392 392
 
393
-      #define LCD_RESET_PIN P0_16   // Must be high or open for LCD to operate normally.
393
+      #define LCD_RESET_PIN                P0_16  // Must be high or open for LCD to operate normally.
394 394
 
395 395
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
396 396
         #ifndef RGB_LED_R_PIN
397
-          #define RGB_LED_R_PIN P1_00
397
+          #define RGB_LED_R_PIN            P1_00
398 398
         #endif
399 399
         #ifndef RGB_LED_G_PIN
400
-          #define RGB_LED_G_PIN P1_01
400
+          #define RGB_LED_G_PIN            P1_01
401 401
         #endif
402 402
         #ifndef RGB_LED_B_PIN
403
-          #define RGB_LED_B_PIN P1_08
403
+          #define RGB_LED_B_PIN            P1_08
404 404
         #endif
405 405
       #elif ENABLED(FYSETC_MINI_12864_2_1)
406
-        #define NEOPIXEL_PIN P1_00
406
+        #define NEOPIXEL_PIN               P1_00
407 407
       #endif
408 408
     #else
409
-      #define DOGLCD_CS    P0_26   // (63) J5-3 & AUX-2
410
-      #define DOGLCD_A0    P2_06   // (59) J3-8 & AUX-2
409
+      #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
410
+      #define DOGLCD_A0                    P2_06  // (59) J3-8 & AUX-2
411 411
     #endif
412 412
 
413
-    #define LCD_BACKLIGHT_PIN P0_16 //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
414
-    #define LCD_PINS_ENABLE P0_18  // (51) (MOSI) J3-10 & AUX-3
415
-    #define LCD_PINS_D4    P0_15   // (52) (SCK)  J3-9 & AUX-3
413
+    #define LCD_BACKLIGHT_PIN              P0_16  //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
414
+    #define LCD_PINS_ENABLE                P0_18  // (51) (MOSI) J3-10 & AUX-3
415
+    #define LCD_PINS_D4                    P0_15  // (52) (SCK)  J3-9 & AUX-3
416 416
     #if ENABLED(ULTIPANEL)
417
-      #define LCD_PINS_D5  P1_17   // (71) ENET_MDIO
418
-      #define LCD_PINS_D6  P1_14   // (73) ENET_RX_ER
419
-      #define LCD_PINS_D7  P1_10   // (75) ENET_RXD1
417
+      #define LCD_PINS_D5                  P1_17  // (71) ENET_MDIO
418
+      #define LCD_PINS_D6                  P1_14  // (73) ENET_RX_ER
419
+      #define LCD_PINS_D7                  P1_10  // (75) ENET_RXD1
420 420
     #endif
421 421
   #endif
422 422
 
@@ -434,38 +434,38 @@
434 434
 // Ethernet pins
435 435
 //
436 436
 #if DISABLED(ULTIPANEL)
437
-  #define ENET_MDIO        P1_17   // (71)  J12-4
438
-  #define ENET_RX_ER       P1_14   // (73)  J12-6
439
-  #define ENET_RXD1        P1_10   // (75)  J12-8
437
+  #define ENET_MDIO                        P1_17  // (71)  J12-4
438
+  #define ENET_RX_ER                       P1_14  // (73)  J12-6
439
+  #define ENET_RXD1                        P1_10  // (75)  J12-8
440 440
 #endif
441
-#define ENET_MOC           P1_16   // (70)  J12-3
442
-#define REF_CLK            P1_15   // (72)  J12-5
443
-#define ENET_RXD0          P1_09   // (74)  J12-7
444
-#define ENET_CRS           P1_08   // (76)  J12-9
445
-#define ENET_TX_EN         P1_04   // (77)  J12-10
446
-#define ENET_TXD0          P1_00   // (78)  J12-11
447
-#define ENET_TXD1          P1_01   // (79)  J12-12
441
+#define ENET_MOC                           P1_16  // (70)  J12-3
442
+#define REF_CLK                            P1_15  // (72)  J12-5
443
+#define ENET_RXD0                          P1_09  // (74)  J12-7
444
+#define ENET_CRS                           P1_08  // (76)  J12-9
445
+#define ENET_TX_EN                         P1_04  // (77)  J12-10
446
+#define ENET_TXD0                          P1_00  // (78)  J12-11
447
+#define ENET_TXD1                          P1_01  // (79)  J12-12
448 448
 
449 449
 //
450 450
 // SD Support
451 451
 //
452 452
 #ifndef SDCARD_CONNECTION
453
-  #define SDCARD_CONNECTION ONBOARD
453
+  #define SDCARD_CONNECTION              ONBOARD
454 454
 #endif
455 455
 
456
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
456
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
457 457
 
458 458
 #if SD_CONNECTION_IS(LCD)
459
-  #define SCK_PIN          P0_15   // (52)  system defined J3-9 & AUX-3
460
-  #define MISO_PIN         P0_17   // (50)  system defined J3-10 & AUX-3
461
-  #define MOSI_PIN         P0_18   // (51)  system defined J3-10 & AUX-3
462
-  #define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
459
+  #define SCK_PIN                          P0_15  // (52)  system defined J3-9 & AUX-3
460
+  #define MISO_PIN                         P0_17  // (50)  system defined J3-10 & AUX-3
461
+  #define MOSI_PIN                         P0_18  // (51)  system defined J3-10 & AUX-3
462
+  #define SS_PIN                           P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
463 463
 #elif SD_CONNECTION_IS(ONBOARD)
464 464
   #undef SD_DETECT_PIN
465
-  #define SCK_PIN          P0_07
466
-  #define MISO_PIN         P0_08
467
-  #define MOSI_PIN         P0_09
468
-  #define SS_PIN           ONBOARD_SD_CS_PIN
465
+  #define SCK_PIN                          P0_07
466
+  #define MISO_PIN                         P0_08
467
+  #define MOSI_PIN                         P0_09
468
+  #define SS_PIN               ONBOARD_SD_CS_PIN
469 469
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
470 470
   #error "No custom SD drive cable defined for this board."
471 471
 #endif

+ 45
- 46
Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h Parādīt failu

@@ -41,80 +41,79 @@
41 41
 //
42 42
 // Servos
43 43
 //
44
-#define SERVO0_PIN        P1_23
44
+#define SERVO0_PIN                         P1_23
45 45
 
46 46
 //
47 47
 // Limit Switches
48 48
 //
49
-#define X_MIN_PIN          P1_28
50
-#define X_MAX_PIN          P1_25
51
-#define Y_MIN_PIN          P2_11
52
-#define Y_MAX_PIN          -1
53
-#define Z_MIN_PIN          P1_27
54
-#define Z_MAX_PIN          -1
55
-#define Z_PROBE            P1_22
49
+#define X_MIN_PIN                          P1_28
50
+#define X_MAX_PIN                          P1_25
51
+#define Y_MIN_PIN                          P2_11
52
+#define Y_MAX_PIN                          -1
53
+#define Z_MIN_PIN                          P1_27
54
+#define Z_MAX_PIN                          -1
55
+#define Z_PROBE                            P1_22
56 56
 
57 57
 //
58 58
 // Steppers
59 59
 //
60
-#define X_STEP_PIN         P2_00
61
-#define X_DIR_PIN          P0_05
62
-#define X_ENABLE_PIN       P0_04
60
+#define X_STEP_PIN                         P2_00
61
+#define X_DIR_PIN                          P0_05
62
+#define X_ENABLE_PIN                       P0_04
63 63
 
64
-#define Y_STEP_PIN         P2_01
65
-#define Y_DIR_PIN          P0_11
66
-#define Y_ENABLE_PIN       P0_10
64
+#define Y_STEP_PIN                         P2_01
65
+#define Y_DIR_PIN                          P0_11
66
+#define Y_ENABLE_PIN                       P0_10
67 67
 
68
-#define Z_STEP_PIN         P2_02
69
-#define Z_DIR_PIN          P0_20
70
-#define Z_ENABLE_PIN       P0_19
68
+#define Z_STEP_PIN                         P2_02
69
+#define Z_DIR_PIN                          P0_20
70
+#define Z_ENABLE_PIN                       P0_19
71 71
 
72
-#define E0_STEP_PIN        P2_03
73
-#define E0_DIR_PIN         P0_22
74
-#define E0_ENABLE_PIN      P0_21
72
+#define E0_STEP_PIN                        P2_03
73
+#define E0_DIR_PIN                         P0_22
74
+#define E0_ENABLE_PIN                      P0_21
75 75
 
76
-#define E1_STEP_PIN        P2_08
77
-#define E1_DIR_PIN         P2_13
78
-#define E1_ENABLE_PIN      P4_29
76
+#define E1_STEP_PIN                        P2_08
77
+#define E1_DIR_PIN                         P2_13
78
+#define E1_ENABLE_PIN                      P4_29
79 79
 
80 80
 //
81 81
 // Temperature Sensors
82 82
 // 3.3V max when defined as an analog input
83 83
 //
84
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
85
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
86
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
87
-
84
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
85
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
86
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
88 87
 
89 88
 //
90 89
 // Heaters / Fans
91 90
 //
92 91
 
93
-#define HEATER_BED_PIN     P2_05
94
-#define HEATER_BED2_PIN    P2_04
95
-#define HEATER_0_PIN       P2_07
96
-#define HEATER_1_PIN       P2_06
92
+#define HEATER_BED_PIN                     P2_05
93
+#define HEATER_BED2_PIN                    P2_04
94
+#define HEATER_0_PIN                       P2_07
95
+#define HEATER_1_PIN                       P2_06
97 96
 #ifndef FAN_PIN
98
-  #define FAN_PIN          P1_24
97
+  #define FAN_PIN                          P1_24
99 98
 #endif
100
-#define FAN1_PIN           P1_26
99
+#define FAN1_PIN                           P1_26
101 100
 
102 101
 //
103 102
 // Display
104 103
 //
105 104
 
106 105
 #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
107
-    #define LCD_PINS_RS         P0_16
108
-    #define LCD_PINS_ENABLE     P0_18
109
-    #define LCD_PINS_D4         P0_15
110
-    #define LCD_PINS_D5         P1_00
111
-    #define LCD_PINS_D6         P1_01
112
-    #define LCD_PINS_D7         P1_04
113
-    #define BEEPER_PIN          P1_31
114
-
115
-    #define BTN_EN1             P3_25
116
-    #define BTN_EN2             P3_26
117
-    #define BTN_ENC             P1_30
118
-
119
-    #define SD_DETECT_PIN       -1
106
+    #define LCD_PINS_RS                    P0_16
107
+    #define LCD_PINS_ENABLE                P0_18
108
+    #define LCD_PINS_D4                    P0_15
109
+    #define LCD_PINS_D5                    P1_00
110
+    #define LCD_PINS_D6                    P1_01
111
+    #define LCD_PINS_D7                    P1_04
112
+    #define BEEPER_PIN                     P1_31
113
+
114
+    #define BTN_EN1                        P3_25
115
+    #define BTN_EN2                        P3_26
116
+    #define BTN_ENC                        P1_30
117
+
118
+    #define SD_DETECT_PIN                  -1
120 119
 #endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER

+ 45
- 46
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h Parādīt failu

@@ -41,93 +41,92 @@
41 41
 //
42 42
 // Servos
43 43
 //
44
-#define SERVO0_PIN         P1_23
44
+#define SERVO0_PIN                         P1_23
45 45
 
46 46
 //
47 47
 // Limit Switches
48 48
 //
49
-#define X_MIN_PIN          P1_24
50
-#define X_MAX_PIN          P1_27
51
-#define Y_MIN_PIN          P1_25
52
-#define Y_MAX_PIN          P1_28
53
-#define Z_MIN_PIN          P1_26
54
-#define Z_MAX_PIN          P1_29
49
+#define X_MIN_PIN                          P1_24
50
+#define X_MAX_PIN                          P1_27
51
+#define Y_MIN_PIN                          P1_25
52
+#define Y_MAX_PIN                          P1_28
53
+#define Z_MIN_PIN                          P1_26
54
+#define Z_MAX_PIN                          P1_29
55 55
 
56 56
 //
57 57
 // Steppers
58 58
 //
59
-#define X_STEP_PIN         P2_01
60
-#define X_DIR_PIN          P0_11
61
-#define X_ENABLE_PIN       P0_10
59
+#define X_STEP_PIN                         P2_01
60
+#define X_DIR_PIN                          P0_11
61
+#define X_ENABLE_PIN                       P0_10
62 62
 #ifndef X_CS_PIN
63
-  #define X_CS_PIN         P0_10 // BSD2660 default
63
+  #define X_CS_PIN                         P0_10  // BSD2660 default
64 64
 #endif
65 65
 
66
-#define Y_STEP_PIN         P2_02
67
-#define Y_DIR_PIN          P0_20
68
-#define Y_ENABLE_PIN       P0_19
66
+#define Y_STEP_PIN                         P2_02
67
+#define Y_DIR_PIN                          P0_20
68
+#define Y_ENABLE_PIN                       P0_19
69 69
 #ifndef Y_CS_PIN
70
-  #define Y_CS_PIN         P0_19 // BSD2660 default
70
+  #define Y_CS_PIN                         P0_19  // BSD2660 default
71 71
 #endif
72 72
 
73
-#define Z_STEP_PIN         P2_03
74
-#define Z_DIR_PIN          P0_22
75
-#define Z_ENABLE_PIN       P0_21
73
+#define Z_STEP_PIN                         P2_03
74
+#define Z_DIR_PIN                          P0_22
75
+#define Z_ENABLE_PIN                       P0_21
76 76
 #ifndef Z_CS_PIN
77
-  #define Z_CS_PIN         P0_21 // BSD2660 default
77
+  #define Z_CS_PIN                         P0_21  // BSD2660 default
78 78
 #endif
79 79
 
80
-#define E0_STEP_PIN        P2_00
81
-#define E0_DIR_PIN         P0_05
82
-#define E0_ENABLE_PIN      P0_04
80
+#define E0_STEP_PIN                        P2_00
81
+#define E0_DIR_PIN                         P0_05
82
+#define E0_ENABLE_PIN                      P0_04
83 83
 #ifndef E0_CS_PIN
84
-  #define E0_CS_PIN        P0_04 // BSD2660 default
84
+  #define E0_CS_PIN                        P0_04  // BSD2660 default
85 85
 #endif
86 86
 
87
-#define E1_STEP_PIN        P2_08
88
-#define E1_DIR_PIN         P2_13
89
-#define E1_ENABLE_PIN      P4_29
87
+#define E1_STEP_PIN                        P2_08
88
+#define E1_DIR_PIN                         P2_13
89
+#define E1_ENABLE_PIN                      P4_29
90 90
 #ifndef E1_CS_PIN
91
-  #define E1_CS_PIN        P4_29 // BSD2660 default
91
+  #define E1_CS_PIN                        P4_29  // BSD2660 default
92 92
 #endif
93 93
 
94 94
 //
95 95
 // Temperature Sensors
96 96
 // 3.3V max when defined as an analog input
97 97
 //
98
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
99
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
100
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
101
-
98
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
99
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
100
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
102 101
 
103 102
 //
104 103
 // Heaters / Fans
105 104
 //
106 105
 
107
-#define HEATER_BED_PIN     P2_07
108
-#define HEATER_0_PIN       P2_04
109
-#define HEATER_1_PIN       P2_05
106
+#define HEATER_BED_PIN                     P2_07
107
+#define HEATER_0_PIN                       P2_04
108
+#define HEATER_1_PIN                       P2_05
110 109
 #ifndef FAN_PIN
111
-  #define FAN_PIN          P0_26
110
+  #define FAN_PIN                          P0_26
112 111
 #endif
113
-#define FAN1_PIN           P1_22
112
+#define FAN1_PIN                           P1_22
114 113
 
115 114
 //
116 115
 // Display
117 116
 //
118 117
 
119 118
 #if ANY(VIKI2, miniVIKI)
120
-  #define BEEPER_PIN       P1_31
121
-  #define DOGLCD_A0        P2_06
122
-  #define DOGLCD_CS        P0_16
119
+  #define BEEPER_PIN                       P1_31
120
+  #define DOGLCD_A0                        P2_06
121
+  #define DOGLCD_CS                        P0_16
123 122
 
124
-  #define BTN_EN1          P3_25
125
-  #define BTN_EN2          P3_26
126
-  #define BTN_ENC          P2_11
123
+  #define BTN_EN1                          P3_25
124
+  #define BTN_EN2                          P3_26
125
+  #define BTN_ENC                          P2_11
127 126
 
128
-  #define SD_DETECT_PIN    P1_18
129
-  #define SDSS             P1_21
127
+  #define SD_DETECT_PIN                    P1_18
128
+  #define SDSS                             P1_21
130 129
 
131
-  #define STAT_LED_RED_PIN P1_19
132
-  #define STAT_LED_BLUE_PIN P1_20
130
+  #define STAT_LED_RED_PIN                 P1_19
131
+  #define STAT_LED_BLUE_PIN                P1_20
133 132
 #endif

+ 73
- 73
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h Parādīt failu

@@ -37,74 +37,74 @@
37 37
 //
38 38
 // LED
39 39
 //
40
-#define LED_PIN            P1_18
40
+#define LED_PIN                            P1_18
41 41
 
42 42
 //
43 43
 // Servos
44 44
 //
45
-#define SERVO0_PIN         P1_29
45
+#define SERVO0_PIN                         P1_29
46 46
 
47 47
 //
48 48
 // Limit Switches
49 49
 //
50
-#define X_STOP_PIN         P1_24
51
-#define Y_STOP_PIN         P1_26
52
-#define Z_STOP_PIN         P1_28
50
+#define X_STOP_PIN                         P1_24
51
+#define Y_STOP_PIN                         P1_26
52
+#define Z_STOP_PIN                         P1_28
53 53
 
54 54
 #ifndef FIL_RUNOUT_PIN
55
-  #define FIL_RUNOUT_PIN   P2_04
55
+  #define FIL_RUNOUT_PIN                   P2_04
56 56
 #endif
57 57
 
58 58
 #ifndef FILWIDTH_PIN
59
-  #define FILWIDTH_PIN         P0_25_A2   // Analog Input (P0_25)
59
+  #define FILWIDTH_PIN                  P0_25_A2  // Analog Input (P0_25)
60 60
 #endif
61 61
 
62 62
 //
63 63
 // Steppers
64 64
 //
65
-#define X_STEP_PIN         P2_01
66
-#define X_DIR_PIN          P0_11
67
-#define X_ENABLE_PIN       P0_10
65
+#define X_STEP_PIN                         P2_01
66
+#define X_DIR_PIN                          P0_11
67
+#define X_ENABLE_PIN                       P0_10
68 68
 
69
-#define Y_STEP_PIN         P2_02
70
-#define Y_DIR_PIN          P0_20
71
-#define Y_ENABLE_PIN       P0_19
69
+#define Y_STEP_PIN                         P2_02
70
+#define Y_DIR_PIN                          P0_20
71
+#define Y_ENABLE_PIN                       P0_19
72 72
 
73
-#define Z_STEP_PIN         P2_03
74
-#define Z_DIR_PIN          P0_22
75
-#define Z_ENABLE_PIN       P0_21
73
+#define Z_STEP_PIN                         P2_03
74
+#define Z_DIR_PIN                          P0_22
75
+#define Z_ENABLE_PIN                       P0_21
76 76
 
77
-#define E0_STEP_PIN        P2_00
78
-#define E0_DIR_PIN         P0_05
79
-#define E0_ENABLE_PIN      P0_04
77
+#define E0_STEP_PIN                        P2_00
78
+#define E0_DIR_PIN                         P0_05
79
+#define E0_ENABLE_PIN                      P0_04
80 80
 
81 81
 //
82 82
 // DIGIPOT slave addresses
83 83
 //
84 84
 #ifndef DIGIPOT_I2C_ADDRESS_A
85
-  #define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for first DIGIPOT
85
+  #define DIGIPOT_I2C_ADDRESS_A 0x2C              // unshifted slave address for first DIGIPOT
86 86
 #endif
87 87
 
88 88
 #ifndef DIGIPOT_I2C_ADDRESS_B
89
-  #define DIGIPOT_I2C_ADDRESS_B 0x2E   // unshifted slave address for second DIGIPOT
89
+  #define DIGIPOT_I2C_ADDRESS_B 0x2E              // unshifted slave address for second DIGIPOT
90 90
 #endif
91 91
 
92 92
 //
93 93
 // Temperature Sensors
94 94
 // 3.3V max when defined as an analog input
95 95
 //
96
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
97
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
96
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
97
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
98 98
 
99 99
 //
100 100
 // Heaters / Fans
101 101
 //
102
-#define HEATER_BED_PIN     P2_07
103
-#define HEATER_0_PIN       P2_05
102
+#define HEATER_BED_PIN                     P2_07
103
+#define HEATER_0_PIN                       P2_05
104 104
 #ifndef FAN_PIN
105
-  #define FAN_PIN          P0_26
105
+  #define FAN_PIN                          P0_26
106 106
 #endif
107
-#define FAN1_PIN           P1_25
107
+#define FAN1_PIN                           P1_25
108 108
 
109 109
 //
110 110
 // Display
@@ -118,61 +118,61 @@
118 118
     // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
119 119
     // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
120 120
 
121
-    #define BEEPER_PIN     P2_11   // J3-3 & AUX-4
121
+    #define BEEPER_PIN                     P2_11  // J3-3 & AUX-4
122 122
 
123
-    #define BTN_EN1        P0_16   // J3-7 & AUX-4
124
-    #define BTN_EN2        P1_23   // J3-5 & AUX-4
125
-    #define BTN_ENC        P3_25   // J3-4 & AUX-4
123
+    #define BTN_EN1                        P0_16  // J3-7 & AUX-4
124
+    #define BTN_EN2                        P1_23  // J3-5 & AUX-4
125
+    #define BTN_ENC                        P3_25  // J3-4 & AUX-4
126 126
 
127
-    #define LCD_PINS_RS    P0_15   // J3-9 & AUX-4 (CS)
128
-    #define LCD_PINS_ENABLE P0_18  // J3-10 & AUX-3 (SID, MOSI)
129
-    #define LCD_PINS_D4    P2_06   // J3-8 & AUX-3 (SCK, CLK)
127
+    #define LCD_PINS_RS                    P0_15  // J3-9 & AUX-4 (CS)
128
+    #define LCD_PINS_ENABLE                P0_18  // J3-10 & AUX-3 (SID, MOSI)
129
+    #define LCD_PINS_D4                    P2_06  // J3-8 & AUX-3 (SCK, CLK)
130 130
 
131 131
   #else
132 132
 
133
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
134
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
135
-    #define BTN_ENC        P2_11   // (35) J3-3 & AUX-4
133
+    #define BTN_EN1                        P3_26  // (31) J3-2 & AUX-4
134
+    #define BTN_EN2                        P3_25  // (33) J3-4 & AUX-4
135
+    #define BTN_ENC                        P2_11  // (35) J3-3 & AUX-4
136 136
 
137
-    #define SD_DETECT_PIN  P1_31   // (49) not 5V tolerant   J3-1 & AUX-3
138
-    #define KILL_PIN       P1_22   // (41) J5-4 & AUX-4
139
-    #define LCD_PINS_RS    P0_16   // (16) J3-7 & AUX-4
140
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
141
-    #define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
142
-    #define LCD_PINS_ENABLE P0_18  // (51) (MOSI) J3-10 & AUX-3
143
-    #define LCD_PINS_D4    P0_15   // (52) (SCK)  J3-9 & AUX-3
137
+    #define SD_DETECT_PIN                  P1_31  // (49) not 5V tolerant   J3-1 & AUX-3
138
+    #define KILL_PIN                       P1_22  // (41) J5-4 & AUX-4
139
+    #define LCD_PINS_RS                    P0_16  // (16) J3-7 & AUX-4
140
+    #define LCD_SDSS                       P0_16  // (16) J3-7 & AUX-4
141
+    #define LCD_BACKLIGHT_PIN              P0_16  // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
142
+    #define LCD_PINS_ENABLE                P0_18  // (51) (MOSI) J3-10 & AUX-3
143
+    #define LCD_PINS_D4                    P0_15  // (52) (SCK)  J3-9 & AUX-3
144 144
 
145
-    #define DOGLCD_A0      P2_06   // (59) J3-8 & AUX-2
145
+    #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
146 146
 
147 147
     #if ENABLED(REPRAPWORLD_KEYPAD)
148
-      #define SHIFT_OUT    P0_18   // (51)  (MOSI) J3-10 & AUX-3
149
-      #define SHIFT_CLK    P0_15   // (52)  (SCK)  J3-9 & AUX-3
150
-      #define SHIFT_LD     P1_31   // (49)  not 5V tolerant   J3-1 & AUX-3
148
+      #define SHIFT_OUT                    P0_18  // (51)  (MOSI) J3-10 & AUX-3
149
+      #define SHIFT_CLK                    P0_15  // (52)  (SCK)  J3-9 & AUX-3
150
+      #define SHIFT_LD                     P1_31  // (49)  not 5V tolerant   J3-1 & AUX-3
151 151
     #elif DISABLED(NEWPANEL)
152
-      //#define SHIFT_OUT  P2_11   // (35)  J3-3 & AUX-4
153
-      //#define SHIFT_CLK  P3_26   // (31)  J3-2 & AUX-4
154
-      //#define SHIFT_LD   P3_25   // (33)  J3-4 & AUX-4
155
-      //#define SHIFT_EN   P1_22   // (41)  J5-4 & AUX-4
152
+      //#define SHIFT_OUT                  P2_11  // (35)  J3-3 & AUX-4
153
+      //#define SHIFT_CLK                  P3_26  // (31)  J3-2 & AUX-4
154
+      //#define SHIFT_LD                   P3_25  // (33)  J3-4 & AUX-4
155
+      //#define SHIFT_EN                   P1_22  // (41)  J5-4 & AUX-4
156 156
     #endif
157 157
 
158 158
     #if ANY(VIKI2, miniVIKI)
159 159
       //#define LCD_SCREEN_ROT_180
160 160
 
161
-      #define BEEPER_PIN   P1_30   // (37) may change if cable changes
162
-      #define DOGLCD_CS    P0_26   // (63) J5-3 & AUX-2
163
-      #define DOGLCD_SCK   SCK_PIN
164
-      #define DOGLCD_MOSI  MOSI_PIN
161
+      #define BEEPER_PIN                   P1_30  // (37) may change if cable changes
162
+      #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
163
+      #define DOGLCD_SCK                 SCK_PIN
164
+      #define DOGLCD_MOSI               MOSI_PIN
165 165
 
166
-      #define STAT_LED_BLUE_PIN P0_26   // (63)  may change if cable changes
167
-      #define STAT_LED_RED_PIN  P1_21   // ( 6)  may change if cable changes
166
+      #define STAT_LED_BLUE_PIN            P0_26  // (63)  may change if cable changes
167
+      #define STAT_LED_RED_PIN             P1_21  // ( 6)  may change if cable changes
168 168
     #else
169 169
       #if ENABLED(ULTIPANEL)
170
-        #define LCD_PINS_D5 P1_17   // (71) ENET_MDIO
171
-        #define LCD_PINS_D6 P1_14   // (73) ENET_RX_ER
172
-        #define LCD_PINS_D7 P1_10   // (75) ENET_RXD1
170
+        #define LCD_PINS_D5                P1_17  // (71) ENET_MDIO
171
+        #define LCD_PINS_D6                P1_14  // (73) ENET_RX_ER
172
+        #define LCD_PINS_D7                P1_10  // (75) ENET_RXD1
173 173
       #endif
174
-      #define BEEPER_PIN   P1_30   // (37) not 5V tolerant
175
-      #define DOGLCD_CS    P0_16   // (16)
174
+      #define BEEPER_PIN                   P1_30  // (37) not 5V tolerant
175
+      #define DOGLCD_CS                    P0_16  // (16)
176 176
     #endif
177 177
 
178 178
     #if ENABLED(MINIPANEL)
@@ -199,22 +199,22 @@
199 199
 // SD Support
200 200
 //
201 201
 #ifndef SDCARD_CONNECTION
202
-  #define SDCARD_CONNECTION ONBOARD
202
+  #define SDCARD_CONNECTION              ONBOARD
203 203
 #endif
204 204
 
205
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
205
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
206 206
 
207 207
 #if SD_CONNECTION_IS(LCD)
208
-  #define SCK_PIN          P0_15
209
-  #define MISO_PIN         P0_17
210
-  #define MOSI_PIN         P0_18
211
-  #define SS_PIN           P1_23
208
+  #define SCK_PIN                          P0_15
209
+  #define MISO_PIN                         P0_17
210
+  #define MOSI_PIN                         P0_18
211
+  #define SS_PIN                           P1_23
212 212
 #elif SD_CONNECTION_IS(ONBOARD)
213 213
   #undef SD_DETECT_PIN
214
-  #define SCK_PIN          P0_07
215
-  #define MISO_PIN         P0_08
216
-  #define MOSI_PIN         P0_09
217
-  #define SS_PIN           ONBOARD_SD_CS_PIN
214
+  #define SCK_PIN                          P0_07
215
+  #define MISO_PIN                         P0_08
216
+  #define MOSI_PIN                         P0_09
217
+  #define SS_PIN               ONBOARD_SD_CS_PIN
218 218
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
219 219
   #error "No custom SD drive cable defined for this board."
220 220
 #endif

+ 58
- 58
Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h Parādīt failu

@@ -40,53 +40,53 @@
40 40
 //
41 41
 // Servos
42 42
 //
43
-#define SERVO0_PIN         P1_23
43
+#define SERVO0_PIN                         P1_23
44 44
 
45 45
 //
46 46
 // Limit Switches
47 47
 //
48
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V
49
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V
50
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V
51
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V
52
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V
53
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V
48
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V
49
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V
50
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V
51
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V
52
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V
53
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V
54 54
 
55 55
 //
56 56
 // Steppers
57 57
 //
58
-#define X_STEP_PIN         P2_00
59
-#define X_DIR_PIN          P0_05
60
-#define X_ENABLE_PIN       P0_04
61
-#define X_CS_PIN           P1_10   // Ethernet Expansion - Pin 9
58
+#define X_STEP_PIN                         P2_00
59
+#define X_DIR_PIN                          P0_05
60
+#define X_ENABLE_PIN                       P0_04
61
+#define X_CS_PIN                           P1_10  // Ethernet Expansion - Pin 9
62 62
 
63
-#define Y_STEP_PIN         P2_01
64
-#define Y_DIR_PIN          P0_11
65
-#define Y_ENABLE_PIN       P0_10
66
-#define Y_CS_PIN           P1_09   // Ethernet Expansion - Pin 10
63
+#define Y_STEP_PIN                         P2_01
64
+#define Y_DIR_PIN                          P0_11
65
+#define Y_ENABLE_PIN                       P0_10
66
+#define Y_CS_PIN                           P1_09  // Ethernet Expansion - Pin 10
67 67
 
68
-#define Z_STEP_PIN         P2_02
69
-#define Z_DIR_PIN          P0_20
70
-#define Z_ENABLE_PIN       P0_19
71
-#define Z_CS_PIN           P1_00   // Ethernet Expansion - Pin 11
68
+#define Z_STEP_PIN                         P2_02
69
+#define Z_DIR_PIN                          P0_20
70
+#define Z_ENABLE_PIN                       P0_19
71
+#define Z_CS_PIN                           P1_00  // Ethernet Expansion - Pin 11
72 72
 
73
-#define E0_STEP_PIN        P2_03
74
-#define E0_DIR_PIN         P0_22
75
-#define E0_ENABLE_PIN      P0_21
76
-#define E0_CS_PIN          P1_04   // Ethernet Expansion - Pin 12
73
+#define E0_STEP_PIN                        P2_03
74
+#define E0_DIR_PIN                         P0_22
75
+#define E0_ENABLE_PIN                      P0_21
76
+#define E0_CS_PIN                          P1_04  // Ethernet Expansion - Pin 12
77 77
 
78 78
 //
79 79
 // Default pins for TMC software SPI
80 80
 //
81 81
 #if ENABLED(TMC_USE_SW_SPI)
82 82
   #ifndef TMC_SW_MOSI
83
-    #define TMC_SW_MOSI    P1_16   // Ethernet Expansion - Pin 5
83
+    #define TMC_SW_MOSI                    P1_16  // Ethernet Expansion - Pin 5
84 84
   #endif
85 85
   #ifndef TMC_SW_MISO
86
-    #define TMC_SW_MISO    P1_17   // Ethernet Expansion - Pin 6
86
+    #define TMC_SW_MISO                    P1_17  // Ethernet Expansion - Pin 6
87 87
   #endif
88 88
   #ifndef TMC_SW_SCK
89
-    #define TMC_SW_SCK     P1_08   // Ethernet Expansion - Pin 7
89
+    #define TMC_SW_SCK                     P1_08  // Ethernet Expansion - Pin 7
90 90
   #endif
91 91
 #endif
92 92
 
@@ -94,42 +94,42 @@
94 94
 // Analog Inputs
95 95
 //  3.3V max when defined as an analog input
96 96
 //
97
-#define TEMP_0_PIN          P0_23_A0   // P0_23
98
-#define TEMP_BED_PIN        P0_24_A1   // P0_24
97
+#define TEMP_0_PIN                      P0_23_A0  // P0_23
98
+#define TEMP_BED_PIN                    P0_24_A1  // P0_24
99 99
 
100 100
 //
101 101
 // Heaters / Fans
102 102
 //
103
-#define HEATER_BED_PIN     P2_05
104
-#define HEATER_0_PIN       P2_07   // FET 1
103
+#define HEATER_BED_PIN                     P2_05
104
+#define HEATER_0_PIN                       P2_07  // FET 1
105 105
 #ifndef FAN_PIN
106
-  #define FAN_PIN          P2_06   // FET 3
106
+  #define FAN_PIN                          P2_06  // FET 3
107 107
 #endif
108 108
 
109 109
 //
110 110
 // Auto fans
111 111
 //
112
-#define AUTO_FAN_PIN       P2_04   // FET 4
112
+#define AUTO_FAN_PIN                       P2_04  // FET 4
113 113
 
114
-#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
115
-#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
116
-#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
114
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
115
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
116
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
117 117
 
118 118
 //
119 119
 // Misc. Functions
120 120
 //
121
-#define LED_PIN            P4_28   // Play LED
121
+#define LED_PIN                            P4_28  // Play LED
122 122
 
123 123
 //
124 124
 // M3/M4/M5 - Spindle/Laser Control
125 125
 //
126 126
 #if HAS_CUTTER
127 127
   #undef HEATER_0_PIN
128
-  #define SPINDLE_LASER_ENA_PIN     P2_07   // FET 1
128
+  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
129 129
   #undef HEATER_BED_PIN
130
-  #define SPINDLE_LASER_PWM_PIN     P2_05   // Bed FET
130
+  #define SPINDLE_LASER_PWM_PIN            P2_05  // Bed FET
131 131
   #undef FAN_PIN
132
-  #define SPINDLE_DIR_PIN           P2_06   // FET 3
132
+  #define SPINDLE_DIR_PIN                  P2_06  // FET 3
133 133
 #endif
134 134
 
135 135
 //
@@ -144,18 +144,18 @@
144 144
 //
145 145
 #if HAS_SPI_LCD
146 146
 
147
-  #define BEEPER_PIN       P0_27   // EXP2-7 - open drain
147
+  #define BEEPER_PIN                       P0_27  // EXP2-7 - open drain
148 148
 
149
-  #define BTN_EN1          P3_26   // EXP2-5
150
-  #define BTN_EN2          P3_25   // EXP2-3
151
-  #define BTN_ENC          P1_30   // EXP1-2
149
+  #define BTN_EN1                          P3_26  // EXP2-5
150
+  #define BTN_EN2                          P3_25  // EXP2-3
151
+  #define BTN_ENC                          P1_30  // EXP1-2
152 152
 
153
-  #define LCD_PINS_RS      P0_16   // EXP1-4
154
-  #define LCD_SDSS         P0_28   // EXP2-4
155
-  #define LCD_PINS_ENABLE  P0_18   // EXP1-3
156
-  #define LCD_PINS_D4      P0_15   // EXP1-5
153
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
154
+  #define LCD_SDSS                         P0_28  // EXP2-4
155
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1-3
156
+  #define LCD_PINS_D4                      P0_15  // EXP1-5
157 157
 
158
-  #define KILL_PIN         P2_11   // EXP2-10
158
+  #define KILL_PIN                         P2_11  // EXP2-10
159 159
 
160 160
   #if ENABLED(SDSUPPORT)
161 161
     #error "SDSUPPORT is not currently supported by the Cohesion3D boards"
@@ -166,13 +166,13 @@
166 166
 //
167 167
 // Ethernet pins
168 168
 //
169
-#define ENET_MDIO          P1_17
170
-#define ENET_RX_ER         P1_14
171
-#define ENET_RXD1          P1_10
172
-#define ENET_MOC           P1_16
173
-#define REF_CLK            P1_15
174
-#define ENET_RXD0          P1_09
175
-#define ENET_CRS           P1_08
176
-#define ENET_TX_EN         P1_04
177
-#define ENET_TXD0          P1_00
178
-#define ENET_TXD1          P1_01
169
+#define ENET_MDIO                          P1_17
170
+#define ENET_RX_ER                         P1_14
171
+#define ENET_RXD1                          P1_10
172
+#define ENET_MOC                           P1_16
173
+#define REF_CLK                            P1_15
174
+#define ENET_RXD0                          P1_09
175
+#define ENET_CRS                           P1_08
176
+#define ENET_TX_EN                         P1_04
177
+#define ENET_TXD0                          P1_00
178
+#define ENET_TXD1                          P1_01

+ 103
- 103
Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h Parādīt failu

@@ -40,70 +40,70 @@
40 40
 //
41 41
 // Servos
42 42
 //
43
-#define SERVO0_PIN         P2_04
43
+#define SERVO0_PIN                         P2_04
44 44
 
45 45
 //
46 46
 // Limit Switches
47 47
 //
48
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V
49
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V
50
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V
51
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V
52
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V
53
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V
48
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V
49
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V
50
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V
51
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V
52
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V
53
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V
54 54
 
55 55
 //
56 56
 // Z Probe (when not Z_MIN_PIN)
57 57
 //
58 58
 #ifndef Z_MIN_PROBE_PIN
59
-  #define Z_MIN_PROBE_PIN  P1_29
59
+  #define Z_MIN_PROBE_PIN                  P1_29
60 60
 #endif
61 61
 
62 62
 //
63 63
 // Steppers
64 64
 //
65
-#define X_STEP_PIN         P2_00
66
-#define X_DIR_PIN          P0_05
67
-#define X_ENABLE_PIN       P0_04
68
-#define X_CS_PIN           P1_10   // Ethernet Expansion - Pin 9
69
-
70
-#define Y_STEP_PIN         P2_01
71
-#define Y_DIR_PIN          P0_11
72
-#define Y_ENABLE_PIN       P0_10
73
-#define Y_CS_PIN           P1_09   // Ethernet Expansion - Pin 10
74
-
75
-#define Z_STEP_PIN         P2_02
76
-#define Z_DIR_PIN          P0_20
77
-#define Z_ENABLE_PIN       P0_19
78
-#define Z_CS_PIN           P1_00   // Ethernet Expansion - Pin 11
79
-
80
-#define E0_STEP_PIN        P2_03
81
-#define E0_DIR_PIN         P0_22
82
-#define E0_ENABLE_PIN      P0_21
83
-#define E0_CS_PIN          P1_04   // Ethernet Expansion - Pin 12
84
-
85
-#define E1_STEP_PIN        P2_08
86
-#define E1_DIR_PIN         P2_13
87
-#define E1_ENABLE_PIN      P4_29
88
-#define E1_CS_PIN          P1_01   // Ethernet Expansion - Pin 14
89
-
90
-#define E2_STEP_PIN        P1_20
91
-#define E2_DIR_PIN         P1_19
92
-#define E2_ENABLE_PIN      P1_21
93
-#define E2_CS_PIN          P1_18   // FET 6
65
+#define X_STEP_PIN                         P2_00
66
+#define X_DIR_PIN                          P0_05
67
+#define X_ENABLE_PIN                       P0_04
68
+#define X_CS_PIN                           P1_10  // Ethernet Expansion - Pin 9
69
+
70
+#define Y_STEP_PIN                         P2_01
71
+#define Y_DIR_PIN                          P0_11
72
+#define Y_ENABLE_PIN                       P0_10
73
+#define Y_CS_PIN                           P1_09  // Ethernet Expansion - Pin 10
74
+
75
+#define Z_STEP_PIN                         P2_02
76
+#define Z_DIR_PIN                          P0_20
77
+#define Z_ENABLE_PIN                       P0_19
78
+#define Z_CS_PIN                           P1_00  // Ethernet Expansion - Pin 11
79
+
80
+#define E0_STEP_PIN                        P2_03
81
+#define E0_DIR_PIN                         P0_22
82
+#define E0_ENABLE_PIN                      P0_21
83
+#define E0_CS_PIN                          P1_04  // Ethernet Expansion - Pin 12
84
+
85
+#define E1_STEP_PIN                        P2_08
86
+#define E1_DIR_PIN                         P2_13
87
+#define E1_ENABLE_PIN                      P4_29
88
+#define E1_CS_PIN                          P1_01  // Ethernet Expansion - Pin 14
89
+
90
+#define E2_STEP_PIN                        P1_20
91
+#define E2_DIR_PIN                         P1_19
92
+#define E2_ENABLE_PIN                      P1_21
93
+#define E2_CS_PIN                          P1_18  // FET 6
94 94
 
95 95
 //
96 96
 // Default pins for TMC software SPI
97 97
 //
98 98
 #if ENABLED(TMC_USE_SW_SPI)
99 99
   #ifndef TMC_SW_MOSI
100
-    #define TMC_SW_MOSI    P1_16   // Ethernet Expansion - Pin 5
100
+    #define TMC_SW_MOSI                    P1_16  // Ethernet Expansion - Pin 5
101 101
   #endif
102 102
   #ifndef TMC_SW_MISO
103
-    #define TMC_SW_MISO    P1_17   // Ethernet Expansion - Pin 6
103
+    #define TMC_SW_MISO                    P1_17  // Ethernet Expansion - Pin 6
104 104
   #endif
105 105
   #ifndef TMC_SW_SCK
106
-    #define TMC_SW_SCK     P1_08   // Ethernet Expansion - Pin 7
106
+    #define TMC_SW_SCK                     P1_08  // Ethernet Expansion - Pin 7
107 107
   #endif
108 108
 #endif
109 109
 
@@ -111,42 +111,42 @@
111 111
 // Analog Inputs
112 112
 //  3.3V max when defined as an analog input
113 113
 //
114
-#define TEMP_0_PIN          P0_23_A0
115
-#define TEMP_BED_PIN        P0_24_A1
116
-#define TEMP_1_PIN          P0_25_A2
114
+#define TEMP_0_PIN                      P0_23_A0
115
+#define TEMP_BED_PIN                    P0_24_A1
116
+#define TEMP_1_PIN                      P0_25_A2
117 117
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
118
-  #define FILWIDTH_PIN      P0_26_A3
118
+  #define FILWIDTH_PIN                  P0_26_A3
119 119
 #else
120
-  #define TEMP_2_PIN        P0_26_A3
120
+  #define TEMP_2_PIN                    P0_26_A3
121 121
 #endif
122 122
 
123 123
 //
124 124
 // Heaters / Fans
125 125
 //
126
-#define HEATER_BED_PIN     P2_05
127
-#define HEATER_0_PIN       P2_07   // FET 1
128
-#define HEATER_1_PIN       P1_23   // FET 2
129
-#define HEATER_2_PIN       P1_22   // FET 3
126
+#define HEATER_BED_PIN                     P2_05
127
+#define HEATER_0_PIN                       P2_07  // FET 1
128
+#define HEATER_1_PIN                       P1_23  // FET 2
129
+#define HEATER_2_PIN                       P1_22  // FET 3
130 130
 #ifndef FAN_PIN
131
-  #define FAN_PIN          P2_06   // FET 4
131
+  #define FAN_PIN                          P2_06  // FET 4
132 132
 #endif
133 133
 
134 134
 //
135 135
 // Auto fans
136 136
 //
137 137
 #if HOTENDS == 3
138
-  #define AUTO_FAN_PIN     P1_18   // FET 6
138
+  #define AUTO_FAN_PIN                     P1_18  // FET 6
139 139
 #else
140
-  #define AUTO_FAN_PIN     P1_22   // FET 3
140
+  #define AUTO_FAN_PIN                     P1_22  // FET 3
141 141
 #endif
142
-#define ORIG_E0_AUTO_FAN_PIN  AUTO_FAN_PIN
143
-#define ORIG_E1_AUTO_FAN_PIN  AUTO_FAN_PIN
144
-#define ORIG_E2_AUTO_FAN_PIN  AUTO_FAN_PIN
142
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
143
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
144
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
145 145
 
146 146
 //
147 147
 // Misc. Functions
148 148
 //
149
-#define LED_PIN            P4_28   // Play LED
149
+#define LED_PIN                            P4_28  // Play LED
150 150
 
151 151
 //
152 152
 // M3/M4/M5 - Spindle/Laser Control
@@ -155,9 +155,9 @@
155 155
   #undef HEATER_0_PIN
156 156
   #undef HEATER_BED_PIN
157 157
   #undef FAN_PIN
158
-  #define SPINDLE_LASER_ENA_PIN P2_07   // FET 1
159
-  #define SPINDLE_LASER_PWM_PIN P2_05   // Bed FET
160
-  #define SPINDLE_DIR_PIN       P2_06   // FET 4
158
+  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
159
+  #define SPINDLE_LASER_PWM_PIN            P2_05  // Bed FET
160
+  #define SPINDLE_DIR_PIN                  P2_06  // FET 4
161 161
 #endif
162 162
 
163 163
 //
@@ -173,54 +173,54 @@
173 173
 
174 174
 #if ENABLED(FYSETC_MINI_12864)
175 175
 
176
-  #define FORCE_SOFT_SPI    // REQUIRED - results in LCD soft SPI mode 3
176
+  #define FORCE_SOFT_SPI                          // REQUIRED - results in LCD soft SPI mode 3
177 177
 
178
-  #define BEEPER_PIN      P1_31   // EXP1-1
179
-  #define BTN_ENC         P1_30   // EXP1-2
180
-  #define DOGLCD_CS       P0_18   // EXP1-3
181
-  #define DOGLCD_A0       P0_16   // EXP1-4
182
-  #define LCD_RESET_PIN   P0_15   // EXP1-5
178
+  #define BEEPER_PIN                       P1_31  // EXP1-1
179
+  #define BTN_ENC                          P1_30  // EXP1-2
180
+  #define DOGLCD_CS                        P0_18  // EXP1-3
181
+  #define DOGLCD_A0                        P0_16  // EXP1-4
182
+  #define LCD_RESET_PIN                    P0_15  // EXP1-5
183 183
 
184 184
   // A custom cable is REQUIRED for EXP2 cable because the SCK & MOSI on the card's EXP2 are dedicated
185 185
   // to the onboard SD card.  All required EXP2 signals come from the Ethernet connector.  Pin 1 of this
186 186
   // connector is the one nearest the motor power connector.
187
-  #define DOGLCD_SCK      P1_17   // EXP2-2  =>  Ethernet pin  5 (bottom, 3 from left)
188
-  #define BTN_EN2         P1_09   // EXP2-3  =>  Ethernet pin  9 (bottom, 5 from left)
189
-  #define BTN_EN1         P1_04   // EXP2-5  =>  Ethernet pin 11 (bottom, 6 from left)
190
-  #define DOGLCD_MOSI     P1_01   // EXP2-6  =>  Ethernet pin 13 (bottom, 7 from left)
187
+  #define DOGLCD_SCK                       P1_17  // EXP2-2  =>  Ethernet pin  5 (bottom, 3 from left)
188
+  #define BTN_EN2                          P1_09  // EXP2-3  =>  Ethernet pin  9 (bottom, 5 from left)
189
+  #define BTN_EN1                          P1_04  // EXP2-5  =>  Ethernet pin 11 (bottom, 6 from left)
190
+  #define DOGLCD_MOSI                      P1_01  // EXP2-6  =>  Ethernet pin 13 (bottom, 7 from left)
191 191
 
192 192
   // A custom EXP1 cable is required colored LEDs. Pins 1-5, 9, 10 of the cable go to pins 1-5, 9, 10
193 193
   // on the board's EXP1 connector. Pins 6, 7, and 8 of the EXP1 cable go to the Ethernet connector.
194 194
   // Rev 1.2 displays do NOT require the RGB LEDs. 2.0 and 2.1 displays do require RGB.
195 195
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
196 196
     #ifndef RGB_LED_R_PIN
197
-      #define RGB_LED_R_PIN P1_16 // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
197
+      #define RGB_LED_R_PIN                P1_16  // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
198 198
     #endif
199 199
     #ifndef RGB_LED_G_PIN
200
-      #define RGB_LED_G_PIN P1_10 // EXP1-7  =>  Ethernet pin 10 (top row, 5 from left)
200
+      #define RGB_LED_G_PIN                P1_10  // EXP1-7  =>  Ethernet pin 10 (top row, 5 from left)
201 201
     #endif
202 202
     #ifndef RGB_LED_B_PIN
203
-      #define RGB_LED_B_PIN P1_00 // EXP1-8  =>  Ethernet pin 12 (top row, 6 from left)
203
+      #define RGB_LED_B_PIN                P1_00  // EXP1-8  =>  Ethernet pin 12 (top row, 6 from left)
204 204
     #endif
205 205
   #elif ENABLED(FYSETC_MINI_12864_2_1)
206
-    #define NEOPIXEL_PIN  P1_16   // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
206
+    #define NEOPIXEL_PIN                   P1_16  // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
207 207
   #endif
208 208
 
209 209
 #elif HAS_SPI_LCD
210 210
 
211
-  #define BEEPER_PIN      P1_31   // EXP1-1
212
-  //#define SD_DETECT_PIN P0_27   // EXP2-7
211
+  #define BEEPER_PIN                       P1_31  // EXP1-1
212
+  //#define SD_DETECT_PIN                  P0_27  // EXP2-7
213 213
 
214
-  #define BTN_EN1         P3_26   // EXP2-5
215
-  #define BTN_EN2         P3_25   // EXP2-3
216
-  #define BTN_ENC         P1_30   // EXP1-2
214
+  #define BTN_EN1                          P3_26  // EXP2-5
215
+  #define BTN_EN2                          P3_25  // EXP2-3
216
+  #define BTN_ENC                          P1_30  // EXP1-2
217 217
 
218
-  #define LCD_PINS_RS     P0_16   // EXP1-4
219
-  #define LCD_SDSS        P0_28   // EXP2-4
220
-  #define LCD_PINS_ENABLE P0_18   // EXP1-3
221
-  #define LCD_PINS_D4     P0_15   // EXP1-5
218
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
219
+  #define LCD_SDSS                         P0_28  // EXP2-4
220
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1-3
221
+  #define LCD_PINS_D4                      P0_15  // EXP1-5
222 222
 
223
-  #define KILL_PIN        P2_11   // EXP2-10
223
+  #define KILL_PIN                         P2_11  // EXP2-10
224 224
 
225 225
 #endif // HAS_SPI_LCD
226 226
 
@@ -228,22 +228,22 @@
228 228
 // SD Support
229 229
 //
230 230
 #ifndef SDCARD_CONNECTION
231
-  #define SDCARD_CONNECTION ONBOARD
231
+  #define SDCARD_CONNECTION              ONBOARD
232 232
 #endif
233 233
 
234
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
234
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
235 235
 
236 236
 #if SD_CONNECTION_IS(LCD)
237
-  #define SCK_PIN          P0_07   // (52)  system defined J3-9 & AUX-3
238
-  #define MISO_PIN         P0_08   // (50)  system defined J3-10 & AUX-3
239
-  #define MOSI_PIN         P0_09   // (51)  system defined J3-10 & AUX-3
240
-  #define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
237
+  #define SCK_PIN                          P0_07  // (52)  system defined J3-9 & AUX-3
238
+  #define MISO_PIN                         P0_08  // (50)  system defined J3-10 & AUX-3
239
+  #define MOSI_PIN                         P0_09  // (51)  system defined J3-10 & AUX-3
240
+  #define SS_PIN                           P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
241 241
 #elif SD_CONNECTION_IS(ONBOARD)
242 242
   #undef SD_DETECT_PIN
243
-  #define SCK_PIN          P0_07
244
-  #define MISO_PIN         P0_08
245
-  #define MOSI_PIN         P0_09
246
-  #define SS_PIN           ONBOARD_SD_CS_PIN
243
+  #define SCK_PIN                          P0_07
244
+  #define MISO_PIN                         P0_08
245
+  #define MOSI_PIN                         P0_09
246
+  #define SS_PIN               ONBOARD_SD_CS_PIN
247 247
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
248 248
   #error "No custom SD drive cable defined for this board."
249 249
 #endif
@@ -251,16 +251,16 @@
251 251
 //
252 252
 // Ethernet pins
253 253
 //
254
-//#define ENET_MDIO          P1_17   // Ethernet pin  5 (bottom, 3 from left)
255
-//#define ENET_RX_ER         P1_14
256
-//#define ENET_RXD1          P1_10   // Ethernet pin 10 (top row, 5 from left)
257
-//#define ENET_MOC           P1_16   // Ethernet pin  6 (top row, 3 from left)
258
-//#define REF_CLK            P1_15
259
-//#define ENET_RXD0          P1_09   // Ethernet pin  9 (bottom, 5 from left)
260
-//#define ENET_CRS           P1_08   // Ethernet pin  8 (top row, 4 from left) - INPUT ONLY
261
-//#define ENET_TX_EN         P1_04   // Ethernet pin 11 (bottom, 6 from left)
262
-//#define ENET_TXD0          P1_00   // Ethernet pin 12 (top row, 6 from left)
263
-//#define ENET_TXD1          P1_01   // Ethernet pin 13 (bottom, 7 from left)
254
+//#define ENET_MDIO                        P1_17  // Ethernet pin  5 (bottom, 3 from left)
255
+//#define ENET_RX_ER                       P1_14
256
+//#define ENET_RXD1                        P1_10  // Ethernet pin 10 (top row, 5 from left)
257
+//#define ENET_MOC                         P1_16  // Ethernet pin  6 (top row, 3 from left)
258
+//#define REF_CLK                          P1_15
259
+//#define ENET_RXD0                        P1_09  // Ethernet pin  9 (bottom, 5 from left)
260
+//#define ENET_CRS                         P1_08  // Ethernet pin  8 (top row, 4 from left) - INPUT ONLY
261
+//#define ENET_TX_EN                       P1_04  // Ethernet pin 11 (bottom, 6 from left)
262
+//#define ENET_TXD0                        P1_00  // Ethernet pin 12 (top row, 6 from left)
263
+//#define ENET_TXD1                        P1_01  // Ethernet pin 13 (bottom, 7 from left)
264 264
 
265 265
 /**
266 266
  *  EXP1 pins

+ 10
- 10
Marlin/src/pins/lpc1769/pins_MKS_SGEN.h Parādīt failu

@@ -47,8 +47,8 @@
47 47
 
48 48
 //#undef BTN_EN1
49 49
 //#undef BTN_EN2
50
-//#define BTN_EN1            P1_23   // EXP2.5
51
-//#define BTN_EN2            P1_22   // EXP2.3
50
+//#define BTN_EN1                          P1_23  // EXP2.5
51
+//#define BTN_EN2                          P1_22  // EXP2.3
52 52
 
53 53
 #if HAS_TMC_UART
54 54
   /**
@@ -58,16 +58,16 @@
58 58
    * In the worst case you may have to give up the LCD.
59 59
    * RX pins must be interrupt-capable.
60 60
    */
61
-  #define X_SERIAL_TX_PIN  P4_29   // J8-2
62
-  #define X_SERIAL_RX_PIN  P4_29   // J8-2
61
+  #define X_SERIAL_TX_PIN                  P4_29  // J8-2
62
+  #define X_SERIAL_RX_PIN                  P4_29  // J8-2
63 63
 
64
-  #define Y_SERIAL_TX_PIN  P2_08   // J8-3
65
-  #define Y_SERIAL_RX_PIN  P2_08   // J8-3
64
+  #define Y_SERIAL_TX_PIN                  P2_08  // J8-3
65
+  #define Y_SERIAL_RX_PIN                  P2_08  // J8-3
66 66
 
67
-  #define Z_SERIAL_TX_PIN  P2_11   // J8-4
68
-  #define Z_SERIAL_RX_PIN  P2_11   // J8-4
69
-  #define E0_SERIAL_TX_PIN P2_13   // J8-5
70
-  #define E0_SERIAL_RX_PIN P2_13   // J8-5
67
+  #define Z_SERIAL_TX_PIN                  P2_11  // J8-4
68
+  #define Z_SERIAL_RX_PIN                  P2_11  // J8-4
69
+  #define E0_SERIAL_TX_PIN                 P2_13  // J8-5
70
+  #define E0_SERIAL_RX_PIN                 P2_13  // J8-5
71 71
 
72 72
   // Reduce baud rate to improve software serial reliability
73 73
   #define TMC_BAUD_RATE 19200

+ 41
- 41
Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h Parādīt failu

@@ -41,79 +41,79 @@
41 41
 //
42 42
 // Servos
43 43
 //
44
-#define SERVO0_PIN         P1_23
44
+#define SERVO0_PIN                         P1_23
45 45
 
46 46
 //
47 47
 // Limit Switches
48 48
 //
49
-#define X_MIN_PIN          P1_24
50
-#define X_MAX_PIN          P1_25
51
-#define Y_MIN_PIN          P1_26
52
-#define Y_MAX_PIN          P1_27
53
-#define Z_MIN_PIN          P1_28
54
-#define Z_MAX_PIN          P1_29
49
+#define X_MIN_PIN                          P1_24
50
+#define X_MAX_PIN                          P1_25
51
+#define Y_MIN_PIN                          P1_26
52
+#define Y_MAX_PIN                          P1_27
53
+#define Z_MIN_PIN                          P1_28
54
+#define Z_MAX_PIN                          P1_29
55 55
 
56 56
 //
57 57
 // Steppers
58 58
 //
59
-#define X_STEP_PIN         P2_00
60
-#define X_DIR_PIN          P0_05
61
-#define X_ENABLE_PIN       P0_04
59
+#define X_STEP_PIN                         P2_00
60
+#define X_DIR_PIN                          P0_05
61
+#define X_ENABLE_PIN                       P0_04
62 62
 
63
-#define Y_STEP_PIN         P2_01
64
-#define Y_DIR_PIN          P0_11
65
-#define Y_ENABLE_PIN       P0_10
63
+#define Y_STEP_PIN                         P2_01
64
+#define Y_DIR_PIN                          P0_11
65
+#define Y_ENABLE_PIN                       P0_10
66 66
 
67
-#define Z_STEP_PIN         P2_02
68
-#define Z_DIR_PIN          P0_20
69
-#define Z_ENABLE_PIN       P0_19
67
+#define Z_STEP_PIN                         P2_02
68
+#define Z_DIR_PIN                          P0_20
69
+#define Z_ENABLE_PIN                       P0_19
70 70
 
71
-#define E0_STEP_PIN        P2_03
72
-#define E0_DIR_PIN         P0_22
73
-#define E0_ENABLE_PIN      P0_21
71
+#define E0_STEP_PIN                        P2_03
72
+#define E0_DIR_PIN                         P0_22
73
+#define E0_ENABLE_PIN                      P0_21
74 74
 
75
-#define E1_STEP_PIN        P2_08
76
-#define E1_DIR_PIN         P2_13
77
-#define E1_ENABLE_PIN      P4_29
75
+#define E1_STEP_PIN                        P2_08
76
+#define E1_DIR_PIN                         P2_13
77
+#define E1_ENABLE_PIN                      P4_29
78 78
 
79 79
 //
80 80
 // Temperature Sensors
81 81
 // 3.3V max when defined as an analog input
82 82
 //
83
-#define TEMP_0_PIN          P0_23_A0   // (T1)
84
-#define TEMP_BED_PIN        P0_24_A1   // (T2)
85
-#define TEMP_1_PIN          P0_25_A2   // (T3)
86
-#define TEMP_2_PIN          P0_26_A3   // (T4)
83
+#define TEMP_0_PIN                      P0_23_A0  // (T1)
84
+#define TEMP_BED_PIN                    P0_24_A1  // (T2)
85
+#define TEMP_1_PIN                      P0_25_A2  // (T3)
86
+#define TEMP_2_PIN                      P0_26_A3  // (T4)
87 87
 
88 88
 //
89 89
 // Heaters / Fans
90 90
 //
91
-#define HEATER_BED_PIN     P2_05
92
-#define HEATER_0_PIN       P2_07
93
-#define HEATER_1_PIN       P1_23
91
+#define HEATER_BED_PIN                     P2_05
92
+#define HEATER_0_PIN                       P2_07
93
+#define HEATER_1_PIN                       P1_23
94 94
 #ifndef FAN_PIN
95
-  #define FAN_PIN          P2_06
95
+  #define FAN_PIN                          P2_06
96 96
 #endif
97
-#define FAN1_PIN           P2_04
97
+#define FAN1_PIN                           P2_04
98 98
 
99 99
 //
100 100
 // LCD / Controller
101 101
 //
102 102
 #if ANY(VIKI2, miniVIKI)
103 103
 
104
-  #define BEEPER_PIN       P1_31
105
-  #define DOGLCD_A0        P2_11
106
-  #define DOGLCD_CS        P0_16
104
+  #define BEEPER_PIN                       P1_31
105
+  #define DOGLCD_A0                        P2_11
106
+  #define DOGLCD_CS                        P0_16
107 107
 
108
-  #define BTN_EN1          P3_25
109
-  #define BTN_EN2          P3_26
110
-  #define BTN_ENC          P1_30
108
+  #define BTN_EN1                          P3_25
109
+  #define BTN_EN2                          P3_26
110
+  #define BTN_ENC                          P1_30
111 111
 
112
-  #define SD_DETECT_PIN    P1_18
113
-  #define SDSS             P1_21
112
+  #define SD_DETECT_PIN                    P1_18
113
+  #define SDSS                             P1_21
114 114
 
115
-  #define STAT_LED_RED_PIN  P1_19
116
-  #define STAT_LED_BLUE_PIN P1_20
115
+  #define STAT_LED_RED_PIN                 P1_19
116
+  #define STAT_LED_BLUE_PIN                P1_20
117 117
 
118 118
 #elif HAS_SPI_LCD
119 119
 

+ 57
- 57
Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h Parādīt failu

@@ -41,58 +41,58 @@
41 41
 //
42 42
 // Servos
43 43
 //
44
-#define SERVO0_PIN         P2_04
44
+#define SERVO0_PIN                         P2_04
45 45
 
46 46
 //
47 47
 // Limit Switches
48 48
 //
49
-#define X_STOP_PIN         P1_24
50
-#define Y_STOP_PIN         P1_25
51
-#define Z_STOP_PIN         P1_26
49
+#define X_STOP_PIN                         P1_24
50
+#define Y_STOP_PIN                         P1_25
51
+#define Z_STOP_PIN                         P1_26
52 52
 
53 53
 //
54 54
 // Filament Runout Sensor
55 55
 //
56 56
 #ifndef FIL_RUNOUT_PIN
57
-  #define FIL_RUNOUT_PIN   P1_27
57
+  #define FIL_RUNOUT_PIN                   P1_27
58 58
 #endif
59 59
 
60 60
 //
61 61
 // Steppers
62 62
 //
63
-#define X_STEP_PIN         P2_00
64
-#define X_DIR_PIN          P1_16
65
-#define X_ENABLE_PIN       P1_17
63
+#define X_STEP_PIN                         P2_00
64
+#define X_DIR_PIN                          P1_16
65
+#define X_ENABLE_PIN                       P1_17
66 66
 
67
-#define Y_STEP_PIN         P2_01
68
-#define Y_DIR_PIN          P1_10
69
-#define Y_ENABLE_PIN       P1_09
67
+#define Y_STEP_PIN                         P2_01
68
+#define Y_DIR_PIN                          P1_10
69
+#define Y_ENABLE_PIN                       P1_09
70 70
 
71
-#define Z_STEP_PIN         P2_02
72
-#define Z_DIR_PIN          P1_15
73
-#define Z_ENABLE_PIN       P1_14
71
+#define Z_STEP_PIN                         P2_02
72
+#define Z_DIR_PIN                          P1_15
73
+#define Z_ENABLE_PIN                       P1_14
74 74
 
75
-#define E0_STEP_PIN        P2_03
76
-#define E0_DIR_PIN         P1_04
77
-#define E0_ENABLE_PIN      P1_08
75
+#define E0_STEP_PIN                        P2_03
76
+#define E0_DIR_PIN                         P1_04
77
+#define E0_ENABLE_PIN                      P1_08
78 78
 
79
-#define E1_STEP_PIN        P2_08
80
-#define E1_DIR_PIN         P2_13
81
-#define E1_ENABLE_PIN      P4_29
79
+#define E1_STEP_PIN                        P2_08
80
+#define E1_DIR_PIN                         P2_13
81
+#define E1_ENABLE_PIN                      P4_29
82 82
 
83 83
 #if HAS_TMC_UART
84 84
   //
85 85
   // TMC220x stepper drivers
86 86
   // Software serial
87 87
   //
88
-  #define X_SERIAL_TX_PIN  P0_04
89
-  #define X_SERIAL_RX_PIN  P0_05
90
-  #define Y_SERIAL_TX_PIN  P0_10
91
-  #define Y_SERIAL_RX_PIN  P0_11
92
-  #define Z_SERIAL_TX_PIN  P0_19
93
-  #define Z_SERIAL_RX_PIN  P0_20
94
-  #define E0_SERIAL_TX_PIN P0_22
95
-  #define E0_SERIAL_RX_PIN P0_21
88
+  #define X_SERIAL_TX_PIN                  P0_04
89
+  #define X_SERIAL_RX_PIN                  P0_05
90
+  #define Y_SERIAL_TX_PIN                  P0_10
91
+  #define Y_SERIAL_RX_PIN                  P0_11
92
+  #define Z_SERIAL_TX_PIN                  P0_19
93
+  #define Z_SERIAL_RX_PIN                  P0_20
94
+  #define E0_SERIAL_TX_PIN                 P0_22
95
+  #define E0_SERIAL_RX_PIN                 P0_21
96 96
 
97 97
   // Reduce baud rate to improve software serial reliability
98 98
   #define TMC_BAUD_RATE 19200
@@ -102,50 +102,50 @@
102 102
 // Temp Sensors
103 103
 //  3.3V max when defined as an Analog Input!
104 104
 //
105
-#if TEMP_SENSOR_0 == 20         // PT100 Adapter
106
-  #define TEMP_0_PIN        P0_02_A7   // Analog Input
105
+#if TEMP_SENSOR_0 == 20                           // PT100 Adapter
106
+  #define TEMP_0_PIN                    P0_02_A7  // Analog Input
107 107
 #else
108
-  #define TEMP_0_PIN        P0_23_A0   // Analog Input P0_23
108
+  #define TEMP_0_PIN                    P0_23_A0  // Analog Input P0_23
109 109
 #endif
110 110
 
111
-#define TEMP_BED_PIN        P0_24_A1   // Analog Input P0_24
112
-#define TEMP_1_PIN          P0_25_A2   // Analog Input P0_25
111
+#define TEMP_BED_PIN                    P0_24_A1  // Analog Input P0_24
112
+#define TEMP_1_PIN                      P0_25_A2  // Analog Input P0_25
113 113
 
114 114
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
115
-  #define FILWIDTH_PIN      P0_26_A3   // Analog Input P0_26
115
+  #define FILWIDTH_PIN                  P0_26_A3  // Analog Input P0_26
116 116
 #else
117
-  #define TEMP_2_PIN        P0_26_A3   // Analog Input P0_26
117
+  #define TEMP_2_PIN                    P0_26_A3  // Analog Input P0_26
118 118
 #endif
119 119
 
120 120
 //
121 121
 // Heaters / Fans
122 122
 //
123
-#define HEATER_BED_PIN     P2_05
124
-#define HEATER_0_PIN       P2_07
123
+#define HEATER_BED_PIN                     P2_05
124
+#define HEATER_0_PIN                       P2_07
125 125
 #ifndef FAN_PIN
126
-  #define FAN_PIN          P2_06
126
+  #define FAN_PIN                          P2_06
127 127
 #endif
128
-#define FAN1_PIN           P1_22
128
+#define FAN1_PIN                           P1_22
129 129
 
130 130
 //
131 131
 // Auto fans
132 132
 //
133
-#define AUTO_FAN_PIN       P1_22   // FET 3
134
-#define ORIG_E0_AUTO_FAN_PIN  AUTO_FAN_PIN
135
-#define ORIG_E1_AUTO_FAN_PIN  AUTO_FAN_PIN
136
-#define ORIG_E2_AUTO_FAN_PIN  AUTO_FAN_PIN
133
+#define AUTO_FAN_PIN                       P1_22  // FET 3
134
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
135
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
136
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
137 137
 
138 138
 //
139 139
 // SD Card
140 140
 //
141 141
 
142
-#define SDCARD_CONNECTION ONBOARD
142
+#define SDCARD_CONNECTION                ONBOARD
143 143
 
144
-#define SCK_PIN            P0_07
145
-#define MISO_PIN           P0_08
146
-#define MOSI_PIN           P0_09
147
-#define ONBOARD_SD_CS_PIN  P0_06
148
-#define SS_PIN             ONBOARD_SD_CS_PIN
144
+#define SCK_PIN                            P0_07
145
+#define MISO_PIN                           P0_08
146
+#define MOSI_PIN                           P0_09
147
+#define ONBOARD_SD_CS_PIN                  P0_06
148
+#define SS_PIN                 ONBOARD_SD_CS_PIN
149 149
 
150 150
 //
151 151
 // LCD / Controller
@@ -170,14 +170,14 @@
170 170
  */
171 171
 
172 172
 #if ENABLED(CR10_STOCKDISPLAY)
173
-  #define BEEPER_PIN       P1_31
174
-  #define BTN_EN1          P3_26
175
-  #define BTN_EN2          P3_25
176
-  #define BTN_ENC          P1_30
177
-  #define LCD_PINS_RS      P0_16
178
-  #define LCD_PINS_ENABLE  P0_18
179
-  #define LCD_PINS_D4      P0_15
180
-  #define KILL_PIN         P2_11
173
+  #define BEEPER_PIN                       P1_31
174
+  #define BTN_EN1                          P3_26
175
+  #define BTN_EN2                          P3_25
176
+  #define BTN_ENC                          P1_30
177
+  #define LCD_PINS_RS                      P0_16
178
+  #define LCD_PINS_ENABLE                  P0_18
179
+  #define LCD_PINS_D4                      P0_15
180
+  #define KILL_PIN                         P2_11
181 181
 #elif HAS_SPI_LCD
182 182
   #error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
183 183
 #endif

+ 24
- 24
Marlin/src/pins/mega/pins_CHEAPTRONIC.h Parādīt failu

@@ -33,46 +33,46 @@
33 33
 //
34 34
 // Limit Switches
35 35
 //
36
-#define X_STOP_PIN          3
37
-#define Y_STOP_PIN          2
38
-#define Z_STOP_PIN          5
36
+#define X_STOP_PIN                             3
37
+#define Y_STOP_PIN                             2
38
+#define Z_STOP_PIN                             5
39 39
 
40 40
 //
41 41
 // Steppers
42 42
 //
43
-#define X_STEP_PIN         14
44
-#define X_DIR_PIN          15
45
-#define X_ENABLE_PIN       24
43
+#define X_STEP_PIN                            14
44
+#define X_DIR_PIN                             15
45
+#define X_ENABLE_PIN                          24
46 46
 
47
-#define Y_STEP_PIN         35
48
-#define Y_DIR_PIN          36
49
-#define Y_ENABLE_PIN       31
47
+#define Y_STEP_PIN                            35
48
+#define Y_DIR_PIN                             36
49
+#define Y_ENABLE_PIN                          31
50 50
 
51
-#define Z_STEP_PIN         40
52
-#define Z_DIR_PIN          41
53
-#define Z_ENABLE_PIN       37
51
+#define Z_STEP_PIN                            40
52
+#define Z_DIR_PIN                             41
53
+#define Z_ENABLE_PIN                          37
54 54
 
55
-#define E0_STEP_PIN        26
56
-#define E0_DIR_PIN         28
57
-#define E0_ENABLE_PIN      25
55
+#define E0_STEP_PIN                           26
56
+#define E0_DIR_PIN                            28
57
+#define E0_ENABLE_PIN                         25
58 58
 
59
-#define E1_STEP_PIN        33
60
-#define E1_DIR_PIN         34
61
-#define E1_ENABLE_PIN      30
59
+#define E1_STEP_PIN                           33
60
+#define E1_DIR_PIN                            34
61
+#define E1_ENABLE_PIN                         30
62 62
 
63 63
 //
64 64
 // Temperature sensors
65 65
 //
66
-#define TEMP_0_PIN         15   // Analog Input
67
-#define TEMP_1_PIN         14   // Analog Input
68
-#define TEMP_BED_PIN       13   // Analog Input
66
+#define TEMP_0_PIN                            15  // Analog Input
67
+#define TEMP_1_PIN                            14  // Analog Input
68
+#define TEMP_BED_PIN                          13  // Analog Input
69 69
 
70 70
 //
71 71
 // Heaters / Fans
72 72
 //
73
-#define HEATER_0_PIN       19   // EXTRUDER 1
74
-#define HEATER_1_PIN       23   // EXTRUDER 2
75
-#define HEATER_BED_PIN     22
73
+#define HEATER_0_PIN                          19  // EXTRUDER 1
74
+#define HEATER_1_PIN                          23  // EXTRUDER 2
75
+#define HEATER_BED_PIN                        22
76 76
 
77 77
 //
78 78
 // LCD / Controller

+ 56
- 56
Marlin/src/pins/mega/pins_CHEAPTRONICv2.h Parādīt failu

@@ -36,101 +36,101 @@
36 36
 //
37 37
 // Limit Switches
38 38
 //
39
-#define X_MIN_PIN          30
40
-#define X_MAX_PIN          31
41
-#define Y_MIN_PIN          32
42
-#define Y_MAX_PIN          33
43
-#define Z_MIN_PIN          34
44
-#define Z_MAX_PIN          35
39
+#define X_MIN_PIN                             30
40
+#define X_MAX_PIN                             31
41
+#define Y_MIN_PIN                             32
42
+#define Y_MAX_PIN                             33
43
+#define Z_MIN_PIN                             34
44
+#define Z_MAX_PIN                             35
45 45
 
46 46
 //
47 47
 // Steppers
48 48
 //
49
-#define X_STEP_PIN         17
50
-#define X_DIR_PIN          16
51
-#define X_ENABLE_PIN       48
49
+#define X_STEP_PIN                            17
50
+#define X_DIR_PIN                             16
51
+#define X_ENABLE_PIN                          48
52 52
 
53
-#define Y_STEP_PIN         54
54
-#define Y_DIR_PIN          47
55
-#define Y_ENABLE_PIN       55
53
+#define Y_STEP_PIN                            54
54
+#define Y_DIR_PIN                             47
55
+#define Y_ENABLE_PIN                          55
56 56
 
57
-#define Z_STEP_PIN         57
58
-#define Z_DIR_PIN          56
59
-#define Z_ENABLE_PIN       62
57
+#define Z_STEP_PIN                            57
58
+#define Z_DIR_PIN                             56
59
+#define Z_ENABLE_PIN                          62
60 60
 
61
-#define E0_STEP_PIN        23
62
-#define E0_DIR_PIN         22
63
-#define E0_ENABLE_PIN      24
61
+#define E0_STEP_PIN                           23
62
+#define E0_DIR_PIN                            22
63
+#define E0_ENABLE_PIN                         24
64 64
 
65
-#define E1_STEP_PIN        26
66
-#define E1_DIR_PIN         25
67
-#define E1_ENABLE_PIN      27
65
+#define E1_STEP_PIN                           26
66
+#define E1_DIR_PIN                            25
67
+#define E1_ENABLE_PIN                         27
68 68
 
69
-#define E2_STEP_PIN        29
70
-#define E2_DIR_PIN         28
71
-#define E2_ENABLE_PIN      39
69
+#define E2_STEP_PIN                           29
70
+#define E2_DIR_PIN                            28
71
+#define E2_ENABLE_PIN                         39
72 72
 
73 73
 //
74 74
 // Temperature sensors
75 75
 //
76
-#define TEMP_0_PIN         15
77
-#define TEMP_1_PIN         13
78
-#define TEMP_2_PIN         14
79
-#define TEMP_3_PIN         11   // should be used for chamber temperature control
80
-#define TEMP_BED_PIN       12
76
+#define TEMP_0_PIN                            15
77
+#define TEMP_1_PIN                            13
78
+#define TEMP_2_PIN                            14
79
+#define TEMP_3_PIN                            11  // should be used for chamber temperature control
80
+#define TEMP_BED_PIN                          12
81 81
 
82 82
 //
83 83
 // Heaters / Fans
84 84
 //
85
-#define HEATER_0_PIN        6
86
-#define HEATER_1_PIN        7
87
-#define HEATER_2_PIN        8
88
-#define HEATER_BED_PIN      9
85
+#define HEATER_0_PIN                           6
86
+#define HEATER_1_PIN                           7
87
+#define HEATER_2_PIN                           8
88
+#define HEATER_BED_PIN                         9
89 89
 #ifndef FAN_PIN
90
-  #define FAN_PIN           3
90
+  #define FAN_PIN                              3
91 91
 #endif
92
-#define FAN2_PIN           58   // additional fan or light control output
92
+#define FAN2_PIN                              58  // additional fan or light control output
93 93
 
94 94
 //
95 95
 // Other board specific pins
96 96
 //
97 97
 #ifndef FIL_RUNOUT_PIN
98
-  #define FIL_RUNOUT_PIN   37   // board input labeled as F-DET
98
+  #define FIL_RUNOUT_PIN                      37  // board input labeled as F-DET
99 99
 #endif
100
-#define Z_MIN_PROBE_PIN    36   // additional external board input labeled as E-SENS (should be used for Z-probe)
101
-#define LED_PIN            13
102
-#define SPINDLE_ENABLE_PIN  4   // additional PWM pin 1 at JP1 connector - should be used for laser control too
103
-#define EXT_2               5   // additional PWM pin 2 at JP1 connector
104
-#define EXT_3               2   // additional PWM pin 3 at JP1 connector
105
-#define PS_ON_PIN          45
106
-#define KILL_PIN           46
100
+#define Z_MIN_PROBE_PIN                       36  // additional external board input labeled as E-SENS (should be used for Z-probe)
101
+#define LED_PIN                               13
102
+#define SPINDLE_ENABLE_PIN                     4  // additional PWM pin 1 at JP1 connector - should be used for laser control too
103
+#define EXT_2                                  5  // additional PWM pin 2 at JP1 connector
104
+#define EXT_3                                  2  // additional PWM pin 3 at JP1 connector
105
+#define PS_ON_PIN                             45
106
+#define KILL_PIN                              46
107 107
 
108 108
 #ifndef FILWIDTH_PIN
109
-  #define FILWIDTH_PIN     11   // shared with TEMP_3 analog input
109
+  #define FILWIDTH_PIN                        11  // shared with TEMP_3 analog input
110 110
 #endif
111 111
 
112 112
 //
113 113
 // LCD / Controller
114 114
 //
115
-#define LCD_PINS_RS        19
116
-#define LCD_PINS_ENABLE    42
117
-#define LCD_PINS_D4        18
118
-#define LCD_PINS_D5        38
119
-#define LCD_PINS_D6        41
120
-#define LCD_PINS_D7        40
115
+#define LCD_PINS_RS                           19
116
+#define LCD_PINS_ENABLE                       42
117
+#define LCD_PINS_D4                           18
118
+#define LCD_PINS_D5                           38
119
+#define LCD_PINS_D6                           41
120
+#define LCD_PINS_D7                           40
121 121
 
122 122
 //
123 123
 // Beeper, SD Card, Encoder
124 124
 //
125
-#define BEEPER_PIN         44
125
+#define BEEPER_PIN                            44
126 126
 
127 127
 #if ENABLED(SDSUPPORT)
128
-  #define SDSS             53
129
-  #define SD_DETECT_PIN    49
128
+  #define SDSS                                53
129
+  #define SD_DETECT_PIN                       49
130 130
 #endif
131 131
 
132 132
 #if ENABLED(NEWPANEL)
133
-  #define BTN_EN1          11
134
-  #define BTN_EN2          12
135
-  #define BTN_ENC          43
133
+  #define BTN_EN1                             11
134
+  #define BTN_EN2                             12
135
+  #define BTN_ENC                             43
136 136
 #endif

+ 66
- 66
Marlin/src/pins/mega/pins_CNCONTROLS_11.h Parādīt failu

@@ -34,115 +34,115 @@
34 34
 //
35 35
 // Limit Switches
36 36
 //
37
-#define X_STOP_PIN         43
38
-#define Y_STOP_PIN         45
39
-#define Z_STOP_PIN         42
37
+#define X_STOP_PIN                            43
38
+#define Y_STOP_PIN                            45
39
+#define Z_STOP_PIN                            42
40 40
 
41 41
 //
42 42
 // Steppers
43 43
 //
44
-#define X_STEP_PIN         34
45
-#define X_DIR_PIN          36
46
-#define X_ENABLE_PIN       35
44
+#define X_STEP_PIN                            34
45
+#define X_DIR_PIN                             36
46
+#define X_ENABLE_PIN                          35
47 47
 
48
-#define Y_STEP_PIN         37
49
-#define Y_DIR_PIN          39
50
-#define Y_ENABLE_PIN       38
48
+#define Y_STEP_PIN                            37
49
+#define Y_DIR_PIN                             39
50
+#define Y_ENABLE_PIN                          38
51 51
 
52
-#define Z_STEP_PIN         40
53
-#define Z_DIR_PIN          48
54
-#define Z_ENABLE_PIN       41
52
+#define Z_STEP_PIN                            40
53
+#define Z_DIR_PIN                             48
54
+#define Z_ENABLE_PIN                          41
55 55
 
56
-#define E0_STEP_PIN        29
57
-#define E0_DIR_PIN         28
58
-#define E0_ENABLE_PIN       3
56
+#define E0_STEP_PIN                           29
57
+#define E0_DIR_PIN                            28
58
+#define E0_ENABLE_PIN                          3
59 59
 
60
-#define E1_STEP_PIN        61
61
-#define E1_DIR_PIN         62
62
-#define E1_ENABLE_PIN      60
60
+#define E1_STEP_PIN                           61
61
+#define E1_DIR_PIN                            62
62
+#define E1_ENABLE_PIN                         60
63 63
 
64
-#define E2_STEP_PIN        15
65
-#define E2_DIR_PIN         14
66
-#define E2_ENABLE_PIN      16
64
+#define E2_STEP_PIN                           15
65
+#define E2_DIR_PIN                            14
66
+#define E2_ENABLE_PIN                         16
67 67
 
68
-#define E3_STEP_PIN        44
69
-#define E3_DIR_PIN         49
70
-#define E3_ENABLE_PIN      47
68
+#define E3_STEP_PIN                           44
69
+#define E3_DIR_PIN                            49
70
+#define E3_ENABLE_PIN                         47
71 71
 
72 72
 //
73 73
 // Temperature Sensors
74 74
 //
75
-#define TEMP_0_PIN          0   // Analog Input
76
-#define TEMP_1_PIN          3   // Analog Input.  3 for tool2 -> 2 for chambertemp
77
-#define TEMP_2_PIN          2   // Analog Input.  9 for tool3 -> 2 for chambertemp
78
-#define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 2 for chambertemp
79
-#define TEMP_BED_PIN        1   // Analog Input
75
+#define TEMP_0_PIN                             0  // Analog Input
76
+#define TEMP_1_PIN                             3  // Analog Input.  3 for tool2 -> 2 for chambertemp
77
+#define TEMP_2_PIN                             2  // Analog Input.  9 for tool3 -> 2 for chambertemp
78
+#define TEMP_3_PIN                            11  // Analog Input. 11 for tool4 -> 2 for chambertemp
79
+#define TEMP_BED_PIN                           1  // Analog Input
80 80
 
81 81
 #ifndef TEMP_CHAMBER_PIN
82
-  //#define TEMP_CHAMBER_PIN 2  // Analog Input
82
+  //#define TEMP_CHAMBER_PIN                   2  // Analog Input
83 83
 #endif
84 84
 
85 85
 //
86 86
 // Heaters / Fans
87 87
 //
88
-#define HEATER_0_PIN        5
89
-#define HEATER_1_PIN       58
90
-#define HEATER_2_PIN       64
91
-#define HEATER_3_PIN       46
92
-#define HEATER_BED_PIN      2
88
+#define HEATER_0_PIN                           5
89
+#define HEATER_1_PIN                          58
90
+#define HEATER_2_PIN                          64
91
+#define HEATER_3_PIN                          46
92
+#define HEATER_BED_PIN                         2
93 93
 
94 94
 #ifndef FAN_PIN
95
-  //#define FAN_PIN         7   // common PWM pin for all tools
95
+  //#define FAN_PIN                            7  // common PWM pin for all tools
96 96
 #endif
97 97
 
98
-#define ORIG_E0_AUTO_FAN_PIN 7
99
-#define ORIG_E1_AUTO_FAN_PIN 7
100
-#define ORIG_E2_AUTO_FAN_PIN 7
101
-#define ORIG_E3_AUTO_FAN_PIN 7
98
+#define ORIG_E0_AUTO_FAN_PIN                   7
99
+#define ORIG_E1_AUTO_FAN_PIN                   7
100
+#define ORIG_E2_AUTO_FAN_PIN                   7
101
+#define ORIG_E3_AUTO_FAN_PIN                   7
102 102
 
103 103
 //
104 104
 // Misc. Functions
105 105
 //
106
-#define SDSS               53
107
-#define SD_DETECT_PIN      13
106
+#define SDSS                                  53
107
+#define SD_DETECT_PIN                         13
108 108
 
109 109
 // Tools
110 110
 
111
-//#define TOOL_0_PIN           4
112
-//#define TOOL_1_PIN          59
113
-//#define TOOL_2_PIN           8
114
-//#define TOOL_3_PIN          30
115
-//#define TOOL_PWM_PIN         7   // common PWM pin for all tools
111
+//#define TOOL_0_PIN                           4
112
+//#define TOOL_1_PIN                          59
113
+//#define TOOL_2_PIN                           8
114
+//#define TOOL_3_PIN                          30
115
+//#define TOOL_PWM_PIN                         7  // common PWM pin for all tools
116 116
 
117 117
 // Common I/O
118 118
 
119
-//#define FIL_RUNOUT_PIN      -1
120
-//#define PWM_1_PIN           11
121
-//#define PWM_2_PIN           10
122
-//#define SPARE_IO            12
119
+//#define FIL_RUNOUT_PIN                      -1
120
+//#define PWM_1_PIN                           11
121
+//#define PWM_2_PIN                           10
122
+//#define SPARE_IO                            12
123 123
 
124 124
 //
125 125
 // LCD / Controller
126 126
 //
127
-#define BEEPER_PIN          6
127
+#define BEEPER_PIN                             6
128 128
 
129 129
 // Pins for DOGM SPI LCD Support
130
-#define DOGLCD_A0          26
131
-#define DOGLCD_CS          24
132
-#define DOGLCD_MOSI        -1
133
-#define DOGLCD_SCK         -1
130
+#define DOGLCD_A0                             26
131
+#define DOGLCD_CS                             24
132
+#define DOGLCD_MOSI                           -1
133
+#define DOGLCD_SCK                            -1
134 134
 
135
-#define BTN_EN1            23
136
-#define BTN_EN2            25
137
-#define BTN_ENC            27
135
+#define BTN_EN1                               23
136
+#define BTN_EN2                               25
137
+#define BTN_ENC                               27
138 138
 
139 139
 // Hardware buttons for manual movement of XYZ
140
-#define SHIFT_OUT          19
141
-#define SHIFT_LD           18
142
-#define SHIFT_CLK          17
140
+#define SHIFT_OUT                             19
141
+#define SHIFT_LD                              18
142
+#define SHIFT_CLK                             17
143 143
 
144
-//#define UI1                31
145
-//#define UI2                22
144
+//#define UI1                                 31
145
+//#define UI2                                 22
146 146
 
147
-#define STAT_LED_BLUE_PIN  -1
148
-#define STAT_LED_RED_PIN   31
147
+#define STAT_LED_BLUE_PIN                     -1
148
+#define STAT_LED_RED_PIN                      31

+ 69
- 69
Marlin/src/pins/mega/pins_CNCONTROLS_12.h Parādīt failu

@@ -34,122 +34,122 @@
34 34
 //
35 35
 // Limit Switches
36 36
 //
37
-#define X_STOP_PIN         19
38
-#define Y_STOP_PIN         22
39
-#define Z_STOP_PIN         23
37
+#define X_STOP_PIN                            19
38
+#define Y_STOP_PIN                            22
39
+#define Z_STOP_PIN                            23
40 40
 
41 41
 //
42 42
 // Steppers
43 43
 //
44
-#define X_STEP_PIN         25
45
-#define X_DIR_PIN          27
46
-#define X_ENABLE_PIN       26
44
+#define X_STEP_PIN                            25
45
+#define X_DIR_PIN                             27
46
+#define X_ENABLE_PIN                          26
47 47
 
48
-#define Y_STEP_PIN         28
49
-#define Y_DIR_PIN          30
50
-#define Y_ENABLE_PIN       29
48
+#define Y_STEP_PIN                            28
49
+#define Y_DIR_PIN                             30
50
+#define Y_ENABLE_PIN                          29
51 51
 
52
-#define Z_STEP_PIN         31
53
-#define Z_DIR_PIN          33
54
-#define Z_ENABLE_PIN       32
52
+#define Z_STEP_PIN                            31
53
+#define Z_DIR_PIN                             33
54
+#define Z_ENABLE_PIN                          32
55 55
 
56
-#define E0_STEP_PIN        57
57
-#define E0_DIR_PIN         55
58
-#define E0_ENABLE_PIN      58
56
+#define E0_STEP_PIN                           57
57
+#define E0_DIR_PIN                            55
58
+#define E0_ENABLE_PIN                         58
59 59
 
60
-#define E1_STEP_PIN        61
61
-#define E1_DIR_PIN         62
62
-#define E1_ENABLE_PIN      60
60
+#define E1_STEP_PIN                           61
61
+#define E1_DIR_PIN                            62
62
+#define E1_ENABLE_PIN                         60
63 63
 
64
-#define E2_STEP_PIN        46
65
-#define E2_DIR_PIN         66
66
-#define E2_ENABLE_PIN      44
64
+#define E2_STEP_PIN                           46
65
+#define E2_DIR_PIN                            66
66
+#define E2_ENABLE_PIN                         44
67 67
 
68
-#define E3_STEP_PIN        45
69
-#define E3_DIR_PIN         69
70
-#define E3_ENABLE_PIN      47
68
+#define E3_STEP_PIN                           45
69
+#define E3_DIR_PIN                            69
70
+#define E3_ENABLE_PIN                         47
71 71
 
72 72
 //
73 73
 // Temperature Sensors
74 74
 //
75
-#define TEMP_0_PIN          0   // Analog Input
76
-#define TEMP_1_PIN          9   // Analog Input.  9 for tool2 -> 13 for chambertemp
77
-#define TEMP_2_PIN         13   // Analog Input. 10 for tool3 -> 13 for chambertemp
78
-#define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 13 for chambertemp
79
-#define TEMP_BED_PIN       14   // Analog Input
75
+#define TEMP_0_PIN                             0  // Analog Input
76
+#define TEMP_1_PIN                             9  // Analog Input.  9 for tool2 -> 13 for chambertemp
77
+#define TEMP_2_PIN                            13  // Analog Input. 10 for tool3 -> 13 for chambertemp
78
+#define TEMP_3_PIN                            11  // Analog Input. 11 for tool4 -> 13 for chambertemp
79
+#define TEMP_BED_PIN                          14  // Analog Input
80 80
 
81 81
 #ifndef TEMP_CHAMBER_PIN
82
-  //#define TEMP_CHAMBER_PIN 13 // Analog Input
82
+  //#define TEMP_CHAMBER_PIN                  13  // Analog Input
83 83
 #endif
84 84
 
85 85
 //
86 86
 // Heaters / Fans
87 87
 //
88
-#define HEATER_0_PIN       11
89
-#define HEATER_1_PIN        9
90
-#define HEATER_2_PIN        6
91
-#define HEATER_3_PIN        3
92
-#define HEATER_BED_PIN     24
88
+#define HEATER_0_PIN                          11
89
+#define HEATER_1_PIN                           9
90
+#define HEATER_2_PIN                           6
91
+#define HEATER_3_PIN                           3
92
+#define HEATER_BED_PIN                        24
93 93
 
94 94
 #ifndef FAN_PIN
95
-  #define FAN_PIN           5   // 5 is PWMtool3 -> 7 is common PWM pin for all tools
95
+  #define FAN_PIN                              5  // 5 is PWMtool3 -> 7 is common PWM pin for all tools
96 96
 #endif
97 97
 
98
-#define ORIG_E0_AUTO_FAN_PIN 7
99
-#define ORIG_E1_AUTO_FAN_PIN 7
100
-#define ORIG_E2_AUTO_FAN_PIN 7
101
-#define ORIG_E3_AUTO_FAN_PIN 7
98
+#define ORIG_E0_AUTO_FAN_PIN                   7
99
+#define ORIG_E1_AUTO_FAN_PIN                   7
100
+#define ORIG_E2_AUTO_FAN_PIN                   7
101
+#define ORIG_E3_AUTO_FAN_PIN                   7
102 102
 
103 103
 //
104 104
 // Misc. Functions
105 105
 //
106
-#define SDSS               53
107
-#define SD_DETECT_PIN      15
106
+#define SDSS                                  53
107
+#define SD_DETECT_PIN                         15
108 108
 
109 109
 // Tools
110 110
 
111
-//#define TOOL_0_PIN         56
112
-//#define TOOL_0_PWM_PIN     10   // red warning led at dual extruder
113
-//#define TOOL_1_PIN         59
114
-//#define TOOL_1_PWM_PIN      8   // lights at dual extruder
115
-//#define TOOL_2_PIN          4
116
-//#define TOOL_2_PWM_PIN      5
117
-//#define TOOL_3_PIN         14
118
-//#define TOOL_3_PWM_PIN      2
111
+//#define TOOL_0_PIN                          56
112
+//#define TOOL_0_PWM_PIN                      10  // red warning led at dual extruder
113
+//#define TOOL_1_PIN                          59
114
+//#define TOOL_1_PWM_PIN                       8  // lights at dual extruder
115
+//#define TOOL_2_PIN                           4
116
+//#define TOOL_2_PWM_PIN                       5
117
+//#define TOOL_3_PIN                          14
118
+//#define TOOL_3_PWM_PIN                       2
119 119
 
120 120
 // Common I/O
121 121
 
122 122
 #ifndef FIL_RUNOUT_PIN
123
-  #define FIL_RUNOUT_PIN   18
123
+  #define FIL_RUNOUT_PIN                      18
124 124
 #endif
125
-//#define PWM_1_PIN          12
126
-//#define PWM_2_PIN          13
127
-//#define SPARE_IO           17
125
+//#define PWM_1_PIN                           12
126
+//#define PWM_2_PIN                           13
127
+//#define SPARE_IO                            17
128 128
 
129 129
 //
130 130
 // LCD / Controller
131 131
 //
132
-#define BEEPER_PIN         16
132
+#define BEEPER_PIN                            16
133 133
 
134 134
 // Pins for DOGM SPI LCD Support
135
-#define DOGLCD_A0          39
136
-#define DOGLCD_CS          35
137
-#define DOGLCD_MOSI        48
138
-#define DOGLCD_SCK         49
135
+#define DOGLCD_A0                             39
136
+#define DOGLCD_CS                             35
137
+#define DOGLCD_MOSI                           48
138
+#define DOGLCD_SCK                            49
139 139
 #define LCD_SCREEN_ROT_180
140 140
 
141 141
 // The encoder and click button
142
-#define BTN_EN1            36
143
-#define BTN_EN2            34
144
-#define BTN_ENC            38
142
+#define BTN_EN1                               36
143
+#define BTN_EN2                               34
144
+#define BTN_ENC                               38
145 145
 
146 146
 // Hardware buttons for manual movement of XYZ
147
-#define SHIFT_OUT          42
148
-#define SHIFT_LD           41
149
-#define SHIFT_CLK          40
147
+#define SHIFT_OUT                             42
148
+#define SHIFT_LD                              41
149
+#define SHIFT_CLK                             40
150 150
 
151
-//#define UI1              43
152
-//#define UI2              37
151
+//#define UI1                                 43
152
+//#define UI2                                 37
153 153
 
154
-#define STAT_LED_BLUE_PIN  -1
155
-#define STAT_LED_RED_PIN   10   // TOOL_0_PWM_PIN
154
+#define STAT_LED_BLUE_PIN                     -1
155
+#define STAT_LED_RED_PIN                      10  // TOOL_0_PWM_PIN

+ 39
- 39
Marlin/src/pins/mega/pins_CNCONTROLS_15.h Parādīt failu

@@ -34,79 +34,79 @@
34 34
 //
35 35
 // Servos
36 36
 //
37
-#define SERVO0_PIN          6
37
+#define SERVO0_PIN                             6
38 38
 
39 39
 //
40 40
 // Limit Switches
41 41
 //
42
-#define X_STOP_PIN         34
43
-#define Y_STOP_PIN         39
44
-#define Z_STOP_PIN         62
42
+#define X_STOP_PIN                            34
43
+#define Y_STOP_PIN                            39
44
+#define Z_STOP_PIN                            62
45 45
 
46 46
 #ifndef Z_MIN_PROBE_PIN
47
-  #define Z_MIN_PROBE_PIN  49
47
+  #define Z_MIN_PROBE_PIN                     49
48 48
 #endif
49 49
 
50 50
 //
51 51
 // Steppers
52 52
 //
53
-#define X_STEP_PIN         14
54
-#define X_DIR_PIN          25
55
-#define X_ENABLE_PIN       26
53
+#define X_STEP_PIN                            14
54
+#define X_DIR_PIN                             25
55
+#define X_ENABLE_PIN                          26
56 56
 
57
-#define Y_STEP_PIN         11
58
-#define Y_DIR_PIN          12
59
-#define Y_ENABLE_PIN       15
57
+#define Y_STEP_PIN                            11
58
+#define Y_DIR_PIN                             12
59
+#define Y_ENABLE_PIN                          15
60 60
 
61
-#define Z_STEP_PIN         24
62
-#define Z_DIR_PIN          27
63
-#define Z_ENABLE_PIN       28
61
+#define Z_STEP_PIN                            24
62
+#define Z_DIR_PIN                             27
63
+#define Z_ENABLE_PIN                          28
64 64
 
65
-#define E0_STEP_PIN        64
66
-#define E0_DIR_PIN         65
67
-#define E0_ENABLE_PIN      63
65
+#define E0_STEP_PIN                           64
66
+#define E0_DIR_PIN                            65
67
+#define E0_ENABLE_PIN                         63
68 68
 
69 69
 //
70 70
 // Temperature Sensors
71 71
 // Analog Inputs
72 72
 //
73
-#define TEMP_0_PIN          2   // Analog Input
74
-#define TEMP_BED_PIN        4   // Analog Input
73
+#define TEMP_0_PIN                             2  // Analog Input
74
+#define TEMP_BED_PIN                           4  // Analog Input
75 75
 
76 76
 #ifndef TEMP_CHAMBER_PIN
77
-  #define TEMP_CHAMBER_PIN  5   // Analog Input
77
+  #define TEMP_CHAMBER_PIN                     5  // Analog Input
78 78
 #endif
79 79
 
80 80
 //
81 81
 // Heaters
82 82
 //
83
-#define HEATER_0_PIN        4
84
-#define HEATER_BED_PIN     32
85
-#define HEATER_CHAMBER_PIN 33
83
+#define HEATER_0_PIN                           4
84
+#define HEATER_BED_PIN                        32
85
+#define HEATER_CHAMBER_PIN                    33
86 86
 
87 87
 //
88 88
 // Fans
89 89
 //
90
-#define FAN_PIN               8
91
-#define ORIG_E0_AUTO_FAN_PIN 30
92
-#define ORIG_E1_AUTO_FAN_PIN 30
93
-#define ORIG_E2_AUTO_FAN_PIN 30
94
-#define ORIG_E3_AUTO_FAN_PIN 30
95
-//#define ORIG_CHAMBER_AUTO_FAN_PIN 10
90
+#define FAN_PIN                                8
91
+#define ORIG_E0_AUTO_FAN_PIN                  30
92
+#define ORIG_E1_AUTO_FAN_PIN                  30
93
+#define ORIG_E2_AUTO_FAN_PIN                  30
94
+#define ORIG_E3_AUTO_FAN_PIN                  30
95
+//#define ORIG_CHAMBER_AUTO_FAN_PIN           10
96 96
 
97 97
 //
98 98
 // Misc. Functions
99 99
 //
100
-#define SDSS               53
101
-#define SD_DETECT_PIN      40
100
+#define SDSS                                  53
101
+#define SD_DETECT_PIN                         40
102 102
 
103 103
 // Common I/O
104 104
 
105
-#define FIL_RUNOUT_PIN      9
106
-//#define FIL_RUNOUT_PIN     29  // encoder sensor
107
-//#define PWM_1_PIN          12
108
-//#define PWM_2_PIN          13
109
-//#define SPARE_IO           17
110
-#define BEEPER_PIN         13
111
-#define STAT_LED_BLUE_PIN  -1
112
-#define STAT_LED_RED_PIN   10 // 31
105
+#define FIL_RUNOUT_PIN                         9
106
+//#define FIL_RUNOUT_PIN                      29  // encoder sensor
107
+//#define PWM_1_PIN                           12
108
+//#define PWM_2_PIN                           13
109
+//#define SPARE_IO                            17
110
+#define BEEPER_PIN                            13
111
+#define STAT_LED_BLUE_PIN                     -1
112
+#define STAT_LED_RED_PIN                      10  // 31

+ 34
- 34
Marlin/src/pins/mega/pins_EINSTART-S.h Parādīt failu

@@ -35,48 +35,48 @@
35 35
 //
36 36
 // Limit Switches
37 37
 //
38
-#define X_STOP_PIN         44
39
-#define Y_STOP_PIN         43
40
-#define Z_STOP_PIN         42
38
+#define X_STOP_PIN                            44
39
+#define Y_STOP_PIN                            43
40
+#define Z_STOP_PIN                            42
41 41
 
42 42
 //
43 43
 // Steppers
44 44
 //
45
-#define X_STEP_PIN         76
46
-#define X_DIR_PIN          75
47
-#define X_ENABLE_PIN       73
45
+#define X_STEP_PIN                            76
46
+#define X_DIR_PIN                             75
47
+#define X_ENABLE_PIN                          73
48 48
 
49
-#define Y_STEP_PIN         31
50
-#define Y_DIR_PIN          32
51
-#define Y_ENABLE_PIN       72
49
+#define Y_STEP_PIN                            31
50
+#define Y_DIR_PIN                             32
51
+#define Y_ENABLE_PIN                          72
52 52
 
53
-#define Z_STEP_PIN         34
54
-#define Z_DIR_PIN          35
55
-#define Z_ENABLE_PIN       33
53
+#define Z_STEP_PIN                            34
54
+#define Z_DIR_PIN                             35
55
+#define Z_ENABLE_PIN                          33
56 56
 
57
-#define E0_STEP_PIN        36
58
-#define E0_DIR_PIN         37
59
-#define E0_ENABLE_PIN      30
57
+#define E0_STEP_PIN                           36
58
+#define E0_DIR_PIN                            37
59
+#define E0_ENABLE_PIN                         30
60 60
 
61 61
 //
62 62
 // Temperature Sensors
63 63
 //
64
-#define TEMP_0_PIN          0   // Analog Input
65
-#define TEMP_BED_PIN        1   // Analog Input
64
+#define TEMP_0_PIN                             0  // Analog Input
65
+#define TEMP_BED_PIN                           1  // Analog Input
66 66
 
67 67
 //
68 68
 // Heaters / Fans
69 69
 //
70
-#define HEATER_0_PIN       83
71
-#define HEATER_BED_PIN     38
70
+#define HEATER_0_PIN                          83
71
+#define HEATER_BED_PIN                        38
72 72
 
73
-#define FAN_PIN            82
73
+#define FAN_PIN                               82
74 74
 
75 75
 //
76 76
 // Misc. Functions
77 77
 //
78
-#define SDSS               53
79
-#define LED_PIN             4
78
+#define SDSS                                  53
79
+#define LED_PIN                                4
80 80
 
81 81
 //////////////////////////
82 82
 // LCDs and Controllers //
@@ -90,24 +90,24 @@
90 90
 // u8glib constructor
91 91
 // U8GLIB_SH1106_128X64 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, LCD_PINS_DC, LCD_PINS_RS);
92 92
 
93
-#define LCD_PINS_DC        78
94
-#define LCD_PINS_RS        79
93
+#define LCD_PINS_DC                           78
94
+#define LCD_PINS_RS                           79
95 95
 // DOGM SPI LCD Support
96
-#define DOGLCD_CS           3
97
-#define DOGLCD_MOSI         2
98
-#define DOGLCD_SCK          5
99
-#define DOGLCD_A0           2
96
+#define DOGLCD_CS                              3
97
+#define DOGLCD_MOSI                            2
98
+#define DOGLCD_SCK                             5
99
+#define DOGLCD_A0                              2
100 100
 
101 101
 //
102 102
 // LCD Display input pins
103 103
 //
104
-#define BTN_UP             25
105
-#define BTN_DWN            26
106
-#define BTN_LFT            27
107
-#define BTN_RT             28
104
+#define BTN_UP                                25
105
+#define BTN_DWN                               26
106
+#define BTN_LFT                               27
107
+#define BTN_RT                                28
108 108
 
109 109
 // 'OK' button
110
-#define BTN_ENC            29
110
+#define BTN_ENC                               29
111 111
 
112 112
 // Set Kill to right arrow, same as RIGID_PANEL
113
-#define KILL_PIN           28
113
+#define KILL_PIN                              28

+ 52
- 52
Marlin/src/pins/mega/pins_ELEFU_3.h Parādīt failu

@@ -34,115 +34,115 @@
34 34
 //
35 35
 // Limit Switches
36 36
 //
37
-#define X_MIN_PIN          35
38
-#define X_MAX_PIN          34
39
-#define Y_MIN_PIN          33
40
-#define Y_MAX_PIN          32
41
-#define Z_MIN_PIN          31
42
-#define Z_MAX_PIN          30
37
+#define X_MIN_PIN                             35
38
+#define X_MAX_PIN                             34
39
+#define Y_MIN_PIN                             33
40
+#define Y_MAX_PIN                             32
41
+#define Z_MIN_PIN                             31
42
+#define Z_MAX_PIN                             30
43 43
 
44 44
 //
45 45
 // Z Probe (when not Z_MIN_PIN)
46 46
 //
47 47
 #ifndef Z_MIN_PROBE_PIN
48
-  #define Z_MIN_PROBE_PIN  30
48
+  #define Z_MIN_PROBE_PIN                     30
49 49
 #endif
50 50
 
51 51
 //
52 52
 // Steppers
53 53
 //
54
-#define X_STEP_PIN         49
55
-#define X_DIR_PIN          13
56
-#define X_ENABLE_PIN       48
54
+#define X_STEP_PIN                            49
55
+#define X_DIR_PIN                             13
56
+#define X_ENABLE_PIN                          48
57 57
 
58
-#define Y_STEP_PIN         11
59
-#define Y_DIR_PIN           9
60
-#define Y_ENABLE_PIN       12
58
+#define Y_STEP_PIN                            11
59
+#define Y_DIR_PIN                              9
60
+#define Y_ENABLE_PIN                          12
61 61
 
62
-#define Z_STEP_PIN          7
63
-#define Z_DIR_PIN           6
64
-#define Z_ENABLE_PIN        8
62
+#define Z_STEP_PIN                             7
63
+#define Z_DIR_PIN                              6
64
+#define Z_ENABLE_PIN                           8
65 65
 
66
-#define E0_STEP_PIN        40
67
-#define E0_DIR_PIN         41
68
-#define E0_ENABLE_PIN      37
66
+#define E0_STEP_PIN                           40
67
+#define E0_DIR_PIN                            41
68
+#define E0_ENABLE_PIN                         37
69 69
 
70
-#define E1_STEP_PIN        18
71
-#define E1_DIR_PIN         19
72
-#define E1_ENABLE_PIN      38
70
+#define E1_STEP_PIN                           18
71
+#define E1_DIR_PIN                            19
72
+#define E1_ENABLE_PIN                         38
73 73
 
74
-#define E2_STEP_PIN        43
75
-#define E2_DIR_PIN         47
76
-#define E2_ENABLE_PIN      42
74
+#define E2_STEP_PIN                           43
75
+#define E2_DIR_PIN                            47
76
+#define E2_ENABLE_PIN                         42
77 77
 
78 78
 //
79 79
 // Temperature Sensors
80 80
 //
81
-#define TEMP_0_PIN          3   // Analog Input
82
-#define TEMP_1_PIN          2   // Analog Input
83
-#define TEMP_2_PIN          1   // Analog Input
84
-#define TEMP_BED_PIN        0   // Analog Input
81
+#define TEMP_0_PIN                             3  // Analog Input
82
+#define TEMP_1_PIN                             2  // Analog Input
83
+#define TEMP_2_PIN                             1  // Analog Input
84
+#define TEMP_BED_PIN                           0  // Analog Input
85 85
 
86 86
 //
87 87
 // Heaters / Fans
88 88
 //
89
-#define HEATER_0_PIN       45   // 12V PWM1
90
-#define HEATER_1_PIN       46   // 12V PWM2
91
-#define HEATER_2_PIN       17   // 12V PWM3
92
-#define HEATER_BED_PIN     44   // DOUBLE 12V PWM
89
+#define HEATER_0_PIN                          45  // 12V PWM1
90
+#define HEATER_1_PIN                          46  // 12V PWM2
91
+#define HEATER_2_PIN                          17  // 12V PWM3
92
+#define HEATER_BED_PIN                        44  // DOUBLE 12V PWM
93 93
 
94 94
 #ifndef FAN_PIN
95
-  #define FAN_PIN          16   // 5V PWM
95
+  #define FAN_PIN                             16  // 5V PWM
96 96
 #endif
97 97
 
98 98
 //
99 99
 // Misc. Functions
100 100
 //
101
-#define PS_ON_PIN          10   // Set to -1 if using a manual switch on the PWRSW Connector
102
-#define SLEEP_WAKE_PIN     26   // This feature still needs work
103
-#define PHOTOGRAPH_PIN     29
101
+#define PS_ON_PIN                             10  // Set to -1 if using a manual switch on the PWRSW Connector
102
+#define SLEEP_WAKE_PIN                        26  // This feature still needs work
103
+#define PHOTOGRAPH_PIN                        29
104 104
 
105 105
 //
106 106
 // LCD / Controller
107 107
 //
108
-#define BEEPER_PIN         36
108
+#define BEEPER_PIN                            36
109 109
 
110 110
 #if ENABLED(RA_CONTROL_PANEL)
111 111
 
112
-  #define SDSS             53
113
-  #define SD_DETECT_PIN    28
112
+  #define SDSS                                53
113
+  #define SD_DETECT_PIN                       28
114 114
 
115
-  #define BTN_EN1          14
116
-  #define BTN_EN2          39
117
-  #define BTN_ENC          15
115
+  #define BTN_EN1                             14
116
+  #define BTN_EN2                             39
117
+  #define BTN_ENC                             15
118 118
 
119 119
 #endif // RA_CONTROL_PANEL
120 120
 
121 121
 #if ENABLED(RA_DISCO)
122 122
   // variables for which pins the TLC5947 is using
123
-  #define TLC_CLOCK_PIN    25
124
-  #define TLC_BLANK_PIN    23
125
-  #define TLC_XLAT_PIN     22
126
-  #define TLC_DATA_PIN     24
123
+  #define TLC_CLOCK_PIN                       25
124
+  #define TLC_BLANK_PIN                       23
125
+  #define TLC_XLAT_PIN                        22
126
+  #define TLC_DATA_PIN                        24
127 127
 
128 128
   // We also need to define pin to port number mapping for the 2560 to match the pins listed above.
129 129
   // If you change the TLC pins, update this as well per the 2560 datasheet! This currently only works with the RA Board.
130
-  #define TLC_CLOCK_BIT     3
130
+  #define TLC_CLOCK_BIT                        3
131 131
   #define TLC_CLOCK_PORT    &PORTA
132 132
 
133
-  #define TLC_BLANK_BIT     1
133
+  #define TLC_BLANK_BIT                        1
134 134
   #define TLC_BLANK_PORT    &PORTA
135 135
 
136
-  #define TLC_DATA_BIT      2
136
+  #define TLC_DATA_BIT                         2
137 137
   #define TLC_DATA_PORT     &PORTA
138 138
 
139
-  #define TLC_XLAT_BIT      0
139
+  #define TLC_XLAT_BIT                         0
140 140
   #define TLC_XLAT_PORT     &PORTA
141 141
 
142 142
   // Change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
143 143
   // Leave it at at least 1 if you have enabled RA_LIGHTING
144 144
   // 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.
145
-  #define NUM_TLCS          2
145
+  #define NUM_TLCS                             2
146 146
 
147 147
   // These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
148 148
   // Modify them according to your specific situation.

+ 60
- 60
Marlin/src/pins/mega/pins_GT2560_REV_A.h Parādīt failu

@@ -39,102 +39,102 @@
39 39
 //
40 40
 // Limit Switches
41 41
 //
42
-#define X_MIN_PIN          22
43
-#define X_MAX_PIN          24
44
-#define Y_MIN_PIN          26
45
-#define Y_MAX_PIN          28
46
-#define Z_MIN_PIN          30
47
-#define Z_MAX_PIN          32
42
+#define X_MIN_PIN                             22
43
+#define X_MAX_PIN                             24
44
+#define Y_MIN_PIN                             26
45
+#define Y_MAX_PIN                             28
46
+#define Z_MIN_PIN                             30
47
+#define Z_MAX_PIN                             32
48 48
 
49 49
 //
50 50
 // Steppers
51 51
 //
52
-#define X_STEP_PIN         25
53
-#define X_DIR_PIN          23
54
-#define X_ENABLE_PIN       27
52
+#define X_STEP_PIN                            25
53
+#define X_DIR_PIN                             23
54
+#define X_ENABLE_PIN                          27
55 55
 
56
-#define Y_STEP_PIN         31
57
-#define Y_DIR_PIN          33
58
-#define Y_ENABLE_PIN       29
56
+#define Y_STEP_PIN                            31
57
+#define Y_DIR_PIN                             33
58
+#define Y_ENABLE_PIN                          29
59 59
 
60
-#define Z_STEP_PIN         37
61
-#define Z_DIR_PIN          39
62
-#define Z_ENABLE_PIN       35
60
+#define Z_STEP_PIN                            37
61
+#define Z_DIR_PIN                             39
62
+#define Z_ENABLE_PIN                          35
63 63
 
64
-#define E0_STEP_PIN        43
65
-#define E0_DIR_PIN         45
66
-#define E0_ENABLE_PIN      41
64
+#define E0_STEP_PIN                           43
65
+#define E0_DIR_PIN                            45
66
+#define E0_ENABLE_PIN                         41
67 67
 
68
-#define E1_STEP_PIN        49
69
-#define E1_DIR_PIN         47
70
-#define E1_ENABLE_PIN      48
68
+#define E1_STEP_PIN                           49
69
+#define E1_DIR_PIN                            47
70
+#define E1_ENABLE_PIN                         48
71 71
 
72 72
 //
73 73
 // Temperature Sensors
74 74
 //
75
-#define TEMP_0_PIN          8
76
-#define TEMP_1_PIN          9
77
-#define TEMP_BED_PIN       10
75
+#define TEMP_0_PIN                             8
76
+#define TEMP_1_PIN                             9
77
+#define TEMP_BED_PIN                          10
78 78
 
79 79
 //
80 80
 // Heaters / Fans
81 81
 //
82
-#define HEATER_0_PIN        2
83
-#define HEATER_1_PIN        3
84
-#define HEATER_BED_PIN      4
82
+#define HEATER_0_PIN                           2
83
+#define HEATER_1_PIN                           3
84
+#define HEATER_BED_PIN                         4
85 85
 #ifndef FAN_PIN
86
-  #define FAN_PIN           7
86
+  #define FAN_PIN                              7
87 87
 #endif
88 88
 
89 89
 //
90 90
 // Misc. Functions
91 91
 //
92
-#define SDSS               53
93
-#define LED_PIN            13
94
-#define PS_ON_PIN          12
95
-#define SUICIDE_PIN        54   // Must be enabled at startup to keep power flowing
96
-#define KILL_PIN           -1
92
+#define SDSS                                  53
93
+#define LED_PIN                               13
94
+#define PS_ON_PIN                             12
95
+#define SUICIDE_PIN                           54  // Must be enabled at startup to keep power flowing
96
+#define KILL_PIN                              -1
97 97
 
98 98
 #if HAS_SPI_LCD
99 99
 
100
-  #define BEEPER_PIN       18
100
+  #define BEEPER_PIN                          18
101 101
 
102 102
   #if ENABLED(NEWPANEL)
103 103
 
104 104
     #if ENABLED(MKS_MINI_12864)
105
-      #define DOGLCD_A0     5
106
-      #define DOGLCD_CS    21
107
-      #define BTN_EN1      40
108
-      #define BTN_EN2      42
105
+      #define DOGLCD_A0                        5
106
+      #define DOGLCD_CS                       21
107
+      #define BTN_EN1                         40
108
+      #define BTN_EN2                         42
109 109
     #else
110
-      #define LCD_PINS_RS  20
111
-      #define LCD_PINS_ENABLE 17
112
-      #define LCD_PINS_D4  16
113
-      #define LCD_PINS_D5  21
114
-      #define LCD_PINS_D6   5
115
-      #define LCD_PINS_D7   6
116
-      #define BTN_EN1      42
117
-      #define BTN_EN2      40
110
+      #define LCD_PINS_RS                     20
111
+      #define LCD_PINS_ENABLE                 17
112
+      #define LCD_PINS_D4                     16
113
+      #define LCD_PINS_D5                     21
114
+      #define LCD_PINS_D6                      5
115
+      #define LCD_PINS_D7                      6
116
+      #define BTN_EN1                         42
117
+      #define BTN_EN2                         40
118 118
     #endif
119 119
 
120
-    #define BTN_ENC        19
121
-    #define SD_DETECT_PIN  38
120
+    #define BTN_ENC                           19
121
+    #define SD_DETECT_PIN                     38
122 122
 
123
-  #else // !NEWPANEL
123
+  #else                                           // !NEWPANEL
124 124
 
125
-    #define SHIFT_CLK      38
126
-    #define SHIFT_LD       42
127
-    #define SHIFT_OUT      40
128
-    #define SHIFT_EN       17
125
+    #define SHIFT_CLK                         38
126
+    #define SHIFT_LD                          42
127
+    #define SHIFT_OUT                         40
128
+    #define SHIFT_EN                          17
129 129
 
130
-    #define LCD_PINS_RS    16
131
-    #define LCD_PINS_ENABLE 5
132
-    #define LCD_PINS_D4     6
133
-    #define LCD_PINS_D5    21
134
-    #define LCD_PINS_D6    20
135
-    #define LCD_PINS_D7    19
130
+    #define LCD_PINS_RS                       16
131
+    #define LCD_PINS_ENABLE                    5
132
+    #define LCD_PINS_D4                        6
133
+    #define LCD_PINS_D5                       21
134
+    #define LCD_PINS_D6                       20
135
+    #define LCD_PINS_D7                       19
136 136
 
137
-    #define SD_DETECT_PIN  -1
137
+    #define SD_DETECT_PIN                     -1
138 138
 
139 139
   #endif // !NEWPANEL
140 140
 

+ 57
- 57
Marlin/src/pins/mega/pins_GT2560_V3.h Parādīt failu

@@ -36,33 +36,33 @@
36 36
 //
37 37
 // Servos
38 38
 //
39
-#define SERVO0_PIN         11   //13 untested  3Dtouch
39
+#define SERVO0_PIN                            11  //13 untested  3Dtouch
40 40
 
41 41
 //
42 42
 // Limit Switches
43 43
 //
44 44
 #ifndef X_STOP_PIN
45 45
   #ifndef X_MIN_PIN
46
-    #define X_MIN_PIN      24
46
+    #define X_MIN_PIN                         24
47 47
   #endif
48 48
   #ifndef X_MAX_PIN
49
-    #define X_MAX_PIN      22
49
+    #define X_MAX_PIN                         22
50 50
   #endif
51 51
 #endif
52 52
 #ifndef Y_STOP_PIN
53 53
   #ifndef Y_MIN_PIN
54
-    #define Y_MIN_PIN      28
54
+    #define Y_MIN_PIN                         28
55 55
   #endif
56 56
   #ifndef Y_MAX_PIN
57
-    #define Y_MAX_PIN      26
57
+    #define Y_MAX_PIN                         26
58 58
   #endif
59 59
 #endif
60 60
 #ifndef Z_STOP_PIN
61 61
   #ifndef Z_MIN_PIN
62
-    #define Z_MIN_PIN      30
62
+    #define Z_MIN_PIN                         30
63 63
   #endif
64 64
   #ifndef Z_MAX_PIN
65
-    #define Z_MAX_PIN      32
65
+    #define Z_MAX_PIN                         32
66 66
   #endif
67 67
 #endif
68 68
 
@@ -70,116 +70,116 @@
70 70
 // Z Probe (when not Z_MIN_PIN)
71 71
 //
72 72
 #ifndef Z_MIN_PROBE_PIN
73
-  #define Z_MIN_PROBE_PIN  32
73
+  #define Z_MIN_PROBE_PIN                     32
74 74
 #endif
75 75
 
76 76
 //
77 77
 // Runout Sensor
78 78
 //
79 79
 #ifndef FIL_RUNOUT_PIN
80
-  #define FIL_RUNOUT_PIN   66
80
+  #define FIL_RUNOUT_PIN                      66
81 81
 #endif
82 82
 #ifndef FIL_RUNOUT2_PIN
83
-  #define FIL_RUNOUT2_PIN  67
83
+  #define FIL_RUNOUT2_PIN                     67
84 84
 #endif
85 85
 
86 86
 //
87 87
 // Power Recovery
88 88
 //
89
-#define POWER_LOSS_PIN     69   // Pin to detect power loss
90
-#define POWER_LOSS_STATE   LOW
89
+#define POWER_LOSS_PIN                        69  // Pin to detect power loss
90
+#define POWER_LOSS_STATE                     LOW
91 91
 
92 92
 //
93 93
 // Steppers
94 94
 //
95
-#define X_STEP_PIN         37
96
-#define X_DIR_PIN          39
97
-#define X_ENABLE_PIN       35
95
+#define X_STEP_PIN                            37
96
+#define X_DIR_PIN                             39
97
+#define X_ENABLE_PIN                          35
98 98
 
99
-#define Y_STEP_PIN         31
100
-#define Y_DIR_PIN          33
101
-#define Y_ENABLE_PIN       29
99
+#define Y_STEP_PIN                            31
100
+#define Y_DIR_PIN                             33
101
+#define Y_ENABLE_PIN                          29
102 102
 
103
-#define Z_STEP_PIN         25
104
-#define Z_DIR_PIN          23
105
-#define Z_ENABLE_PIN       27
103
+#define Z_STEP_PIN                            25
104
+#define Z_DIR_PIN                             23
105
+#define Z_ENABLE_PIN                          27
106 106
 
107
-#define E0_STEP_PIN        46
108
-#define E0_DIR_PIN         44
109
-#define E0_ENABLE_PIN      12
107
+#define E0_STEP_PIN                           46
108
+#define E0_DIR_PIN                            44
109
+#define E0_ENABLE_PIN                         12
110 110
 
111
-#define E1_STEP_PIN        49
112
-#define E1_DIR_PIN         47
113
-#define E1_ENABLE_PIN      48
111
+#define E1_STEP_PIN                           49
112
+#define E1_DIR_PIN                            47
113
+#define E1_ENABLE_PIN                         48
114 114
 
115
-#define E2_STEP_PIN        43
116
-#define E2_DIR_PIN         45
117
-#define E2_ENABLE_PIN      41
115
+#define E2_STEP_PIN                           43
116
+#define E2_DIR_PIN                            45
117
+#define E2_ENABLE_PIN                         41
118 118
 
119 119
 //
120 120
 // Temperature Sensors
121 121
 //
122
-#define TEMP_0_PIN         11   // Analog Input
123
-#define TEMP_1_PIN          9   // Analog Input
124
-#define TEMP_2_PIN          1   // Analog Input
125
-#define TEMP_BED_PIN       10   // Analog Input
122
+#define TEMP_0_PIN                            11  // Analog Input
123
+#define TEMP_1_PIN                             9  // Analog Input
124
+#define TEMP_2_PIN                             1  // Analog Input
125
+#define TEMP_BED_PIN                          10  // Analog Input
126 126
 
127 127
 //
128 128
 // Heaters / Fans
129 129
 //
130
-#define HEATER_0_PIN       10
131
-#define HEATER_1_PIN        3
132
-#define HEATER_2_PIN        1
133
-#define HEATER_BED_PIN      4
134
-#define FAN_PIN             9
135
-#define FAN1_PIN            8
136
-#define FAN2_PIN            7
130
+#define HEATER_0_PIN                          10
131
+#define HEATER_1_PIN                           3
132
+#define HEATER_2_PIN                           1
133
+#define HEATER_BED_PIN                         4
134
+#define FAN_PIN                                9
135
+#define FAN1_PIN                               8
136
+#define FAN2_PIN                               7
137 137
 
138 138
 //
139 139
 // Misc. Functions
140 140
 //
141
-#define SD_DETECT_PIN      38
142
-#define SDSS               53
143
-#define LED_PIN             6
144
-#define PS_ON_PIN          12
145
-#define SUICIDE_PIN        54   // This pin must be enabled at boot to keep power flowing
141
+#define SD_DETECT_PIN                         38
142
+#define SDSS                                  53
143
+#define LED_PIN                                6
144
+#define PS_ON_PIN                             12
145
+#define SUICIDE_PIN                           54  // This pin must be enabled at boot to keep power flowing
146 146
 
147 147
 #ifndef CASE_LIGHT_PIN
148
-  #define CASE_LIGHT_PIN    6   // 21
148
+  #define CASE_LIGHT_PIN                       6  // 21
149 149
 #endif
150 150
 
151 151
 //
152 152
 // LCD Controller
153 153
 //
154
-#define BEEPER_PIN         18
154
+#define BEEPER_PIN                            18
155 155
 
156 156
 #ifndef LCD_PINS_RS
157
-  #define LCD_PINS_RS      20
157
+  #define LCD_PINS_RS                         20
158 158
 #endif
159 159
 #ifndef LCD_PINS_ENABLE
160
-  #define LCD_PINS_ENABLE  17
160
+  #define LCD_PINS_ENABLE                     17
161 161
 #endif
162 162
 #ifndef LCD_PINS_D4
163
-  #define LCD_PINS_D4      16
163
+  #define LCD_PINS_D4                         16
164 164
 #endif
165 165
 #ifndef LCD_PINS_D5
166
-  #define LCD_PINS_D5      21
166
+  #define LCD_PINS_D5                         21
167 167
 #endif
168 168
 #ifndef LCD_PINS_D6
169
-  #define LCD_PINS_D6       5
169
+  #define LCD_PINS_D6                          5
170 170
 #endif
171 171
 #ifndef LCD_PINS_D7
172
-  #define LCD_PINS_D7      36
172
+  #define LCD_PINS_D7                         36
173 173
 #endif
174 174
 
175 175
 #if ENABLED(NEWPANEL)
176 176
   #ifndef BTN_EN1
177
-    #define BTN_EN1        42
177
+    #define BTN_EN1                           42
178 178
   #endif
179 179
   #ifndef BTN_EN2
180
-    #define BTN_EN2        40
180
+    #define BTN_EN2                           40
181 181
   #endif
182 182
   #ifndef BTN_ENC
183
-    #define BTN_ENC        19
183
+    #define BTN_ENC                           19
184 184
   #endif
185 185
 #endif

+ 7
- 7
Marlin/src/pins/mega/pins_GT2560_V3_A20.h Parādīt failu

@@ -25,15 +25,15 @@
25 25
  * Geeetech A20M pin assignment
26 26
  */
27 27
 
28
-#define LCD_PINS_RS       5
29
-#define LCD_PINS_ENABLE  36
30
-#define LCD_PINS_D4      21
31
-#define LCD_PINS_D7       6
28
+#define LCD_PINS_RS                           5
29
+#define LCD_PINS_ENABLE                      36
30
+#define LCD_PINS_D4                          21
31
+#define LCD_PINS_D7                           6
32 32
 
33 33
 #if ENABLED(NEWPANEL)
34
-  #define BTN_EN1        16
35
-  #define BTN_EN2        17
36
-  #define BTN_ENC        19
34
+  #define BTN_EN1                            16
35
+  #define BTN_EN2                            17
36
+  #define BTN_ENC                            19
37 37
 #endif
38 38
 
39 39
 #include "pins_GT2560_V3.h"

+ 4
- 4
Marlin/src/pins/mega/pins_GT2560_V3_MC2.h Parādīt failu

@@ -27,9 +27,9 @@
27 27
 
28 28
 #define BOARD_INFO_NAME "GT2560 V3.0 (MC2)"
29 29
 
30
-#define X_MIN_PIN          22
31
-#define X_MAX_PIN          24
32
-#define Y_MIN_PIN          26
33
-#define Y_MAX_PIN          28
30
+#define X_MIN_PIN                            22
31
+#define X_MAX_PIN                            24
32
+#define Y_MIN_PIN                            26
33
+#define Y_MAX_PIN                            28
34 34
 
35 35
 #include "pins_GT2560_V3.h"

+ 63
- 63
Marlin/src/pins/mega/pins_HJC2560C_REV2.h Parādīt failu

@@ -42,79 +42,79 @@
42 42
 //
43 43
 // Limit Switches
44 44
 //
45
-#define X_STOP_PIN         22
46
-#define Y_STOP_PIN         26
47
-#define Z_STOP_PIN         29
48
-//#define EXP_STOP_PIN       28
45
+#define X_STOP_PIN                            22
46
+#define Y_STOP_PIN                            26
47
+#define Z_STOP_PIN                            29
48
+//#define EXP_STOP_PIN                        28
49 49
 
50 50
 //
51 51
 // Steppers
52 52
 //
53
-#define X_STEP_PIN         25
54
-#define X_DIR_PIN          23
55
-#define X_ENABLE_PIN       27
53
+#define X_STEP_PIN                            25
54
+#define X_DIR_PIN                             23
55
+#define X_ENABLE_PIN                          27
56 56
 
57
-#define Y_STEP_PIN         32
58
-#define Y_DIR_PIN          33
59
-#define Y_ENABLE_PIN       31
57
+#define Y_STEP_PIN                            32
58
+#define Y_DIR_PIN                             33
59
+#define Y_ENABLE_PIN                          31
60 60
 
61
-#define Z_STEP_PIN         35
62
-#define Z_DIR_PIN          36
63
-#define Z_ENABLE_PIN       34
61
+#define Z_STEP_PIN                            35
62
+#define Z_DIR_PIN                             36
63
+#define Z_ENABLE_PIN                          34
64 64
 
65
-#define E0_STEP_PIN        42
66
-#define E0_DIR_PIN         43
67
-#define E0_ENABLE_PIN      37
65
+#define E0_STEP_PIN                           42
66
+#define E0_DIR_PIN                            43
67
+#define E0_ENABLE_PIN                         37
68 68
 
69
-#define E1_STEP_PIN        49
70
-#define E1_DIR_PIN         47
71
-#define E1_ENABLE_PIN      48
69
+#define E1_STEP_PIN                           49
70
+#define E1_DIR_PIN                            47
71
+#define E1_ENABLE_PIN                         48
72 72
 
73
-#define MOTOR_CURRENT_PWM_XY_PIN   44
74
-#define MOTOR_CURRENT_PWM_Z_PIN    45
75
-#define MOTOR_CURRENT_PWM_E_PIN    46
73
+#define MOTOR_CURRENT_PWM_XY_PIN              44
74
+#define MOTOR_CURRENT_PWM_Z_PIN               45
75
+#define MOTOR_CURRENT_PWM_E_PIN               46
76 76
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
77 77
 #ifndef MOTOR_CURRENT_PWM_RANGE
78
-  #define MOTOR_CURRENT_PWM_RANGE  2000
78
+  #define MOTOR_CURRENT_PWM_RANGE            2000
79 79
 #endif
80 80
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1300, 1300, 1250 }
81 81
 
82 82
 //
83 83
 // Temperature Sensors
84 84
 //
85
-#define TEMP_0_PIN          8   // Analog Input
86
-#define TEMP_1_PIN          9   // Analog Input
87
-#define TEMP_BED_PIN       10   // Analog Input
85
+#define TEMP_0_PIN                             8  // Analog Input
86
+#define TEMP_1_PIN                             9  // Analog Input
87
+#define TEMP_BED_PIN                          10  // Analog Input
88 88
 
89 89
 //
90 90
 // Heaters / Fans
91 91
 //
92
-#define HEATER_0_PIN        2
93
-#define HEATER_1_PIN        3
94
-#define HEATER_BED_PIN      4
92
+#define HEATER_0_PIN                           2
93
+#define HEATER_1_PIN                           3
94
+#define HEATER_BED_PIN                         4
95 95
 
96 96
 #ifndef FAN_PIN
97
-  #define FAN_PIN           7   //默认不使用PWM_FAN冷却喷嘴,如果需要,则取消注释
97
+  #define FAN_PIN                              7  //默认不使用PWM_FAN冷却喷嘴,如果需要,则取消注释
98 98
 #endif
99 99
 
100 100
 //
101 101
 // Misc. Functions
102 102
 //
103
-#define SDSS               53
104
-#define SD_DETECT_PIN      39
105
-//#define LED_PIN           8
106
-#define CASE_LIGHT_PIN      8           // 8 默认挤出机风扇作为Case LED,如果需要PWM FAN,则需要将FAN_PIN置为7,LED_PIN置为8
103
+#define SDSS                                  53
104
+#define SD_DETECT_PIN                         39
105
+//#define LED_PIN                              8
106
+#define CASE_LIGHT_PIN                         8  // 8 默认挤出机风扇作为Case LED,如果需要PWM FAN,则需要将FAN_PIN置为7,LED_PIN置为8
107 107
 
108
-//#define SAFETY_TRIGGERED_PIN     28   // PIN to detect the safety circuit has triggered
109
-//#define MAIN_VOLTAGE_MEASURE_PIN 14   // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
108
+//#define SAFETY_TRIGGERED_PIN                28  // PIN to detect the safety circuit has triggered
109
+//#define MAIN_VOLTAGE_MEASURE_PIN            14  // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
110 110
 
111 111
 //
112 112
 // M3/M4/M5 - Spindle/Laser Control
113 113
 //
114 114
 #if ENABLED(SPINDLE_LASER_ENABLE)
115
-  #define SPINDLE_DIR_PIN           16
116
-  #define SPINDLE_LASER_ENABLE_PIN  17   // Pin should have a pullup!
117
-  #define SPINDLE_LASER_PWM_PIN      9   // Hardware PWM
115
+  #define SPINDLE_DIR_PIN                     16
116
+  #define SPINDLE_LASER_ENABLE_PIN            17  // Pin should have a pullup!
117
+  #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
118 118
 #endif
119 119
 
120 120
 //
@@ -122,48 +122,48 @@
122 122
 //
123 123
 #if HAS_SPI_LCD
124 124
 
125
-  #define BEEPER_PIN       18
125
+  #define BEEPER_PIN                          18
126 126
 
127 127
   #if ENABLED(NEWPANEL)
128 128
 
129
-    #define LCD_PINS_RS     20   // LCD_CS
130
-    #define LCD_PINS_ENABLE 15   // LCD_SDA
131
-    #define LCD_PINS_D4     14   // LCD_SCK
129
+    #define LCD_PINS_RS                       20  // LCD_CS
130
+    #define LCD_PINS_ENABLE                   15  // LCD_SDA
131
+    #define LCD_PINS_D4                       14  // LCD_SCK
132 132
 
133 133
     #if ENABLED(HJC_LCD_SMART_CONTROLLER)
134
-      #define LCD_BACKLIGHT_PIN  5   // LCD_Backlight
134
+      #define LCD_BACKLIGHT_PIN                5  // LCD_Backlight
135 135
       //#ifndef LCD_CONTRAST_PIN
136 136
       //  #define LCD_CONTRAST_PIN  5   // LCD_Contrast
137 137
       //#endif
138 138
       #ifndef FIL_RUNOUT_PIN
139
-        #define FIL_RUNOUT_PIN 24   // Filament runout
139
+        #define FIL_RUNOUT_PIN                24  // Filament runout
140 140
       #endif
141 141
     #else
142
-      #define LCD_PINS_D5  21
143
-      #define LCD_PINS_D6   5
144
-      #define LCD_PINS_D7   6
142
+      #define LCD_PINS_D5                     21
143
+      #define LCD_PINS_D6                      5
144
+      #define LCD_PINS_D7                      6
145 145
     #endif
146 146
 
147
-    #define BTN_EN1        41
148
-    #define BTN_EN2        40
149
-    #define BTN_ENC        19
147
+    #define BTN_EN1                           41
148
+    #define BTN_EN2                           40
149
+    #define BTN_ENC                           19
150 150
 
151
-    #define SD_DETECT_PIN  39
151
+    #define SD_DETECT_PIN                     39
152 152
 
153 153
   #else
154 154
 
155 155
     // Buttons attached to a shift register
156
-    #define SHIFT_CLK      38
157
-    #define SHIFT_LD       42
158
-    #define SHIFT_OUT      40
159
-    #define SHIFT_EN       17
160
-
161
-    #define LCD_PINS_RS    16
162
-    #define LCD_PINS_ENABLE 5
163
-    #define LCD_PINS_D4     6
164
-    #define LCD_PINS_D5    21
165
-    #define LCD_PINS_D6    20
166
-    #define LCD_PINS_D7    19
156
+    #define SHIFT_CLK                         38
157
+    #define SHIFT_LD                          42
158
+    #define SHIFT_OUT                         40
159
+    #define SHIFT_EN                          17
160
+
161
+    #define LCD_PINS_RS                       16
162
+    #define LCD_PINS_ENABLE                    5
163
+    #define LCD_PINS_D4                        6
164
+    #define LCD_PINS_D5                       21
165
+    #define LCD_PINS_D6                       20
166
+    #define LCD_PINS_D7                       19
167 167
 
168 168
   #endif // !NEWPANEL
169 169
 

+ 33
- 33
Marlin/src/pins/mega/pins_LEAPFROG.h Parādīt failu

@@ -34,59 +34,59 @@
34 34
 //
35 35
 // Limit Switches
36 36
 //
37
-#define X_MIN_PIN          47
38
-#define X_MAX_PIN           2
39
-#define Y_MIN_PIN          48
40
-#define Y_MAX_PIN          15
41
-#define Z_MIN_PIN          49
42
-#define Z_MAX_PIN          -1
37
+#define X_MIN_PIN                             47
38
+#define X_MAX_PIN                              2
39
+#define Y_MIN_PIN                             48
40
+#define Y_MAX_PIN                             15
41
+#define Z_MIN_PIN                             49
42
+#define Z_MAX_PIN                             -1
43 43
 
44 44
 //
45 45
 // Steppers
46 46
 //
47
-#define X_STEP_PIN         28
48
-#define X_DIR_PIN          63
49
-#define X_ENABLE_PIN       29
47
+#define X_STEP_PIN                            28
48
+#define X_DIR_PIN                             63
49
+#define X_ENABLE_PIN                          29
50 50
 
51
-#define Y_STEP_PIN         14   // A6
52
-#define Y_DIR_PIN          15   // A0
53
-#define Y_ENABLE_PIN       39
51
+#define Y_STEP_PIN                            14  // A6
52
+#define Y_DIR_PIN                             15  // A0
53
+#define Y_ENABLE_PIN                          39
54 54
 
55
-#define Z_STEP_PIN         31   // A2
56
-#define Z_DIR_PIN          32   // A6
57
-#define Z_ENABLE_PIN       30   // A1
55
+#define Z_STEP_PIN                            31  // A2
56
+#define Z_DIR_PIN                             32  // A6
57
+#define Z_ENABLE_PIN                          30  // A1
58 58
 
59
-#define E0_STEP_PIN        34   // 34
60
-#define E0_DIR_PIN         35   // 35
61
-#define E0_ENABLE_PIN      33   // 33
59
+#define E0_STEP_PIN                           34  // 34
60
+#define E0_DIR_PIN                            35  // 35
61
+#define E0_ENABLE_PIN                         33  // 33
62 62
 
63
-#define E1_STEP_PIN        37   // 37
64
-#define E1_DIR_PIN         40   // 40
65
-#define E1_ENABLE_PIN      36   // 36
63
+#define E1_STEP_PIN                           37  // 37
64
+#define E1_DIR_PIN                            40  // 40
65
+#define E1_ENABLE_PIN                         36  // 36
66 66
 
67 67
 //
68 68
 // Temperature Sensors
69 69
 //
70
-#define TEMP_0_PIN         13   // Analog Input (D27)
71
-#define TEMP_1_PIN         15   // Analog Input (1)
72
-#define TEMP_BED_PIN       14   // Analog Input (1,2 or I2C)
70
+#define TEMP_0_PIN                            13  // Analog Input (D27)
71
+#define TEMP_1_PIN                            15  // Analog Input (1)
72
+#define TEMP_BED_PIN                          14  // Analog Input (1,2 or I2C)
73 73
 
74 74
 //
75 75
 // Heaters / Fans
76 76
 //
77
-#define HEATER_0_PIN        9
78
-#define HEATER_1_PIN        8   // 12
79
-#define HEATER_2_PIN       11   // 13
80
-#define HEATER_BED_PIN     10   // 14/15
77
+#define HEATER_0_PIN                           9
78
+#define HEATER_1_PIN                           8  // 12
79
+#define HEATER_2_PIN                          11  // 13
80
+#define HEATER_BED_PIN                        10  // 14/15
81 81
 
82
-#define FAN_PIN             7
82
+#define FAN_PIN                                7
83 83
 
84 84
 //
85 85
 // Misc. Functions
86 86
 //
87
-#define SDSS               11
88
-#define LED_PIN            13
89
-#define SOL1_PIN           16
90
-#define SOL2_PIN           17
87
+#define SDSS                                  11
88
+#define LED_PIN                               13
89
+#define SOL1_PIN                              16
90
+#define SOL2_PIN                              17
91 91
 
92 92
 /*  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)  */

+ 36
- 36
Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h Parādīt failu

@@ -38,9 +38,9 @@
38 38
 //
39 39
 // Limit Switches
40 40
 //
41
-#define X_STOP_PIN         47   // 'X Min'
42
-#define Y_STOP_PIN         48   // 'Y Min'
43
-#define Z_STOP_PIN         49   // 'Z Min'
41
+#define X_STOP_PIN                            47  // 'X Min'
42
+#define Y_STOP_PIN                            48  // 'Y Min'
43
+#define Z_STOP_PIN                            49  // 'Z Min'
44 44
 
45 45
 //
46 46
 // Steppers
@@ -51,65 +51,65 @@
51 51
 //
52 52
 
53 53
 // X-axis signal-level connector
54
-#define X_STEP_PIN         65
55
-#define X_DIR_PIN          64
56
-#define X_ENABLE_PIN       66   // Not actually used on Xeed, could be repurposed
54
+#define X_STEP_PIN                            65
55
+#define X_DIR_PIN                             64
56
+#define X_ENABLE_PIN                          66  // Not actually used on Xeed, could be repurposed
57 57
 
58 58
 // Y-axis signal-level connector
59
-#define Y_STEP_PIN         23
60
-#define Y_DIR_PIN          22
61
-#define Y_ENABLE_PIN       24   // Not actually used on Xeed, could be repurposed
59
+#define Y_STEP_PIN                            23
60
+#define Y_DIR_PIN                             22
61
+#define Y_ENABLE_PIN                          24  // Not actually used on Xeed, could be repurposed
62 62
 
63 63
 // ZMOT connector (Front Right Z Motor)
64
-#define Z_STEP_PIN         31
65
-#define Z_DIR_PIN          32
66
-#define Z_ENABLE_PIN       30
64
+#define Z_STEP_PIN                            31
65
+#define Z_DIR_PIN                             32
66
+#define Z_ENABLE_PIN                          30
67 67
 
68 68
 // XMOT connector (Rear Z Motor)
69
-#define Z2_STEP_PIN        28
70
-#define Z2_DIR_PIN         63
71
-#define Z2_ENABLE_PIN      29
69
+#define Z2_STEP_PIN                           28
70
+#define Z2_DIR_PIN                            63
71
+#define Z2_ENABLE_PIN                         29
72 72
 
73 73
 // YMOT connector (Front Left Z Motor)
74
-#define Z3_STEP_PIN        14
75
-#define Z3_DIR_PIN         15
76
-#define Z3_ENABLE_PIN      39
74
+#define Z3_STEP_PIN                           14
75
+#define Z3_DIR_PIN                            15
76
+#define Z3_ENABLE_PIN                         39
77 77
 
78 78
 // EMOT2 connector
79
-#define E0_STEP_PIN        37
80
-#define E0_DIR_PIN         40
81
-#define E0_ENABLE_PIN      36
79
+#define E0_STEP_PIN                           37
80
+#define E0_DIR_PIN                            40
81
+#define E0_ENABLE_PIN                         36
82 82
 
83 83
 // EMOT connector
84
-#define E1_STEP_PIN        34
85
-#define E1_DIR_PIN         35
86
-#define E1_ENABLE_PIN      33
84
+#define E1_STEP_PIN                           34
85
+#define E1_DIR_PIN                            35
86
+#define E1_ENABLE_PIN                         33
87 87
 
88 88
 //
89 89
 // Filament runout
90 90
 //
91
-#define FIL_RUNOUT_PIN     42   // ROT2 Connector
92
-#define FIL_RUNOUT2_PIN    44   // ROT1 Connector
91
+#define FIL_RUNOUT_PIN                        42  // ROT2 Connector
92
+#define FIL_RUNOUT2_PIN                       44  // ROT1 Connector
93 93
 
94 94
 //
95 95
 // Temperature Sensors
96 96
 //
97
-#define TEMP_0_PIN         15   // T3 Connector
98
-#define TEMP_1_PIN         13   // T1 Connector
99
-#define TEMP_BED_PIN       14   // BED Connector (Between T1 and T3)
97
+#define TEMP_0_PIN                            15  // T3 Connector
98
+#define TEMP_1_PIN                            13  // T1 Connector
99
+#define TEMP_BED_PIN                          14  // BED Connector (Between T1 and T3)
100 100
 
101 101
 //
102 102
 // Heaters / Fans
103 103
 //
104
-#define HEATER_0_PIN        8   // Misc Connector, pins 3 and 4 (Out2)
105
-#define HEATER_1_PIN        9   // Misc Connector, pins 5 and 6 (Out3)
106
-#define HEATER_BED_PIN      6   // Misc Connector, pins 9(-) and 10(+) (OutA)
104
+#define HEATER_0_PIN                           8  // Misc Connector, pins 3 and 4 (Out2)
105
+#define HEATER_1_PIN                           9  // Misc Connector, pins 5 and 6 (Out3)
106
+#define HEATER_BED_PIN                         6  // Misc Connector, pins 9(-) and 10(+) (OutA)
107 107
 
108
-#define FAN_PIN            10   // Misc Connector, pins 7(-) and 8 (+) (Out4)
108
+#define FAN_PIN                               10  // Misc Connector, pins 7(-) and 8 (+) (Out4)
109 109
 
110
-#define LED_PIN            13
110
+#define LED_PIN                               13
111 111
 
112
-#define SOL1_PIN            7   // Misc Connector, pins 1(-) and 2(+) (Out1)
112
+#define SOL1_PIN                               7  // Misc Connector, pins 1(-) and 2(+) (Out1)
113 113
 
114 114
 // Door Closed Sensor
115
-//#define DOOR_PIN           45 // HM1 Connector
115
+//#define DOOR_PIN                            45  // HM1 Connector

+ 55
- 55
Marlin/src/pins/mega/pins_MEGACONTROLLER.h Parādīt failu

@@ -36,89 +36,89 @@
36 36
 //
37 37
 // Servos
38 38
 //
39
-#define SERVO0_PIN         30
40
-#define SERVO1_PIN         31
41
-#define SERVO2_PIN         32
42
-#define SERVO3_PIN         33
39
+#define SERVO0_PIN                            30
40
+#define SERVO1_PIN                            31
41
+#define SERVO2_PIN                            32
42
+#define SERVO3_PIN                            33
43 43
 
44 44
 //
45 45
 // Limit Switches
46 46
 //
47
-#define X_MIN_PIN          43
48
-#define X_MAX_PIN          42
49
-#define Y_MIN_PIN          38
50
-#define Y_MAX_PIN          41
51
-#define Z_MIN_PIN          40
52
-#define Z_MAX_PIN          37
47
+#define X_MIN_PIN                             43
48
+#define X_MAX_PIN                             42
49
+#define Y_MIN_PIN                             38
50
+#define Y_MAX_PIN                             41
51
+#define Z_MIN_PIN                             40
52
+#define Z_MAX_PIN                             37
53 53
 
54 54
 //
55 55
 // Z Probe (when not Z_MIN_PIN)
56 56
 //
57 57
 #ifndef Z_MIN_PROBE_PIN
58
-  #define Z_MIN_PROBE_PIN  37
58
+  #define Z_MIN_PROBE_PIN                     37
59 59
 #endif
60 60
 
61 61
 //
62 62
 // Steppers
63 63
 //
64
-#define X_STEP_PIN         62   // A8
65
-#define X_DIR_PIN          63   // A9
66
-#define X_ENABLE_PIN       61   // A7
64
+#define X_STEP_PIN                            62  // A8
65
+#define X_DIR_PIN                             63  // A9
66
+#define X_ENABLE_PIN                          61  // A7
67 67
 
68
-#define Y_STEP_PIN         65   // A11
69
-#define Y_DIR_PIN          66   // A12
70
-#define Y_ENABLE_PIN       64   // A10
68
+#define Y_STEP_PIN                            65  // A11
69
+#define Y_DIR_PIN                             66  // A12
70
+#define Y_ENABLE_PIN                          64  // A10
71 71
 
72
-#define Z_STEP_PIN         68   // A14
73
-#define Z_DIR_PIN          69   // A15
74
-#define Z_ENABLE_PIN       67   // A13
72
+#define Z_STEP_PIN                            68  // A14
73
+#define Z_DIR_PIN                             69  // A15
74
+#define Z_ENABLE_PIN                          67  // A13
75 75
 
76
-#define E0_STEP_PIN        23
77
-#define E0_DIR_PIN         24
78
-#define E0_ENABLE_PIN      22
76
+#define E0_STEP_PIN                           23
77
+#define E0_DIR_PIN                            24
78
+#define E0_ENABLE_PIN                         22
79 79
 
80
-#define E1_STEP_PIN        26
81
-#define E1_DIR_PIN         27
82
-#define E1_ENABLE_PIN      25
80
+#define E1_STEP_PIN                           26
81
+#define E1_DIR_PIN                            27
82
+#define E1_ENABLE_PIN                         25
83 83
 
84 84
 //
85 85
 // Temperature Sensors
86 86
 //
87 87
 #if TEMP_SENSOR_0 == -1
88
-  #define TEMP_0_PIN        4   // Analog Input
88
+  #define TEMP_0_PIN                           4  // Analog Input
89 89
 #else
90
-  #define TEMP_0_PIN        0   // Analog Input
90
+  #define TEMP_0_PIN                           0  // Analog Input
91 91
 #endif
92 92
 
93 93
 #if TEMP_SENSOR_1 == -1
94
-  #define TEMP_1_PIN        5   // Analog Input
94
+  #define TEMP_1_PIN                           5  // Analog Input
95 95
 #else
96
-  #define TEMP_1_PIN        2   // Analog Input
96
+  #define TEMP_1_PIN                           2  // Analog Input
97 97
 #endif
98 98
 
99
-#define TEMP_2_PIN          3   // Analog Input
99
+#define TEMP_2_PIN                             3  // Analog Input
100 100
 
101 101
 #if TEMP_SENSOR_BED == -1
102
-  #define TEMP_BED_PIN      6   // Analog Input
102
+  #define TEMP_BED_PIN                         6  // Analog Input
103 103
 #else
104
-  #define TEMP_BED_PIN      1   // Analog Input
104
+  #define TEMP_BED_PIN                         1  // Analog Input
105 105
 #endif
106 106
 
107 107
 //
108 108
 // Heaters / Fans
109 109
 //
110
-#define HEATER_0_PIN       29
111
-#define HEATER_1_PIN       34
112
-#define HEATER_BED_PIN     28
110
+#define HEATER_0_PIN                          29
111
+#define HEATER_1_PIN                          34
112
+#define HEATER_BED_PIN                        28
113 113
 
114 114
 #ifndef FAN_PIN
115
-  #define FAN_PIN          39
115
+  #define FAN_PIN                             39
116 116
 #endif
117
-#define FAN1_PIN           35
118
-#define FAN2_PIN           36
117
+#define FAN1_PIN                              35
118
+#define FAN2_PIN                              36
119 119
 
120 120
 #ifndef CONTROLLER_FAN_PIN
121
-  #define CONTROLLER_FAN_PIN FAN2_PIN
121
+  #define CONTROLLER_FAN_PIN            FAN2_PIN
122 122
 #endif
123 123
 
124 124
 #define FAN_SOFT_PWM
@@ -126,39 +126,39 @@
126 126
 //
127 127
 // Misc. Functions
128 128
 //
129
-#define SDSS               53
130
-#define LED_PIN            13
131
-#define CASE_LIGHT_PIN      2
129
+#define SDSS                                  53
130
+#define LED_PIN                               13
131
+#define CASE_LIGHT_PIN                         2
132 132
 
133 133
 //
134 134
 // LCD / Controller
135 135
 //
136 136
 #if ENABLED(MINIPANEL)
137 137
 
138
-  #define BEEPER_PIN       46
138
+  #define BEEPER_PIN                          46
139 139
   // Pins for DOGM SPI LCD Support
140
-  #define DOGLCD_A0        47
141
-  #define DOGLCD_CS        45
142
-  #define LCD_BACKLIGHT_PIN 44   // backlight LED on PA3
140
+  #define DOGLCD_A0                           47
141
+  #define DOGLCD_CS                           45
142
+  #define LCD_BACKLIGHT_PIN                   44  // backlight LED on PA3
143 143
 
144
-  #define KILL_PIN         12
144
+  #define KILL_PIN                            12
145 145
   // GLCD features
146 146
   // Uncomment screen orientation
147 147
   //#define LCD_SCREEN_ROT_90
148 148
   //#define LCD_SCREEN_ROT_180
149 149
   //#define LCD_SCREEN_ROT_270
150 150
 
151
-  #define BTN_EN1          48
152
-  #define BTN_EN2          11
153
-  #define BTN_ENC          10
151
+  #define BTN_EN1                             48
152
+  #define BTN_EN2                             11
153
+  #define BTN_ENC                             10
154 154
 
155
-  #define SD_DETECT_PIN    49
155
+  #define SD_DETECT_PIN                       49
156 156
 
157 157
 #endif // MINIPANEL
158 158
 
159 159
 //
160 160
 // M3/M4/M5 - Spindle/Laser Control
161 161
 //
162
-#define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
163
-#define SPINDLE_LASER_ENA_PIN     7   // Pullup!
164
-#define SPINDLE_DIR_PIN           8
162
+#define SPINDLE_LASER_PWM_PIN                  6  // Hardware PWM
163
+#define SPINDLE_LASER_ENA_PIN                  7  // Pullup!
164
+#define SPINDLE_DIR_PIN                        8

+ 48
- 48
Marlin/src/pins/mega/pins_MEGATRONICS.h Parādīt failu

@@ -33,99 +33,99 @@
33 33
 //
34 34
 // Limit Switches
35 35
 //
36
-#define X_MIN_PIN          41
37
-#define X_MAX_PIN          37
38
-#define Y_MIN_PIN          14
39
-#define Y_MAX_PIN          15
40
-#define Z_MIN_PIN          18
41
-#define Z_MAX_PIN          19
36
+#define X_MIN_PIN                             41
37
+#define X_MAX_PIN                             37
38
+#define Y_MIN_PIN                             14
39
+#define Y_MAX_PIN                             15
40
+#define Z_MIN_PIN                             18
41
+#define Z_MAX_PIN                             19
42 42
 
43 43
 //
44 44
 // Z Probe (when not Z_MIN_PIN)
45 45
 //
46 46
 #ifndef Z_MIN_PROBE_PIN
47
-  #define Z_MIN_PROBE_PIN  19
47
+  #define Z_MIN_PROBE_PIN                     19
48 48
 #endif
49 49
 
50 50
 //
51 51
 // Steppers
52 52
 //
53
-#define X_STEP_PIN         26
54
-#define X_DIR_PIN          28
55
-#define X_ENABLE_PIN       24
53
+#define X_STEP_PIN                            26
54
+#define X_DIR_PIN                             28
55
+#define X_ENABLE_PIN                          24
56 56
 
57
-#define Y_STEP_PIN         60   // A6
58
-#define Y_DIR_PIN          61   // A7
59
-#define Y_ENABLE_PIN       22
57
+#define Y_STEP_PIN                            60  // A6
58
+#define Y_DIR_PIN                             61  // A7
59
+#define Y_ENABLE_PIN                          22
60 60
 
61
-#define Z_STEP_PIN         54   // A0
62
-#define Z_DIR_PIN          55   // A1
63
-#define Z_ENABLE_PIN       56   // A2
61
+#define Z_STEP_PIN                            54  // A0
62
+#define Z_DIR_PIN                             55  // A1
63
+#define Z_ENABLE_PIN                          56  // A2
64 64
 
65
-#define E0_STEP_PIN        31
66
-#define E0_DIR_PIN         32
67
-#define E0_ENABLE_PIN      38
65
+#define E0_STEP_PIN                           31
66
+#define E0_DIR_PIN                            32
67
+#define E0_ENABLE_PIN                         38
68 68
 
69
-#define E1_STEP_PIN        34
70
-#define E1_DIR_PIN         36
71
-#define E1_ENABLE_PIN      30
69
+#define E1_STEP_PIN                           34
70
+#define E1_DIR_PIN                            36
71
+#define E1_ENABLE_PIN                         30
72 72
 
73 73
 //
74 74
 // Temperature Sensors
75 75
 //
76 76
 #if TEMP_SENSOR_0 == -1
77
-  #define TEMP_0_PIN        8   // Analog Input
77
+  #define TEMP_0_PIN                           8  // Analog Input
78 78
 #else
79
-  #define TEMP_0_PIN       13   // Analog Input
79
+  #define TEMP_0_PIN                          13  // Analog Input
80 80
 #endif
81
-#define TEMP_1_PIN         15   // Analog Input
82
-#define TEMP_BED_PIN       14   // Analog Input
81
+#define TEMP_1_PIN                            15  // Analog Input
82
+#define TEMP_BED_PIN                          14  // Analog Input
83 83
 
84 84
 //
85 85
 // Heaters / Fans
86 86
 //
87
-#define HEATER_0_PIN        9
88
-#define HEATER_1_PIN        8
89
-#define HEATER_BED_PIN     10
87
+#define HEATER_0_PIN                           9
88
+#define HEATER_1_PIN                           8
89
+#define HEATER_BED_PIN                        10
90 90
 
91 91
 #ifndef FAN_PIN
92
-  #define FAN_PIN           7   // IO pin. Buffer needed
92
+  #define FAN_PIN                              7  // IO pin. Buffer needed
93 93
 #endif
94 94
 
95 95
 //
96 96
 // Misc. Functions
97 97
 //
98
-#define SDSS               53
99
-#define LED_PIN            13
100
-#define PS_ON_PIN          12
101
-#define CASE_LIGHT_PIN      2
98
+#define SDSS                                  53
99
+#define LED_PIN                               13
100
+#define PS_ON_PIN                             12
101
+#define CASE_LIGHT_PIN                         2
102 102
 
103 103
 //
104 104
 // LCD / Controller
105 105
 //
106
-#define BEEPER_PIN         33
106
+#define BEEPER_PIN                            33
107 107
 
108 108
 #if BOTH(ULTRA_LCD, NEWPANEL)
109 109
 
110
-  #define LCD_PINS_RS     16
111
-  #define LCD_PINS_ENABLE 17
112
-  #define LCD_PINS_D4     23
113
-  #define LCD_PINS_D5     25
114
-  #define LCD_PINS_D6     27
115
-  #define LCD_PINS_D7     29
110
+  #define LCD_PINS_RS                         16
111
+  #define LCD_PINS_ENABLE                     17
112
+  #define LCD_PINS_D4                         23
113
+  #define LCD_PINS_D5                         25
114
+  #define LCD_PINS_D6                         27
115
+  #define LCD_PINS_D7                         29
116 116
 
117 117
   // Buttons directly attached to AUX-2
118
-  #define BTN_EN1         59
119
-  #define BTN_EN2         64
120
-  #define BTN_ENC         43
118
+  #define BTN_EN1                             59
119
+  #define BTN_EN2                             64
120
+  #define BTN_ENC                             43
121 121
 
122
-  #define SD_DETECT_PIN   -1   // RAMPS doesn't use this
122
+  #define SD_DETECT_PIN                       -1  // RAMPS doesn't use this
123 123
 
124 124
 #endif // HAS_SPI_LCD && NEWPANEL
125 125
 
126 126
 //
127 127
 // M3/M4/M5 - Spindle/Laser Control
128 128
 //
129
-#define SPINDLE_LASER_PWM_PIN     3   // Hardware PWM
130
-#define SPINDLE_LASER_ENA_PIN     4   // Pullup!
131
-#define SPINDLE_DIR_PIN          11
129
+#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
130
+#define SPINDLE_LASER_ENA_PIN                  4  // Pullup!
131
+#define SPINDLE_DIR_PIN                       11

+ 57
- 57
Marlin/src/pins/mega/pins_MEGATRONICS_2.h Parādīt failu

@@ -33,120 +33,120 @@
33 33
 //
34 34
 // Limit Switches
35 35
 //
36
-#define X_MIN_PIN          37
37
-#define X_MAX_PIN          40
38
-#define Y_MIN_PIN          41
39
-#define Y_MAX_PIN          38
40
-#define Z_MIN_PIN          18
41
-#define Z_MAX_PIN          19
36
+#define X_MIN_PIN                             37
37
+#define X_MAX_PIN                             40
38
+#define Y_MIN_PIN                             41
39
+#define Y_MAX_PIN                             38
40
+#define Z_MIN_PIN                             18
41
+#define Z_MAX_PIN                             19
42 42
 
43 43
 //
44 44
 // Z Probe (when not Z_MIN_PIN)
45 45
 //
46 46
 #ifndef Z_MIN_PROBE_PIN
47
-  #define Z_MIN_PROBE_PIN  19
47
+  #define Z_MIN_PROBE_PIN                     19
48 48
 #endif
49 49
 
50 50
 //
51 51
 // Steppers
52 52
 //
53
-#define X_STEP_PIN         26
54
-#define X_DIR_PIN          27
55
-#define X_ENABLE_PIN       25
53
+#define X_STEP_PIN                            26
54
+#define X_DIR_PIN                             27
55
+#define X_ENABLE_PIN                          25
56 56
 
57
-#define Y_STEP_PIN          4   // A6
58
-#define Y_DIR_PIN          54   // A0
59
-#define Y_ENABLE_PIN        5
57
+#define Y_STEP_PIN                             4  // A6
58
+#define Y_DIR_PIN                             54  // A0
59
+#define Y_ENABLE_PIN                           5
60 60
 
61
-#define Z_STEP_PIN         56   // A2
62
-#define Z_DIR_PIN          60   // A6
63
-#define Z_ENABLE_PIN       55   // A1
61
+#define Z_STEP_PIN                            56  // A2
62
+#define Z_DIR_PIN                             60  // A6
63
+#define Z_ENABLE_PIN                          55  // A1
64 64
 
65
-#define E0_STEP_PIN        35
66
-#define E0_DIR_PIN         36
67
-#define E0_ENABLE_PIN      34
65
+#define E0_STEP_PIN                           35
66
+#define E0_DIR_PIN                            36
67
+#define E0_ENABLE_PIN                         34
68 68
 
69
-#define E1_STEP_PIN        29
70
-#define E1_DIR_PIN         39
71
-#define E1_ENABLE_PIN      28
69
+#define E1_STEP_PIN                           29
70
+#define E1_DIR_PIN                            39
71
+#define E1_ENABLE_PIN                         28
72 72
 
73
-#define E2_STEP_PIN        23   // ? schematic says 24
74
-#define E2_DIR_PIN         24   // ? schematic says 23
75
-#define E2_ENABLE_PIN      22
73
+#define E2_STEP_PIN                           23  // ? schematic says 24
74
+#define E2_DIR_PIN                            24  // ? schematic says 23
75
+#define E2_ENABLE_PIN                         22
76 76
 
77 77
 //
78 78
 // Temperature Sensors
79 79
 //
80 80
 #if TEMP_SENSOR_0 == -1
81
-  #define TEMP_0_PIN        4   // Analog Input
81
+  #define TEMP_0_PIN                           4  // Analog Input
82 82
 #else
83
-  #define TEMP_0_PIN       13   // Analog Input
83
+  #define TEMP_0_PIN                          13  // Analog Input
84 84
 #endif
85 85
 
86 86
 #if TEMP_SENSOR_1 == -1
87
-  #define TEMP_1_PIN        8   // Analog Input
87
+  #define TEMP_1_PIN                           8  // Analog Input
88 88
 #else
89
-  #define TEMP_1_PIN       15   // Analog Input
89
+  #define TEMP_1_PIN                          15  // Analog Input
90 90
 #endif
91 91
 
92 92
 #if TEMP_SENSOR_BED == -1
93
-  #define TEMP_BED_PIN      8   // Analog Input
93
+  #define TEMP_BED_PIN                         8  // Analog Input
94 94
 #else
95
-  #define TEMP_BED_PIN     14   // Analog Input
95
+  #define TEMP_BED_PIN                        14  // Analog Input
96 96
 #endif
97 97
 
98 98
 //
99 99
 // Heaters / Fans
100 100
 //
101
-#define HEATER_0_PIN        9
102
-#define HEATER_1_PIN        8
103
-#define HEATER_BED_PIN     10
101
+#define HEATER_0_PIN                           9
102
+#define HEATER_1_PIN                           8
103
+#define HEATER_BED_PIN                        10
104 104
 
105 105
 #ifndef FAN_PIN
106
-  #define FAN_PIN           7
106
+  #define FAN_PIN                              7
107 107
 #endif
108
-#define FAN1_PIN            6
108
+#define FAN1_PIN                               6
109 109
 
110 110
 //
111 111
 // Misc. Functions
112 112
 //
113
-#define SDSS               53
114
-#define LED_PIN            13
115
-#define PS_ON_PIN          12
116
-#define CASE_LIGHT_PIN      2
113
+#define SDSS                                  53
114
+#define LED_PIN                               13
115
+#define PS_ON_PIN                             12
116
+#define CASE_LIGHT_PIN                         2
117 117
 
118 118
 //
119 119
 // M3/M4/M5 - Spindle/Laser Control
120 120
 //
121
-#define SPINDLE_LASER_PWM_PIN     3   // Hardware PWM
122
-#define SPINDLE_LASER_ENA_PIN    16   // Pullup!
123
-#define SPINDLE_DIR_PIN          11
121
+#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
122
+#define SPINDLE_LASER_ENA_PIN                 16  // Pullup!
123
+#define SPINDLE_DIR_PIN                       11
124 124
 
125 125
 //
126 126
 // LCD / Controller
127 127
 //
128
-#define BEEPER_PIN         64
128
+#define BEEPER_PIN                            64
129 129
 
130 130
 #if HAS_SPI_LCD
131 131
 
132
-  #define LCD_PINS_RS      14
133
-  #define LCD_PINS_ENABLE  15
134
-  #define LCD_PINS_D4      30
135
-  #define LCD_PINS_D5      31
136
-  #define LCD_PINS_D6      32
137
-  #define LCD_PINS_D7      33
132
+  #define LCD_PINS_RS                         14
133
+  #define LCD_PINS_ENABLE                     15
134
+  #define LCD_PINS_D4                         30
135
+  #define LCD_PINS_D5                         31
136
+  #define LCD_PINS_D6                         32
137
+  #define LCD_PINS_D7                         33
138 138
 
139 139
   #if ENABLED(NEWPANEL)
140 140
     // Buttons are directly attached using keypad
141
-    #define BTN_EN1        61
142
-    #define BTN_EN2        59
143
-    #define BTN_ENC        43
141
+    #define BTN_EN1                           61
142
+    #define BTN_EN2                           59
143
+    #define BTN_ENC                           43
144 144
   #else
145 145
     // Buttons attached to shift register of reprapworld keypad v1.1
146
-    #define SHIFT_CLK      63
147
-    #define SHIFT_LD       42
148
-    #define SHIFT_OUT      17
149
-    #define SHIFT_EN       17
146
+    #define SHIFT_CLK                         63
147
+    #define SHIFT_LD                          42
148
+    #define SHIFT_OUT                         17
149
+    #define SHIFT_EN                          17
150 150
   #endif
151 151
 
152 152
 #endif // HAS_SPI_LCD

+ 82
- 82
Marlin/src/pins/mega/pins_MEGATRONICS_3.h Parādīt failu

@@ -40,132 +40,132 @@
40 40
 //
41 41
 // Servos
42 42
 //
43
-#define SERVO0_PIN         46   // AUX3-6
44
-#define SERVO1_PIN         47   // AUX3-5
45
-#define SERVO2_PIN         48   // AUX3-4
46
-#define SERVO3_PIN         49   // AUX3-3
43
+#define SERVO0_PIN                            46  // AUX3-6
44
+#define SERVO1_PIN                            47  // AUX3-5
45
+#define SERVO2_PIN                            48  // AUX3-4
46
+#define SERVO3_PIN                            49  // AUX3-3
47 47
 
48 48
 //
49 49
 // Limit Switches
50 50
 //
51
-#define X_MIN_PIN          37   // No INT
52
-#define X_MAX_PIN          40   // No INT
53
-#define Y_MIN_PIN          41   // No INT
54
-#define Y_MAX_PIN          38   // No INT
55
-#define Z_MIN_PIN          18   // No INT
56
-#define Z_MAX_PIN          19   // No INT
51
+#define X_MIN_PIN                             37  // No INT
52
+#define X_MAX_PIN                             40  // No INT
53
+#define Y_MIN_PIN                             41  // No INT
54
+#define Y_MAX_PIN                             38  // No INT
55
+#define Z_MIN_PIN                             18  // No INT
56
+#define Z_MAX_PIN                             19  // No INT
57 57
 
58 58
 //
59 59
 // Z Probe (when not Z_MIN_PIN)
60 60
 //
61 61
 #ifndef Z_MIN_PROBE_PIN
62
-  #define Z_MIN_PROBE_PIN  19
62
+  #define Z_MIN_PROBE_PIN                     19
63 63
 #endif
64 64
 
65 65
 //
66 66
 // Steppers
67 67
 //
68
-#define X_STEP_PIN         58
69
-#define X_DIR_PIN          57
70
-#define X_ENABLE_PIN       59
68
+#define X_STEP_PIN                            58
69
+#define X_DIR_PIN                             57
70
+#define X_ENABLE_PIN                          59
71 71
 
72
-#define Y_STEP_PIN          5
73
-#define Y_DIR_PIN          17
74
-#define Y_ENABLE_PIN        4
72
+#define Y_STEP_PIN                             5
73
+#define Y_DIR_PIN                             17
74
+#define Y_ENABLE_PIN                           4
75 75
 
76
-#define Z_STEP_PIN         16
77
-#define Z_DIR_PIN          11
78
-#define Z_ENABLE_PIN        3
76
+#define Z_STEP_PIN                            16
77
+#define Z_DIR_PIN                             11
78
+#define Z_ENABLE_PIN                           3
79 79
 
80
-#define E0_STEP_PIN        28
81
-#define E0_DIR_PIN         27
82
-#define E0_ENABLE_PIN      29
80
+#define E0_STEP_PIN                           28
81
+#define E0_DIR_PIN                            27
82
+#define E0_ENABLE_PIN                         29
83 83
 
84
-#define E1_STEP_PIN        25
85
-#define E1_DIR_PIN         24
86
-#define E1_ENABLE_PIN      26
84
+#define E1_STEP_PIN                           25
85
+#define E1_DIR_PIN                            24
86
+#define E1_ENABLE_PIN                         26
87 87
 
88
-#define E2_STEP_PIN        22
89
-#define E2_DIR_PIN         60
90
-#define E2_ENABLE_PIN      23
88
+#define E2_STEP_PIN                           22
89
+#define E2_DIR_PIN                            60
90
+#define E2_ENABLE_PIN                         23
91 91
 
92 92
 //
93 93
 // Temperature Sensors
94 94
 //
95 95
 #if TEMP_SENSOR_0 == -1
96
-  #define TEMP_0_PIN       11   // Analog Input
96
+  #define TEMP_0_PIN                          11  // Analog Input
97 97
 #else
98
-  #define TEMP_0_PIN       15   // Analog Input
98
+  #define TEMP_0_PIN                          15  // Analog Input
99 99
 #endif
100 100
 #if TEMP_SENSOR_1 == -1
101
-  #define TEMP_1_PIN       10   // Analog Input
101
+  #define TEMP_1_PIN                          10  // Analog Input
102 102
 #else
103
-  #define TEMP_1_PIN       13   // Analog Input
103
+  #define TEMP_1_PIN                          13  // Analog Input
104 104
 #endif
105 105
 #if TEMP_SENSOR_2 == -1
106
-  #define TEMP_2_PIN        9   // Analog Input
106
+  #define TEMP_2_PIN                           9  // Analog Input
107 107
 #else
108
-  #define TEMP_2_PIN       12   // Analog Input
108
+  #define TEMP_2_PIN                          12  // Analog Input
109 109
 #endif
110 110
 #if TEMP_SENSOR_BED == -1
111
-  #define TEMP_BED_PIN      8   // Analog Input
111
+  #define TEMP_BED_PIN                         8  // Analog Input
112 112
 #else
113
-  #define TEMP_BED_PIN     14   // Analog Input
113
+  #define TEMP_BED_PIN                        14  // Analog Input
114 114
 #endif
115 115
 
116 116
 //
117 117
 // Heaters / Fans
118 118
 //
119
-#define HEATER_0_PIN        2
120
-#define HEATER_1_PIN        9
121
-#define HEATER_2_PIN        8
122
-#define HEATER_BED_PIN     10
119
+#define HEATER_0_PIN                           2
120
+#define HEATER_1_PIN                           9
121
+#define HEATER_2_PIN                           8
122
+#define HEATER_BED_PIN                        10
123 123
 
124 124
 #ifndef FAN_PIN
125
-  #define FAN_PIN           6
125
+  #define FAN_PIN                              6
126 126
 #endif
127
-#define FAN1_PIN            7
127
+#define FAN1_PIN                               7
128 128
 
129 129
 //
130 130
 // Misc. Functions
131 131
 //
132
-#define SDSS               53
133
-#define LED_PIN            13
134
-#define PS_ON_PIN          12
135
-#define CASE_LIGHT_PIN     45   // Try the keypad connector
132
+#define SDSS                                  53
133
+#define LED_PIN                               13
134
+#define PS_ON_PIN                             12
135
+#define CASE_LIGHT_PIN                        45  // Try the keypad connector
136 136
 
137 137
 //
138 138
 // LCD / Controller
139 139
 //
140
-#define BEEPER_PIN         61
140
+#define BEEPER_PIN                            61
141 141
 
142
-#define BTN_EN1            44
143
-#define BTN_EN2            45
144
-#define BTN_ENC            33
142
+#define BTN_EN1                               44
143
+#define BTN_EN2                               45
144
+#define BTN_ENC                               33
145 145
 
146 146
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
147 147
 
148
-  #define LCD_PINS_RS      56   // CS chip select / SS chip slave select
149
-  #define LCD_PINS_ENABLE  51   // SID (MOSI)
150
-  #define LCD_PINS_D4      52   // SCK (CLK) clock
151
-  #define SD_DETECT_PIN    35
148
+  #define LCD_PINS_RS                         56  // CS chip select / SS chip slave select
149
+  #define LCD_PINS_ENABLE                     51  // SID (MOSI)
150
+  #define LCD_PINS_D4                         52  // SCK (CLK) clock
151
+  #define SD_DETECT_PIN                       35
152 152
 
153 153
 #else
154 154
 
155
-  #define LCD_PINS_RS      32
156
-  #define LCD_PINS_ENABLE  31
157
-  #define LCD_PINS_D4      14
158
-  #define LCD_PINS_D5      30
159
-  #define LCD_PINS_D6      39
160
-  #define LCD_PINS_D7      15
155
+  #define LCD_PINS_RS                         32
156
+  #define LCD_PINS_ENABLE                     31
157
+  #define LCD_PINS_D4                         14
158
+  #define LCD_PINS_D5                         30
159
+  #define LCD_PINS_D6                         39
160
+  #define LCD_PINS_D7                         15
161 161
 
162
-  #define SHIFT_CLK        43
163
-  #define SHIFT_LD         35
164
-  #define SHIFT_OUT        34
165
-  #define SHIFT_EN         44
162
+  #define SHIFT_CLK                           43
163
+  #define SHIFT_LD                            35
164
+  #define SHIFT_OUT                           34
165
+  #define SHIFT_EN                            44
166 166
 
167 167
   #if MB(MEGATRONICS_31, MEGATRONICS_32)
168
-    #define SD_DETECT_PIN  56
168
+    #define SD_DETECT_PIN                     56
169 169
   #endif
170 170
 
171 171
 #endif
@@ -173,23 +173,23 @@
173 173
 //
174 174
 // M3/M4/M5 - Spindle/Laser Control
175 175
 //
176
-#if DISABLED(REPRAPWORLD_KEYPAD)        // try to use the keypad connector first
177
-  #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
178
-  #define SPINDLE_LASER_ENA_PIN    43   // Pullup!
179
-  #define SPINDLE_DIR_PIN          42
176
+#if DISABLED(REPRAPWORLD_KEYPAD)                  // try to use the keypad connector first
177
+  #define SPINDLE_LASER_PWM_PIN               44  // Hardware PWM
178
+  #define SPINDLE_LASER_ENA_PIN               43  // Pullup!
179
+  #define SPINDLE_DIR_PIN                     42
180 180
 #elif EXTRUDERS <= 2
181 181
   // Hijack the last extruder so that we can get the PWM signal off the Y breakout
182 182
   // Move Y to the E2 plug. This makes dual Y steppers harder
183
-  #undef Y_ENABLE_PIN  //  4
184
-  #undef Y_STEP_PIN    //  5
185
-  #undef Y_DIR_PIN     // 17
186
-  #undef E2_ENABLE_PIN // 23
187
-  #undef E2_STEP_PIN   // 22
188
-  #undef E2_DIR_PIN    // 60
189
-  #define Y_ENABLE_PIN             23
190
-  #define Y_STEP_PIN               22
191
-  #define Y_DIR_PIN                60
192
-  #define SPINDLE_LASER_PWM_PIN     4   // Hardware PWM
193
-  #define SPINDLE_LASER_ENA_PIN    17   // Pullup!
194
-  #define SPINDLE_DIR_PIN           5
183
+  #undef Y_ENABLE_PIN                             //  4
184
+  #undef Y_STEP_PIN                               //  5
185
+  #undef Y_DIR_PIN                                // 17
186
+  #undef E2_ENABLE_PIN                            // 23
187
+  #undef E2_STEP_PIN                              // 22
188
+  #undef E2_DIR_PIN                               // 60
189
+  #define Y_ENABLE_PIN                        23
190
+  #define Y_STEP_PIN                          22
191
+  #define Y_DIR_PIN                           60
192
+  #define SPINDLE_LASER_PWM_PIN                4  // Hardware PWM
193
+  #define SPINDLE_LASER_ENA_PIN               17  // Pullup!
194
+  #define SPINDLE_DIR_PIN                      5
195 195
 #endif

+ 103
- 103
Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h Parādīt failu

@@ -47,60 +47,60 @@
47 47
 //
48 48
 // Servos
49 49
 //
50
-#define SERVO0_PIN         36   // C1 (1280-EX1)
51
-#define SERVO1_PIN         37   // C0 (1280-EX2)
52
-#define SERVO2_PIN         40   // G1 (1280-EX3)
53
-#define SERVO3_PIN         41   // G0 (1280-EX4)
50
+#define SERVO0_PIN                            36  // C1 (1280-EX1)
51
+#define SERVO1_PIN                            37  // C0 (1280-EX2)
52
+#define SERVO2_PIN                            40  // G1 (1280-EX3)
53
+#define SERVO3_PIN                            41  // G0 (1280-EX4)
54 54
 
55 55
 //
56 56
 // Limit Switches
57 57
 //
58
-#define X_MIN_PIN          49   // L0
59
-#define X_MAX_PIN          48   // L1
60
-#define Y_MIN_PIN          47   // L2
61
-#define Y_MAX_PIN          46   // L3
62
-#define Z_MIN_PIN          43   // L6
63
-#define Z_MAX_PIN          42   // L7
58
+#define X_MIN_PIN                             49  // L0
59
+#define X_MAX_PIN                             48  // L1
60
+#define Y_MIN_PIN                             47  // L2
61
+#define Y_MAX_PIN                             46  // L3
62
+#define Z_MIN_PIN                             43  // L6
63
+#define Z_MAX_PIN                             42  // L7
64 64
 
65 65
 //
66 66
 // Z Probe (when not Z_MIN_PIN)
67 67
 //
68 68
 #ifndef Z_MIN_PROBE_PIN
69
-  #define Z_MIN_PROBE_PIN  42
69
+  #define Z_MIN_PROBE_PIN                     42
70 70
 #endif
71 71
 
72 72
 //
73 73
 // Filament Runout Pins
74 74
 //
75 75
 #ifndef FIL_RUNOUT_PIN
76
-  #define FIL_RUNOUT_PIN   49
76
+  #define FIL_RUNOUT_PIN                      49
77 77
 #endif
78 78
 #ifndef FIL_RUNOUT2_PIN
79
-  #define FIL_RUNOUT2_PIN  47
79
+  #define FIL_RUNOUT2_PIN                     47
80 80
 #endif
81 81
 
82 82
 //
83 83
 // Steppers
84 84
 //
85
-#define X_STEP_PIN         55   // F1
86
-#define X_DIR_PIN          54   // F0
87
-#define X_ENABLE_PIN       56   // F2
85
+#define X_STEP_PIN                            55  // F1
86
+#define X_DIR_PIN                             54  // F0
87
+#define X_ENABLE_PIN                          56  // F2
88 88
 
89
-#define Y_STEP_PIN         59   // F5
90
-#define Y_DIR_PIN          58   // F4
91
-#define Y_ENABLE_PIN       60   // F6
89
+#define Y_STEP_PIN                            59  // F5
90
+#define Y_DIR_PIN                             58  // F4
91
+#define Y_ENABLE_PIN                          60  // F6
92 92
 
93
-#define Z_STEP_PIN         63   // K1
94
-#define Z_DIR_PIN          62   // K0
95
-#define Z_ENABLE_PIN       64   // K2
93
+#define Z_STEP_PIN                            63  // K1
94
+#define Z_DIR_PIN                             62  // K0
95
+#define Z_ENABLE_PIN                          64  // K2
96 96
 
97
-#define E0_STEP_PIN        25   // A3
98
-#define E0_DIR_PIN         24   // A2
99
-#define E0_ENABLE_PIN      26   // A4
97
+#define E0_STEP_PIN                           25  // A3
98
+#define E0_DIR_PIN                            24  // A2
99
+#define E0_ENABLE_PIN                         26  // A4
100 100
 
101
-#define E1_STEP_PIN        29   // A7
102
-#define E1_DIR_PIN         28   // A6
103
-#define E1_ENABLE_PIN      39   // G2
101
+#define E1_STEP_PIN                           29  // A7
102
+#define E1_DIR_PIN                            28  // A6
103
+#define E1_ENABLE_PIN                         39  // G2
104 104
 
105 105
 //
106 106
 // I2C Digipots - MCP4018
@@ -108,22 +108,22 @@
108 108
 // Set from 0 - 127 with stop bit.
109 109
 // (Ex. 3F << 1 | 1)
110 110
 //
111
-#define DIGIPOTS_I2C_SCL    76   // J5
112
-#define DIGIPOTS_I2C_SDA_X  57   // F3
113
-#define DIGIPOTS_I2C_SDA_Y  61   // F7
114
-#define DIGIPOTS_I2C_SDA_Z  65   // K3
115
-#define DIGIPOTS_I2C_SDA_E0 27   // A5
116
-#define DIGIPOTS_I2C_SDA_E1 77   // J6
111
+#define DIGIPOTS_I2C_SCL                      76  // J5
112
+#define DIGIPOTS_I2C_SDA_X                    57  // F3
113
+#define DIGIPOTS_I2C_SDA_Y                    61  // F7
114
+#define DIGIPOTS_I2C_SDA_Z                    65  // K3
115
+#define DIGIPOTS_I2C_SDA_E0                   27  // A5
116
+#define DIGIPOTS_I2C_SDA_E1                   77  // J6
117 117
 
118 118
 #ifndef DIGIPOT_I2C_ADDRESS_A
119
-  #define DIGIPOT_I2C_ADDRESS_A 0x2F   // unshifted slave address (5E <- 2F << 1)
119
+  #define DIGIPOT_I2C_ADDRESS_A 0x2F              // unshifted slave address (5E <- 2F << 1)
120 120
 #endif
121 121
 
122 122
 //
123 123
 // Temperature Sensors
124 124
 //
125 125
 // K7 - 69 / ADC15 - 15
126
-#define TEMP_BED_PIN       15
126
+#define TEMP_BED_PIN                          15
127 127
 
128 128
 // SPI for Max6675 or Max31855 Thermocouple
129 129
 // Uses a separate SPI bus
@@ -133,15 +133,15 @@
133 133
 //  2 E4 CS2
134 134
 // 78 E2 SCK
135 135
 //
136
-#define THERMO_SCK_PIN     78   // E2
137
-#define THERMO_DO_PIN       3   // E5
138
-#define THERMO_CS1_PIN      5   // E3
139
-#define THERMO_CS2_PIN      2   // E4
136
+#define THERMO_SCK_PIN                        78  // E2
137
+#define THERMO_DO_PIN                          3  // E5
138
+#define THERMO_CS1_PIN                         5  // E3
139
+#define THERMO_CS2_PIN                         2  // E4
140 140
 
141
-#define MAX6675_SS_PIN     THERMO_CS1_PIN
142
-#define MAX6675_SS2_PIN    THERMO_CS2_PIN
143
-#define MAX6675_SCK_PIN    THERMO_SCK_PIN
144
-#define MAX6675_DO_PIN     THERMO_DO_PIN
141
+#define MAX6675_SS_PIN            THERMO_CS1_PIN
142
+#define MAX6675_SS2_PIN           THERMO_CS2_PIN
143
+#define MAX6675_SCK_PIN           THERMO_SCK_PIN
144
+#define MAX6675_DO_PIN             THERMO_DO_PIN
145 145
 
146 146
 //
147 147
 // Augmentation for auto-assigning plugs
@@ -152,12 +152,12 @@
152 152
 //
153 153
 
154 154
 // Labels from the schematic:
155
-#define EX1_HEAT_PIN        6   // H3
156
-#define EX1_FAN_PIN         7   // H4
157
-#define EX2_HEAT_PIN       11   // B5
158
-#define EX2_FAN_PIN        12   // B6
159
-#define HBP_PIN            45   // L4
160
-#define EXTRA_FET_PIN      44   // L5
155
+#define EX1_HEAT_PIN                           6  // H3
156
+#define EX1_FAN_PIN                            7  // H4
157
+#define EX2_HEAT_PIN                          11  // B5
158
+#define EX2_FAN_PIN                           12  // B6
159
+#define HBP_PIN                               45  // L4
160
+#define EXTRA_FET_PIN                         44  // L5
161 161
 
162 162
 #if HOTENDS > 1
163 163
   #if TEMP_SENSOR_BED
@@ -174,35 +174,35 @@
174 174
 //
175 175
 // Heaters / Fans (24V)
176 176
 //
177
-#define HEATER_0_PIN       EX1_HEAT_PIN
178
-
179
-#if ENABLED(IS_EFB)                            // Hotend, Fan, Bed
180
-  #define HEATER_BED_PIN   HBP_PIN
181
-#elif ENABLED(IS_EEF)                          // Hotend, Hotend, Fan
182
-  #define HEATER_1_PIN     EX2_HEAT_PIN
183
-#elif ENABLED(IS_EEB)                          // Hotend, Hotend, Bed
184
-  #define HEATER_1_PIN     EX2_HEAT_PIN
185
-  #define HEATER_BED_PIN   HBP_PIN
186
-#elif ENABLED(IS_EFF)                          // Hotend, Fan, Fan
187
-  #define FAN1_PIN         HBP_PIN
177
+#define HEATER_0_PIN                EX1_HEAT_PIN
178
+
179
+#if ENABLED(IS_EFB)                               // Hotend, Fan, Bed
180
+  #define HEATER_BED_PIN                 HBP_PIN
181
+#elif ENABLED(IS_EEF)                             // Hotend, Hotend, Fan
182
+  #define HEATER_1_PIN              EX2_HEAT_PIN
183
+#elif ENABLED(IS_EEB)                             // Hotend, Hotend, Bed
184
+  #define HEATER_1_PIN              EX2_HEAT_PIN
185
+  #define HEATER_BED_PIN                 HBP_PIN
186
+#elif ENABLED(IS_EFF)                             // Hotend, Fan, Fan
187
+  #define FAN1_PIN                       HBP_PIN
188 188
 #endif
189 189
 
190 190
 #ifndef FAN_PIN
191 191
   #if EITHER(IS_EFB, IS_EFF)                      // Hotend, Fan, Bed or Hotend, Fan, Fan
192
-    #define FAN_PIN        EX2_HEAT_PIN
192
+    #define FAN_PIN                 EX2_HEAT_PIN
193 193
   #elif EITHER(IS_EEF, IS_SF)                     // Hotend, Hotend, Fan or Spindle, Fan
194
-    #define FAN_PIN        HBP_PIN
194
+    #define FAN_PIN                      HBP_PIN
195 195
   #else
196
-    #define FAN_PIN        EXTRA_FET_PIN
196
+    #define FAN_PIN                EXTRA_FET_PIN
197 197
   #endif
198 198
 #endif
199 199
 
200 200
 //
201 201
 // Misc. Functions
202 202
 //
203
-#define LED_PIN            13   // B7
204
-#define CUTOFF_RESET_PIN   16   // H1
205
-#define CUTOFF_TEST_PIN    17   // H0
203
+#define LED_PIN                               13  // B7
204
+#define CUTOFF_RESET_PIN                      16  // H1
205
+#define CUTOFF_TEST_PIN                       17  // H0
206 206
 
207 207
 //
208 208
 // LCD / Controller
@@ -211,57 +211,57 @@
211 211
 
212 212
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
213 213
 
214
-    #define LCD_PINS_RS    33   // C4: LCD-STROBE
215
-    #define LCD_PINS_ENABLE 72  // J2: LEFT
216
-    #define LCD_PINS_D4    35   // C2: LCD-CLK
217
-    #define LCD_PINS_D5    32   // C5: RLED
218
-    #define LCD_PINS_D6    34   // C3: LCD-DATA
219
-    #define LCD_PINS_D7    31   // C6: GLED
214
+    #define LCD_PINS_RS                       33  // C4: LCD-STROBE
215
+    #define LCD_PINS_ENABLE                   72  // J2: LEFT
216
+    #define LCD_PINS_D4                       35  // C2: LCD-CLK
217
+    #define LCD_PINS_D5                       32  // C5: RLED
218
+    #define LCD_PINS_D6                       34  // C3: LCD-DATA
219
+    #define LCD_PINS_D7                       31  // C6: GLED
220 220
 
221
-    #define BTN_EN2        75   // J4, UP
222
-    #define BTN_EN1        73   // J3, DOWN
221
+    #define BTN_EN2                           75  // J4, UP
222
+    #define BTN_EN1                           73  // J3, DOWN
223 223
     //STOP button connected as KILL_PIN
224
-    #define KILL_PIN       14   // J1, RIGHT
224
+    #define KILL_PIN                          14  // J1, RIGHT
225 225
     //KILL - not connected
226 226
 
227
-    #define BEEPER_PIN      8   // H5, SD_WP
227
+    #define BEEPER_PIN                         8  // H5, SD_WP
228 228
 
229 229
     //on board leds
230
-    #define STAT_LED_RED_LED  SERVO0_PIN   // C1 (1280-EX1, DEBUG2)
231
-    #define STAT_LED_BLUE_PIN SERVO1_PIN   // C0 (1280-EX2, DEBUG3)
230
+    #define STAT_LED_RED_LED          SERVO0_PIN  // C1 (1280-EX1, DEBUG2)
231
+    #define STAT_LED_BLUE_PIN         SERVO1_PIN  // C0 (1280-EX2, DEBUG3)
232 232
 
233 233
   #else
234 234
     // Replicator uses a 3-wire SR controller with HD44780
235
-    #define SR_DATA_PIN    34   // C3
236
-    #define SR_CLK_PIN     35   // C2
237
-    #define SR_STROBE_PIN  33   // C4
235
+    #define SR_DATA_PIN                       34  // C3
236
+    #define SR_CLK_PIN                        35  // C2
237
+    #define SR_STROBE_PIN                     33  // C4
238 238
 
239
-    #define BTN_UP         75   // J4
240
-    #define BTN_DWN        73   // J3
241
-    #define BTN_LFT        72   // J2
242
-    #define BTN_RT         14   // J1
239
+    #define BTN_UP                            75  // J4
240
+    #define BTN_DWN                           73  // J3
241
+    #define BTN_LFT                           72  // J2
242
+    #define BTN_RT                            14  // J1
243 243
 
244 244
     // Disable encoder
245 245
     #undef BTN_EN1
246 246
     #undef BTN_EN2
247 247
 
248
-    #define BEEPER_PIN      4   // G5
248
+    #define BEEPER_PIN                         4  // G5
249 249
 
250
-    #define STAT_LED_RED_PIN  32   // C5
251
-    #define STAT_LED_BLUE_PIN 31   // C6 (Actually green)
250
+    #define STAT_LED_RED_PIN                  32  // C5
251
+    #define STAT_LED_BLUE_PIN                 31  // C6 (Actually green)
252 252
 
253 253
   #endif
254 254
 
255
-  #define BTN_CENTER       15   // J0
256
-  #define BTN_ENC          BTN_CENTER
255
+  #define BTN_CENTER                          15  // J0
256
+  #define BTN_ENC                     BTN_CENTER
257 257
 
258 258
 #endif // HAS_SPI_LCD
259 259
 
260 260
 //
261 261
 // SD Card
262 262
 //
263
-#define SDSS               53   // B0
264
-#define SD_DETECT_PIN       9   // H6
263
+#define SDSS                                  53  // B0
264
+#define SD_DETECT_PIN                          9  // H6
265 265
 
266 266
 //
267 267
 // TMC 220x
@@ -280,19 +280,19 @@
280 280
    * Software serial
281 281
    */
282 282
 
283
-  #define X_SERIAL_TX_PIN  16
284
-  #define X_SERIAL_RX_PIN  17
283
+  #define X_SERIAL_TX_PIN                     16
284
+  #define X_SERIAL_RX_PIN                     17
285 285
 
286
-  #define Y_SERIAL_TX_PIN  18
287
-  #define Y_SERIAL_RX_PIN  19
286
+  #define Y_SERIAL_TX_PIN                     18
287
+  #define Y_SERIAL_RX_PIN                     19
288 288
 
289
-  #define Z_SERIAL_TX_PIN  41
290
-  #define Z_SERIAL_RX_PIN  66
289
+  #define Z_SERIAL_TX_PIN                     41
290
+  #define Z_SERIAL_RX_PIN                     66
291 291
 
292
-  #define E0_SERIAL_TX_PIN 40
293
-  #define E0_SERIAL_RX_PIN 67
292
+  #define E0_SERIAL_TX_PIN                    40
293
+  #define E0_SERIAL_RX_PIN                    67
294 294
 
295
-  #define E1_SERIAL_TX_PIN 37
296
-  #define E1_SERIAL_RX_PIN 68
295
+  #define E1_SERIAL_TX_PIN                    37
296
+  #define E1_SERIAL_RX_PIN                    68
297 297
 
298 298
 #endif

+ 54
- 54
Marlin/src/pins/mega/pins_MINITRONICS.h Parādīt failu

@@ -42,102 +42,102 @@
42 42
 //
43 43
 // Limit Switches
44 44
 //
45
-#define X_MIN_PIN           5
46
-#define X_MAX_PIN           2
47
-#define Y_MIN_PIN           2
48
-#define Y_MAX_PIN          15
49
-#define Z_MIN_PIN           6
50
-#define Z_MAX_PIN          -1
45
+#define X_MIN_PIN                              5
46
+#define X_MAX_PIN                              2
47
+#define Y_MIN_PIN                              2
48
+#define Y_MAX_PIN                             15
49
+#define Z_MIN_PIN                              6
50
+#define Z_MAX_PIN                             -1
51 51
 
52 52
 //
53 53
 // Steppers
54 54
 //
55
-#define X_STEP_PIN         48
56
-#define X_DIR_PIN          47
57
-#define X_ENABLE_PIN       49
55
+#define X_STEP_PIN                            48
56
+#define X_DIR_PIN                             47
57
+#define X_ENABLE_PIN                          49
58 58
 
59
-#define Y_STEP_PIN         39   // A6
60
-#define Y_DIR_PIN          40   // A0
61
-#define Y_ENABLE_PIN       38
59
+#define Y_STEP_PIN                            39  // A6
60
+#define Y_DIR_PIN                             40  // A0
61
+#define Y_ENABLE_PIN                          38
62 62
 
63
-#define Z_STEP_PIN         42   // A2
64
-#define Z_DIR_PIN          43   // A6
65
-#define Z_ENABLE_PIN       41   // A1
63
+#define Z_STEP_PIN                            42  // A2
64
+#define Z_DIR_PIN                             43  // A6
65
+#define Z_ENABLE_PIN                          41  // A1
66 66
 
67
-#define E0_STEP_PIN        45
68
-#define E0_DIR_PIN         44
69
-#define E0_ENABLE_PIN      27
67
+#define E0_STEP_PIN                           45
68
+#define E0_DIR_PIN                            44
69
+#define E0_ENABLE_PIN                         27
70 70
 
71
-#define E1_STEP_PIN        36
72
-#define E1_DIR_PIN         35
73
-#define E1_ENABLE_PIN      37
71
+#define E1_STEP_PIN                           36
72
+#define E1_DIR_PIN                            35
73
+#define E1_ENABLE_PIN                         37
74 74
 
75 75
 //
76 76
 // Temperature Sensors
77 77
 //
78
-#define TEMP_0_PIN          7   // Analog Input
79
-#define TEMP_1_PIN          6   // Analog Input
80
-#define TEMP_BED_PIN        6   // Analog Input
78
+#define TEMP_0_PIN                             7  // Analog Input
79
+#define TEMP_1_PIN                             6  // Analog Input
80
+#define TEMP_BED_PIN                           6  // Analog Input
81 81
 
82 82
 //
83 83
 // Heaters / Fans
84 84
 //
85
-#define HEATER_0_PIN        7   // EXTRUDER 1
86
-#define HEATER_1_PIN        8   // EXTRUDER 2
87
-#define HEATER_BED_PIN      3   // BED
85
+#define HEATER_0_PIN                           7  // EXTRUDER 1
86
+#define HEATER_1_PIN                           8  // EXTRUDER 2
87
+#define HEATER_BED_PIN                         3  // BED
88 88
 
89 89
 #ifndef FAN_PIN
90
-  #define FAN_PIN           9
90
+  #define FAN_PIN                              9
91 91
 #endif
92 92
 
93 93
 //
94 94
 // Misc. Functions
95 95
 //
96
-#define SDSS               16
97
-#define LED_PIN            46
96
+#define SDSS                                  16
97
+#define LED_PIN                               46
98 98
 
99 99
 //
100 100
 // LCD / Controller
101 101
 //
102
-#define BEEPER_PIN         -1
102
+#define BEEPER_PIN                            -1
103 103
 
104 104
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
105 105
 
106
-  #define LCD_PINS_RS      15   // CS chip select /SS chip slave select
107
-  #define LCD_PINS_ENABLE  11   // SID (MOSI)
108
-  #define LCD_PINS_D4      10   // SCK (CLK) clock
106
+  #define LCD_PINS_RS                         15  // CS chip select /SS chip slave select
107
+  #define LCD_PINS_ENABLE                     11  // SID (MOSI)
108
+  #define LCD_PINS_D4                         10  // SCK (CLK) clock
109 109
 
110
-  #define BTN_EN1          18
111
-  #define BTN_EN2          17
112
-  #define BTN_ENC          25
110
+  #define BTN_EN1                             18
111
+  #define BTN_EN2                             17
112
+  #define BTN_ENC                             25
113 113
 
114
-  #define SD_DETECT_PIN    30
114
+  #define SD_DETECT_PIN                       30
115 115
 
116 116
 #else
117 117
 
118
-  #define LCD_PINS_RS      -1
119
-  #define LCD_PINS_ENABLE  -1
118
+  #define LCD_PINS_RS                         -1
119
+  #define LCD_PINS_ENABLE                     -1
120 120
 
121 121
   // Buttons are directly attached using keypad
122
-  #define BTN_EN1          -1
123
-  #define BTN_EN2          -1
124
-  #define BTN_ENC          -1
122
+  #define BTN_EN1                             -1
123
+  #define BTN_EN2                             -1
124
+  #define BTN_ENC                             -1
125 125
 
126
-  #define SD_DETECT_PIN    -1   // Minitronics doesn't use this
126
+  #define SD_DETECT_PIN                       -1  // Minitronics doesn't use this
127 127
 #endif
128 128
 
129 129
 //
130 130
 // M3/M4/M5 - Spindle/Laser Control
131 131
 //
132
-#if HAS_CUTTER  // assumes we're only doing CNC work (no 3D printing)
132
+#if HAS_CUTTER                                    // assumes we're only doing CNC work (no 3D printing)
133 133
   #undef HEATER_BED_PIN
134
-  #undef TEMP_BED_PIN             // need to free up some pins but also need to
135
-  #undef TEMP_0_PIN               // re-assign them (to unused pins) because Marlin
136
-  #undef TEMP_1_PIN               // requires the presence of certain pins or else it
137
-  #define HEATER_BED_PIN      4   // won't compile
138
-  #define TEMP_BED_PIN       50
139
-  #define TEMP_0_PIN         51
140
-  #define SPINDLE_LASER_ENA_PIN         52   // using A6 because it already has a pullup
141
-  #define SPINDLE_LASER_PWM_PIN          3   // WARNING - LED & resistor pull up to +12/+24V stepper voltage
142
-  #define SPINDLE_DIR_PIN               53
134
+  #undef TEMP_BED_PIN                             // need to free up some pins but also need to
135
+  #undef TEMP_0_PIN                               // re-assign them (to unused pins) because Marlin
136
+  #undef TEMP_1_PIN                               // requires the presence of certain pins or else it
137
+  #define HEATER_BED_PIN                       4  // won't compile
138
+  #define TEMP_BED_PIN                        50
139
+  #define TEMP_0_PIN                          51
140
+  #define SPINDLE_LASER_ENA_PIN               52  // using A6 because it already has a pullup
141
+  #define SPINDLE_LASER_PWM_PIN                3  // WARNING - LED & resistor pull up to +12/+24V stepper voltage
142
+  #define SPINDLE_DIR_PIN                     53
143 143
 #endif

+ 50
- 50
Marlin/src/pins/mega/pins_OVERLORD.h Parādīt failu

@@ -37,83 +37,83 @@
37 37
 //
38 38
 // Limit Switches
39 39
 //
40
-#define X_STOP_PIN         24
41
-#define Y_STOP_PIN         28
42
-#define Z_MIN_PIN          46
43
-#define Z_MAX_PIN          32
40
+#define X_STOP_PIN                            24
41
+#define Y_STOP_PIN                            28
42
+#define Z_MIN_PIN                             46
43
+#define Z_MAX_PIN                             32
44 44
 
45 45
 //
46 46
 // Z Probe (when not Z_MIN_PIN)
47 47
 //
48 48
 #ifndef Z_MIN_PROBE_PIN
49
-  #define Z_MIN_PROBE_PIN  46   // JP4, Tfeed1
49
+  #define Z_MIN_PROBE_PIN                     46  // JP4, Tfeed1
50 50
 #endif
51 51
 
52 52
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
53
-  #define FIL_RUNOUT_PIN   44   // JP3, Tfeed2
53
+  #define FIL_RUNOUT_PIN                      44  // JP3, Tfeed2
54 54
 #endif
55 55
 
56 56
 //
57 57
 // Steppers
58 58
 //
59
-#define X_STEP_PIN         25
60
-#define X_DIR_PIN          23
61
-#define X_ENABLE_PIN       27
59
+#define X_STEP_PIN                            25
60
+#define X_DIR_PIN                             23
61
+#define X_ENABLE_PIN                          27
62 62
 
63
-#define Y_STEP_PIN         31
64
-#define Y_DIR_PIN          33
65
-#define Y_ENABLE_PIN       29
63
+#define Y_STEP_PIN                            31
64
+#define Y_DIR_PIN                             33
65
+#define Y_ENABLE_PIN                          29
66 66
 
67
-#define Z_STEP_PIN         37
68
-#define Z_DIR_PIN          39
69
-#define Z_ENABLE_PIN       35
67
+#define Z_STEP_PIN                            37
68
+#define Z_DIR_PIN                             39
69
+#define Z_ENABLE_PIN                          35
70 70
 
71
-#define E0_STEP_PIN        43
72
-#define E0_DIR_PIN         45
73
-#define E0_ENABLE_PIN      41
71
+#define E0_STEP_PIN                           43
72
+#define E0_DIR_PIN                            45
73
+#define E0_ENABLE_PIN                         41
74 74
 
75
-#define E1_STEP_PIN        49
76
-#define E1_DIR_PIN         47
77
-#define E1_ENABLE_PIN      48
75
+#define E1_STEP_PIN                           49
76
+#define E1_DIR_PIN                            47
77
+#define E1_ENABLE_PIN                         48
78 78
 
79 79
 //
80 80
 // Temperature Sensors
81 81
 //
82
-#define TEMP_0_PIN          8   // Analog Input
83
-#define TEMP_1_PIN          9   // Analog Input - Redundant temp sensor
84
-#define TEMP_2_PIN         12   // Analog Input
85
-#define TEMP_3_PIN         14   // Analog Input
86
-#define TEMP_BED_PIN       10   // Analog Input
82
+#define TEMP_0_PIN                             8  // Analog Input
83
+#define TEMP_1_PIN                             9  // Analog Input - Redundant temp sensor
84
+#define TEMP_2_PIN                            12  // Analog Input
85
+#define TEMP_3_PIN                            14  // Analog Input
86
+#define TEMP_BED_PIN                          10  // Analog Input
87 87
 
88 88
 //
89 89
 // Heaters / Fans
90 90
 //
91
-#define HEATER_0_PIN        2
92
-#define HEATER_1_PIN        3
93
-#define HEATER_BED_PIN      4
91
+#define HEATER_0_PIN                           2
92
+#define HEATER_1_PIN                           3
93
+#define HEATER_BED_PIN                         4
94 94
 
95
-#define FAN_PIN             7   // material cooling fan
95
+#define FAN_PIN                                7  // material cooling fan
96 96
 
97 97
 //
98 98
 // SD Card
99 99
 //
100
-#define SDSS               53
101
-#define SD_DETECT_PIN      38
100
+#define SDSS                                  53
101
+#define SD_DETECT_PIN                         38
102 102
 
103 103
 //
104 104
 // Misc. Functions
105 105
 //
106
-#define LED_PIN            13   // On PCB status led
107
-#define PS_ON_PIN          12   // For stepper/heater/fan power. Active HIGH.
108
-#define POWER_LOSS_PIN     34   // Power check - whether hotends/steppers/fans have power
106
+#define LED_PIN                               13  // On PCB status led
107
+#define PS_ON_PIN                             12  // For stepper/heater/fan power. Active HIGH.
108
+#define POWER_LOSS_PIN                        34  // Power check - whether hotends/steppers/fans have power
109 109
 
110 110
 #if ENABLED(BATTERY_STATUS_AVAILABLE)
111 111
   #undef BATTERY_STATUS_PIN
112
-  #define BATTERY_STATUS_PIN 26   // Status of power loss battery, whether it is charged (low) or charging (high)
112
+  #define BATTERY_STATUS_PIN                  26  // Status of power loss battery, whether it is charged (low) or charging (high)
113 113
 #endif
114 114
 #if ENABLED(INPUT_VOLTAGE_AVAILABLE)
115 115
   #undef VOLTAGE_DETECTION_PIN
116
-  #define VOLTAGE_DETECTION_PIN 11  // Analog Input - ADC Voltage level of main input
116
+  #define VOLTAGE_DETECTION_PIN               11  // Analog Input - ADC Voltage level of main input
117 117
 #endif
118 118
 
119 119
 //
@@ -121,24 +121,24 @@
121 121
 //
122 122
 #if HAS_GRAPHICAL_LCD
123 123
   // OVERLORD OLED pins
124
-  #define LCD_PINS_RS      20
125
-  #define LCD_PINS_D5      21
126
-  #define LCD_PINS_ENABLE  15
127
-  #define LCD_PINS_D4      14
128
-  #define LCD_PINS_D6       5
129
-  #define LCD_PINS_D7       6
124
+  #define LCD_PINS_RS                         20
125
+  #define LCD_PINS_D5                         21
126
+  #define LCD_PINS_ENABLE                     15
127
+  #define LCD_PINS_D4                         14
128
+  #define LCD_PINS_D6                          5
129
+  #define LCD_PINS_D7                          6
130 130
   #ifndef LCD_RESET_PIN
131
-    #define LCD_RESET_PIN   5   // LCD_PINS_D6
131
+    #define LCD_RESET_PIN                      5  // LCD_PINS_D6
132 132
   #endif
133 133
 #endif
134 134
 
135 135
 #if ENABLED(NEWPANEL)
136
-  #define BTN_ENC          16   // Enter Pin
137
-  #define BTN_UP           19   // Button UP Pin
138
-  #define BTN_DWN          17   // Button DOWN Pin
136
+  #define BTN_ENC                             16  // Enter Pin
137
+  #define BTN_UP                              19  // Button UP Pin
138
+  #define BTN_DWN                             17  // Button DOWN Pin
139 139
 #endif
140 140
 
141 141
 // Additional connectors/pins on the Overlord V1.X board
142
-#define PCB_VERSION_PIN    22
143
-#define APPROACH_PIN       11   // JP7, Tpd
144
-#define GATE_PIN           36   // Threshold, JP6, Tg
142
+#define PCB_VERSION_PIN                       22
143
+#define APPROACH_PIN                          11  // JP7, Tpd
144
+#define GATE_PIN                              36  // Threshold, JP6, Tg

+ 50
- 50
Marlin/src/pins/mega/pins_PICA.h Parādīt failu

@@ -49,95 +49,95 @@
49 49
 //
50 50
 // Limit Switches
51 51
 //
52
-#define X_MIN_PIN          14
53
-#define X_MAX_PIN          15
54
-#define Y_MIN_PIN          16
55
-#define Y_MAX_PIN          17
56
-#define Z_MIN_PIN          23
57
-#define Z_MAX_PIN          22
52
+#define X_MIN_PIN                             14
53
+#define X_MAX_PIN                             15
54
+#define Y_MIN_PIN                             16
55
+#define Y_MAX_PIN                             17
56
+#define Z_MIN_PIN                             23
57
+#define Z_MAX_PIN                             22
58 58
 
59 59
 //
60 60
 // Steppers
61 61
 //
62
-#define X_STEP_PIN         55
63
-#define X_DIR_PIN          54
64
-#define X_ENABLE_PIN       60
62
+#define X_STEP_PIN                            55
63
+#define X_DIR_PIN                             54
64
+#define X_ENABLE_PIN                          60
65 65
 
66
-#define Y_STEP_PIN         57
67
-#define Y_DIR_PIN          56
68
-#define Y_ENABLE_PIN       61
66
+#define Y_STEP_PIN                            57
67
+#define Y_DIR_PIN                             56
68
+#define Y_ENABLE_PIN                          61
69 69
 
70
-#define Z_STEP_PIN         59
71
-#define Z_DIR_PIN          58
72
-#define Z_ENABLE_PIN       62
70
+#define Z_STEP_PIN                            59
71
+#define Z_DIR_PIN                             58
72
+#define Z_ENABLE_PIN                          62
73 73
 
74
-#define E0_STEP_PIN        67
75
-#define E0_DIR_PIN         24
76
-#define E0_ENABLE_PIN      26
74
+#define E0_STEP_PIN                           67
75
+#define E0_DIR_PIN                            24
76
+#define E0_ENABLE_PIN                         26
77 77
 
78 78
 //
79 79
 // Temperature Sensors
80 80
 //
81
-#define TEMP_0_PIN          9   // Analog Input
82
-#define TEMP_1_PIN         10
83
-#define TEMP_BED_PIN       10
84
-#define TEMP_2_PIN         11
85
-#define TEMP_3_PIN         12
81
+#define TEMP_0_PIN                             9  // Analog Input
82
+#define TEMP_1_PIN                            10
83
+#define TEMP_BED_PIN                          10
84
+#define TEMP_2_PIN                            11
85
+#define TEMP_3_PIN                            12
86 86
 
87 87
 //
88 88
 // Heaters / Fans
89 89
 //
90 90
 #ifndef HEATER_0_PIN
91
-  #define HEATER_0_PIN     10   // E0
91
+  #define HEATER_0_PIN                        10  // E0
92 92
 #endif
93 93
 #ifndef HEATER_1_PIN
94
-  #define HEATER_1_PIN      2   // E1
94
+  #define HEATER_1_PIN                         2  // E1
95 95
 #endif
96
-#define HEATER_BED_PIN      8   // HEAT-BED
96
+#define HEATER_BED_PIN                         8  // HEAT-BED
97 97
 
98 98
 #ifndef FAN_PIN
99
-  #define FAN_PIN           9
99
+  #define FAN_PIN                              9
100 100
 #endif
101 101
 #ifndef FAN_2_PIN
102
-  #define FAN_2_PIN         7
102
+  #define FAN_2_PIN                            7
103 103
 #endif
104 104
 
105
-#define SDPOWER_PIN        -1
106
-#define LED_PIN            -1
107
-#define PS_ON_PIN          -1
108
-#define KILL_PIN           -1
105
+#define SDPOWER_PIN                           -1
106
+#define LED_PIN                               -1
107
+#define PS_ON_PIN                             -1
108
+#define KILL_PIN                              -1
109 109
 
110
-#define SSR_PIN             6
110
+#define SSR_PIN                                6
111 111
 
112 112
 // SPI for Max6675 or Max31855 Thermocouple
113 113
 #if DISABLED(SDSUPPORT)
114
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
114
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
115 115
 #else
116
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
116
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
117 117
 #endif
118 118
 
119 119
 //
120 120
 // SD Support
121 121
 //
122
-#define SD_DETECT_PIN      49
123
-#define SDSS               53
122
+#define SD_DETECT_PIN                         49
123
+#define SDSS                                  53
124 124
 
125 125
 //
126 126
 // LCD / Controller
127 127
 //
128
-#define BEEPER_PIN         29
128
+#define BEEPER_PIN                            29
129 129
 
130 130
 #if HAS_SPI_LCD
131
-  #define LCD_PINS_RS      33
132
-  #define LCD_PINS_ENABLE  30
133
-  #define LCD_PINS_D4      35
134
-  #define LCD_PINS_D5      32
135
-  #define LCD_PINS_D6      37
136
-  #define LCD_PINS_D7      36
137
-
138
-  #define BTN_EN1          47
139
-  #define BTN_EN2          48
140
-  #define BTN_ENC          31
141
-
142
-  #define LCD_SDSS         53
131
+  #define LCD_PINS_RS                         33
132
+  #define LCD_PINS_ENABLE                     30
133
+  #define LCD_PINS_D4                         35
134
+  #define LCD_PINS_D5                         32
135
+  #define LCD_PINS_D6                         37
136
+  #define LCD_PINS_D7                         36
137
+
138
+  #define BTN_EN1                             47
139
+  #define BTN_EN2                             48
140
+  #define BTN_ENC                             31
141
+
142
+  #define LCD_SDSS                            53
143 143
 #endif

+ 4
- 4
Marlin/src/pins/mega/pins_PICAOLD.h Parādīt failu

@@ -20,9 +20,9 @@
20 20
  *
21 21
  */
22 22
 
23
-#define HEATER_0_PIN        9   // E0
24
-#define HEATER_1_PIN       10   // E1
25
-#define FAN_PIN            11
26
-#define FAN2_PIN           12
23
+#define HEATER_0_PIN                          9   // E0
24
+#define HEATER_1_PIN                         10   // E1
25
+#define FAN_PIN                              11
26
+#define FAN2_PIN                             12
27 27
 
28 28
 #include "pins_PICA.h"

+ 46
- 46
Marlin/src/pins/mega/pins_SILVER_GATE.h Parādīt failu

@@ -27,67 +27,67 @@
27 27
 
28 28
 #define BOARD_INFO_NAME "Silver Gate"
29 29
 
30
-#define X_STEP_PIN         43
31
-#define X_DIR_PIN          44
32
-#define X_ENABLE_PIN       42
33
-#define X_MIN_PIN          31
34
-#define X_MAX_PIN          34
35
-
36
-#define Y_STEP_PIN         40
37
-#define Y_DIR_PIN          41
38
-#define Y_ENABLE_PIN       39
39
-#define Y_MIN_PIN          32
40
-#define Y_MAX_PIN          35
41
-
42
-#define Z_STEP_PIN         13
43
-#define Z_DIR_PIN          38
44
-#define Z_ENABLE_PIN       14
45
-#define Z_MIN_PIN          33
46
-#define Z_MAX_PIN          36
47
-
48
-#define E0_STEP_PIN        27
49
-#define E0_DIR_PIN         37
50
-#define E0_ENABLE_PIN      45
51
-
52
-#define SDSS               16
30
+#define X_STEP_PIN                            43
31
+#define X_DIR_PIN                             44
32
+#define X_ENABLE_PIN                          42
33
+#define X_MIN_PIN                             31
34
+#define X_MAX_PIN                             34
35
+
36
+#define Y_STEP_PIN                            40
37
+#define Y_DIR_PIN                             41
38
+#define Y_ENABLE_PIN                          39
39
+#define Y_MIN_PIN                             32
40
+#define Y_MAX_PIN                             35
41
+
42
+#define Z_STEP_PIN                            13
43
+#define Z_DIR_PIN                             38
44
+#define Z_ENABLE_PIN                          14
45
+#define Z_MIN_PIN                             33
46
+#define Z_MAX_PIN                             36
47
+
48
+#define E0_STEP_PIN                           27
49
+#define E0_DIR_PIN                            37
50
+#define E0_ENABLE_PIN                         45
51
+
52
+#define SDSS                                  16
53 53
 
54 54
 #ifndef FIL_RUNOUT_PIN
55
-  #define FIL_RUNOUT_PIN   34   // X_MAX unless overridden
55
+  #define FIL_RUNOUT_PIN                      34  // X_MAX unless overridden
56 56
 #endif
57 57
 
58 58
 #ifndef FAN_PIN
59
-  #define FAN_PIN           5
59
+  #define FAN_PIN                              5
60 60
 #endif
61 61
 
62
-#define HEATER_0_PIN        7
62
+#define HEATER_0_PIN                           7
63 63
 
64
-#define ORIG_E0_AUTO_FAN_PIN 3   // Use this by NOT overriding E0_AUTO_FAN_PIN
65
-#define CONTROLLER_FAN_PIN  2
64
+#define ORIG_E0_AUTO_FAN_PIN                   3  // Use this by NOT overriding E0_AUTO_FAN_PIN
65
+#define CONTROLLER_FAN_PIN                     2
66 66
 
67
-#define TEMP_0_PIN          7   // Analog Input
67
+#define TEMP_0_PIN                             7  // Analog Input
68 68
 
69
-#define HEATER_BED_PIN      8
70
-#define TEMP_BED_PIN        6
69
+#define HEATER_BED_PIN                         8
70
+#define TEMP_BED_PIN                           6
71 71
 
72 72
 #if HAS_GRAPHICAL_LCD
73
-  #if ENABLED(U8GLIB_ST7920)    // SPI GLCD 12864 ST7920
74
-    #define LCD_PINS_RS    30
75
-    #define LCD_PINS_ENABLE 20
76
-    #define LCD_PINS_D4    25
77
-    #define BEEPER_PIN     29
78
-    #define BTN_EN1        19
79
-    #define BTN_EN2        22
80
-    #define BTN_ENC        24
81
-    #define LCD_BACKLIGHT_PIN  6
73
+  #if ENABLED(U8GLIB_ST7920)                      // SPI GLCD 12864 ST7920
74
+    #define LCD_PINS_RS                       30
75
+    #define LCD_PINS_ENABLE                   20
76
+    #define LCD_PINS_D4                       25
77
+    #define BEEPER_PIN                        29
78
+    #define BTN_EN1                           19
79
+    #define BTN_EN2                           22
80
+    #define BTN_ENC                           24
81
+    #define LCD_BACKLIGHT_PIN                  6
82 82
     #if ENABLED(SILVER_GATE_GLCD_CONTROLLER)
83
-      #define KILL_PIN     21
84
-      #define HOME_PIN     28
83
+      #define KILL_PIN                        21
84
+      #define HOME_PIN                        28
85 85
     #endif
86 86
   #endif
87 87
 #endif
88 88
 
89
-#define SD_DETECT_PIN      15
89
+#define SD_DETECT_PIN                         15
90 90
 
91
-#define STAT_LED_RED_PIN   23
92
-#define STAT_LED_BLUE_PIN  26
93
-#define CASE_LIGHT_PIN     51
91
+#define STAT_LED_RED_PIN                      23
92
+#define STAT_LED_BLUE_PIN                     26
93
+#define CASE_LIGHT_PIN                        51

+ 35
- 35
Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h Parādīt failu

@@ -36,76 +36,76 @@
36 36
 //
37 37
 // Limit Switches
38 38
 //
39
-#define X_STOP_PIN         19
40
-#define Y_STOP_PIN         18
41
-#define Z_STOP_PIN         38
39
+#define X_STOP_PIN                            19
40
+#define Y_STOP_PIN                            18
41
+#define Z_STOP_PIN                            38
42 42
 
43 43
 //
44 44
 // Z Probe (when not Z_MIN_PIN)
45 45
 //
46 46
 #ifndef Z_MIN_PROBE_PIN
47
-  #define Z_MIN_PROBE_PIN  38
47
+  #define Z_MIN_PROBE_PIN                     38
48 48
 #endif
49 49
 
50 50
 //
51 51
 // Steppers
52 52
 //
53
-#define X_STEP_PIN         22
54
-#define X_DIR_PIN          23
55
-#define X_ENABLE_PIN       57
53
+#define X_STEP_PIN                            22
54
+#define X_DIR_PIN                             23
55
+#define X_ENABLE_PIN                          57
56 56
 
57
-#define Y_STEP_PIN         25
58
-#define Y_DIR_PIN          26
59
-#define Y_ENABLE_PIN       24
57
+#define Y_STEP_PIN                            25
58
+#define Y_DIR_PIN                             26
59
+#define Y_ENABLE_PIN                          24
60 60
 
61
-#define Z_STEP_PIN         29
62
-#define Z_DIR_PIN          39
63
-#define Z_ENABLE_PIN       28
61
+#define Z_STEP_PIN                            29
62
+#define Z_DIR_PIN                             39
63
+#define Z_ENABLE_PIN                          28
64 64
 
65
-#define E0_STEP_PIN        55
66
-#define E0_DIR_PIN         56
67
-#define E0_ENABLE_PIN      54
65
+#define E0_STEP_PIN                           55
66
+#define E0_DIR_PIN                            56
67
+#define E0_ENABLE_PIN                         54
68 68
 
69 69
 //
70 70
 // Temperature Sensors
71 71
 //
72
-#define TEMP_0_PIN         13
73
-#define TEMP_BED_PIN       14
72
+#define TEMP_0_PIN                            13
73
+#define TEMP_BED_PIN                          14
74 74
 
75 75
 //
76 76
 // Heaters / Fans
77 77
 //
78
-#define HEATER_0_PIN        4
79
-#define HEATER_BED_PIN     44
80
-#define FAN_PIN            12   // IO pin. Buffer needed
78
+#define HEATER_0_PIN                           4
79
+#define HEATER_BED_PIN                        44
80
+#define FAN_PIN                               12  // IO pin. Buffer needed
81 81
 
82 82
 //
83 83
 // SD Card
84 84
 //
85
-#define SD_DETECT_PIN      -1
86
-#define SDSS               53
85
+#define SD_DETECT_PIN                         -1
86
+#define SDSS                                  53
87 87
 
88 88
 //
89 89
 // Misc. Functions
90 90
 //
91
-#define BEEPER_PIN         37
92
-#define KILL_PIN           64
91
+#define BEEPER_PIN                            37
92
+#define KILL_PIN                              64
93 93
 
94 94
 //
95 95
 // LCD / Controller (Integrated MINIPANEL)
96 96
 //
97 97
 #if ENABLED(MINIPANEL)
98
-  #define DOGLCD_A0        40
99
-  #define DOGLCD_CS        41
100
-  #define LCD_BACKLIGHT_PIN 65   // Backlight LED on A11/D65
101
-  #define LCD_RESET_PIN    27
98
+  #define DOGLCD_A0                           40
99
+  #define DOGLCD_CS                           41
100
+  #define LCD_BACKLIGHT_PIN                   65  // Backlight LED on A11/D65
101
+  #define LCD_RESET_PIN                       27
102 102
 
103
-  #define BTN_EN1           2
104
-  #define BTN_EN2           3
105
-  #define BTN_ENC           5
103
+  #define BTN_EN1                              2
104
+  #define BTN_EN2                              3
105
+  #define BTN_ENC                              5
106 106
 
107 107
   // This display has adjustable contrast
108
-  #define LCD_CONTRAST_MIN       0
109
-  #define LCD_CONTRAST_MAX     255
110
-  #define LCD_CONTRAST_INIT LCD_CONTRAST_MAX
108
+  #define LCD_CONTRAST_MIN                     0
109
+  #define LCD_CONTRAST_MAX                   255
110
+  #define LCD_CONTRAST_INIT     LCD_CONTRAST_MAX
111 111
 #endif

+ 62
- 62
Marlin/src/pins/rambo/pins_EINSY_RAMBO.h Parādīt failu

@@ -39,10 +39,10 @@
39 39
 #endif
40 40
 
41 41
 // TMC2130 Diag Pins (currently just for reference)
42
-#define X_DIAG_PIN         64
43
-#define Y_DIAG_PIN         69
44
-#define Z_DIAG_PIN         68
45
-#define E0_DIAG_PIN        65
42
+#define X_DIAG_PIN                            64
43
+#define Y_DIAG_PIN                            69
44
+#define Z_DIAG_PIN                            68
45
+#define E0_DIAG_PIN                           65
46 46
 
47 47
 //
48 48
 // Limit Switches
@@ -55,20 +55,20 @@
55 55
 
56 56
 #if DISABLED(SENSORLESS_HOMING)
57 57
 
58
-  #define X_STOP_PIN       12
59
-  #define Y_STOP_PIN       11
60
-  #define Z_STOP_PIN       10
58
+  #define X_STOP_PIN                          12
59
+  #define Y_STOP_PIN                          11
60
+  #define Z_STOP_PIN                          10
61 61
 
62 62
 #else
63 63
 
64
-  #define X_STOP_PIN       X_DIAG_PIN
65
-  #define Y_STOP_PIN       Y_DIAG_PIN
64
+  #define X_STOP_PIN                  X_DIAG_PIN
65
+  #define Y_STOP_PIN                  Y_DIAG_PIN
66 66
 
67 67
   #if ENABLED(BLTOUCH)
68
-    #define Z_STOP_PIN     11   // Y-MIN
69
-    #define SERVO0_PIN     10   // Z-MIN
68
+    #define Z_STOP_PIN                        11  // Y-MIN
69
+    #define SERVO0_PIN                        10  // Z-MIN
70 70
   #else
71
-    #define Z_STOP_PIN     10
71
+    #define Z_STOP_PIN                        10
72 72
   #endif
73 73
 
74 74
 #endif
@@ -77,104 +77,104 @@
77 77
 // Z Probe (when not Z_MIN_PIN)
78 78
 //
79 79
 #ifndef Z_MIN_PROBE_PIN
80
-  #define Z_MIN_PROBE_PIN  10
80
+  #define Z_MIN_PROBE_PIN                     10
81 81
 #endif
82 82
 
83 83
 //
84 84
 // Steppers
85 85
 //
86
-#define X_STEP_PIN         37
87
-#define X_DIR_PIN          49
88
-#define X_ENABLE_PIN       29
89
-#define X_CS_PIN           41
86
+#define X_STEP_PIN                            37
87
+#define X_DIR_PIN                             49
88
+#define X_ENABLE_PIN                          29
89
+#define X_CS_PIN                              41
90 90
 
91
-#define Y_STEP_PIN         36
92
-#define Y_DIR_PIN          48
93
-#define Y_ENABLE_PIN       28
94
-#define Y_CS_PIN           39
91
+#define Y_STEP_PIN                            36
92
+#define Y_DIR_PIN                             48
93
+#define Y_ENABLE_PIN                          28
94
+#define Y_CS_PIN                              39
95 95
 
96
-#define Z_STEP_PIN         35
97
-#define Z_DIR_PIN          47
98
-#define Z_ENABLE_PIN       27
99
-#define Z_CS_PIN           67
96
+#define Z_STEP_PIN                            35
97
+#define Z_DIR_PIN                             47
98
+#define Z_ENABLE_PIN                          27
99
+#define Z_CS_PIN                              67
100 100
 
101
-#define E0_STEP_PIN        34
102
-#define E0_DIR_PIN         43
103
-#define E0_ENABLE_PIN      26
104
-#define E0_CS_PIN          66
101
+#define E0_STEP_PIN                           34
102
+#define E0_DIR_PIN                            43
103
+#define E0_ENABLE_PIN                         26
104
+#define E0_CS_PIN                             66
105 105
 
106 106
 //
107 107
 // Temperature Sensors
108 108
 //
109
-#define TEMP_0_PIN          0   // Analog Input
110
-#define TEMP_1_PIN          1   // Analog Input
111
-#define TEMP_BED_PIN        2   // Analog Input
109
+#define TEMP_0_PIN                             0  // Analog Input
110
+#define TEMP_1_PIN                             1  // Analog Input
111
+#define TEMP_BED_PIN                           2  // Analog Input
112 112
 
113 113
 //
114 114
 // Heaters / Fans
115 115
 //
116
-#define HEATER_0_PIN        3
117
-#define HEATER_BED_PIN      4
116
+#define HEATER_0_PIN                           3
117
+#define HEATER_BED_PIN                         4
118 118
 
119 119
 #ifndef FAN_PIN
120
-  #define FAN_PIN           8
120
+  #define FAN_PIN                              8
121 121
 #endif
122 122
 
123 123
 #ifndef FAN1_PIN
124
-  #define FAN1_PIN          6
124
+  #define FAN1_PIN                             6
125 125
 #endif
126 126
 
127 127
 //
128 128
 // Misc. Functions
129 129
 //
130
-#define SDSS               77
131
-#define LED_PIN            13
132
-#define CASE_LIGHT_PIN      9
130
+#define SDSS                                  77
131
+#define LED_PIN                               13
132
+#define CASE_LIGHT_PIN                         9
133 133
 
134 134
 //
135 135
 // M3/M4/M5 - Spindle/Laser Control
136 136
 //
137 137
 // use P1 connector for spindle pins
138
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
139
-#define SPINDLE_LASER_ENA_PIN    18   // Pullup!
140
-#define SPINDLE_DIR_PIN          19
138
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
139
+#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
140
+#define SPINDLE_DIR_PIN                       19
141 141
 
142 142
 //
143 143
 // Průša i3 MK2 Multiplexer Support
144 144
 //
145
-#define E_MUX0_PIN         17
146
-#define E_MUX1_PIN         16
147
-#define E_MUX2_PIN         78   // 84 in MK2 Firmware, with BEEPER as 78
145
+#define E_MUX0_PIN                            17
146
+#define E_MUX1_PIN                            16
147
+#define E_MUX2_PIN                            78  // 84 in MK2 Firmware, with BEEPER as 78
148 148
 
149 149
 //
150 150
 // LCD / Controller
151 151
 //
152 152
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
153 153
 
154
-  #define KILL_PIN         32
154
+  #define KILL_PIN                            32
155 155
 
156 156
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
157 157
 
158 158
     #if ENABLED(CR10_STOCKDISPLAY)
159
-      #define LCD_PINS_RS     85
160
-      #define LCD_PINS_ENABLE 71
161
-      #define LCD_PINS_D4     70
162
-      #define BTN_EN1         61
163
-      #define BTN_EN2         59
159
+      #define LCD_PINS_RS                     85
160
+      #define LCD_PINS_ENABLE                 71
161
+      #define LCD_PINS_D4                     70
162
+      #define BTN_EN1                         61
163
+      #define BTN_EN2                         59
164 164
     #else
165
-      #define LCD_PINS_RS     82
166
-      #define LCD_PINS_ENABLE 61
167
-      #define LCD_PINS_D4     59
168
-      #define LCD_PINS_D5     70
169
-      #define LCD_PINS_D6     85
170
-      #define LCD_PINS_D7     71
171
-      #define BTN_EN1         14
172
-      #define BTN_EN2         72
165
+      #define LCD_PINS_RS                     82
166
+      #define LCD_PINS_ENABLE                 61
167
+      #define LCD_PINS_D4                     59
168
+      #define LCD_PINS_D5                     70
169
+      #define LCD_PINS_D6                     85
170
+      #define LCD_PINS_D7                     71
171
+      #define BTN_EN1                         14
172
+      #define BTN_EN2                         72
173 173
     #endif
174 174
 
175
-    #define BTN_ENC            9   // AUX-2
176
-    #define BEEPER_PIN        84   // AUX-4
177
-    #define SD_DETECT_PIN     15
175
+    #define BTN_ENC                            9  // AUX-2
176
+    #define BEEPER_PIN                        84  // AUX-4
177
+    #define SD_DETECT_PIN                     15
178 178
 
179 179
   #endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
180 180
 #endif // HAS_SPI_LCD

+ 71
- 71
Marlin/src/pins/rambo/pins_EINSY_RETRO.h Parādīt failu

@@ -39,10 +39,10 @@
39 39
 #endif
40 40
 
41 41
 // TMC2130 Diag Pins
42
-#define X_DIAG_PIN         64
43
-#define Y_DIAG_PIN         69
44
-#define Z_DIAG_PIN         68
45
-#define E0_DIAG_PIN        65
42
+#define X_DIAG_PIN                            64
43
+#define Y_DIAG_PIN                            69
44
+#define Z_DIAG_PIN                            68
45
+#define E0_DIAG_PIN                           65
46 46
 
47 47
 //
48 48
 // Limit Switches
@@ -55,141 +55,141 @@
55 55
 
56 56
 #if DISABLED(SENSORLESS_HOMING)
57 57
 
58
-  #define X_MIN_PIN        12   // X-
59
-  #define Y_MIN_PIN        11   // Y-
60
-  #define Z_MIN_PIN        10   // Z-
61
-  #define X_MAX_PIN        81   // X+
62
-  #define Y_MAX_PIN        57   // Y+
58
+  #define X_MIN_PIN                           12  // X-
59
+  #define Y_MIN_PIN                           11  // Y-
60
+  #define Z_MIN_PIN                           10  // Z-
61
+  #define X_MAX_PIN                           81  // X+
62
+  #define Y_MAX_PIN                           57  // Y+
63 63
 
64 64
 #else
65 65
 
66 66
   #if X_HOME_DIR < 0
67
-    #define X_MIN_PIN      X_DIAG_PIN
68
-    #define X_MAX_PIN      81   // X+
67
+    #define X_MIN_PIN                 X_DIAG_PIN
68
+    #define X_MAX_PIN                         81  // X+
69 69
   #else
70
-    #define X_MIN_PIN      12   // X-
71
-    #define X_MAX_PIN      X_DIAG_PIN
70
+    #define X_MIN_PIN                         12  // X-
71
+    #define X_MAX_PIN                 X_DIAG_PIN
72 72
   #endif
73 73
 
74 74
   #if Y_HOME_DIR < 0
75
-    #define Y_MIN_PIN      Y_DIAG_PIN
76
-    #define Y_MAX_PIN      57   // Y+
75
+    #define Y_MIN_PIN                 Y_DIAG_PIN
76
+    #define Y_MAX_PIN                         57  // Y+
77 77
   #else
78
-    #define Y_MIN_PIN      11   // Y-
79
-    #define Y_MAX_PIN      Y_DIAG_PIN
78
+    #define Y_MIN_PIN                         11  // Y-
79
+    #define Y_MAX_PIN                 Y_DIAG_PIN
80 80
   #endif
81 81
 
82 82
   #if ENABLED(BLTOUCH)
83
-    #define Z_MIN_PIN      11   // Y-MIN
84
-    #define SERVO0_PIN     10   // Z-MIN
83
+    #define Z_MIN_PIN                         11  // Y-MIN
84
+    #define SERVO0_PIN                        10  // Z-MIN
85 85
   #else
86
-    #define Z_MIN_PIN      10
86
+    #define Z_MIN_PIN                         10
87 87
   #endif
88 88
 
89 89
 #endif
90 90
 
91
-#define Z_MAX_PIN           7
91
+#define Z_MAX_PIN                              7
92 92
 
93 93
 //
94 94
 // Z Probe (when not Z_MIN_PIN)
95 95
 //
96 96
 #ifndef Z_MIN_PROBE_PIN
97
-  #define Z_MIN_PROBE_PIN  10
97
+  #define Z_MIN_PROBE_PIN                     10
98 98
 #endif
99 99
 
100 100
 //
101 101
 // Steppers
102 102
 //
103
-#define X_STEP_PIN         37
104
-#define X_DIR_PIN          49
105
-#define X_ENABLE_PIN       29
106
-#define X_CS_PIN           41
103
+#define X_STEP_PIN                            37
104
+#define X_DIR_PIN                             49
105
+#define X_ENABLE_PIN                          29
106
+#define X_CS_PIN                              41
107 107
 
108
-#define Y_STEP_PIN         36
109
-#define Y_DIR_PIN          48
110
-#define Y_ENABLE_PIN       28
111
-#define Y_CS_PIN           39
108
+#define Y_STEP_PIN                            36
109
+#define Y_DIR_PIN                             48
110
+#define Y_ENABLE_PIN                          28
111
+#define Y_CS_PIN                              39
112 112
 
113
-#define Z_STEP_PIN         35
114
-#define Z_DIR_PIN          47
115
-#define Z_ENABLE_PIN       27
116
-#define Z_CS_PIN           67
113
+#define Z_STEP_PIN                            35
114
+#define Z_DIR_PIN                             47
115
+#define Z_ENABLE_PIN                          27
116
+#define Z_CS_PIN                              67
117 117
 
118
-#define E0_STEP_PIN        34
119
-#define E0_DIR_PIN         43
120
-#define E0_ENABLE_PIN      26
121
-#define E0_CS_PIN          66
118
+#define E0_STEP_PIN                           34
119
+#define E0_DIR_PIN                            43
120
+#define E0_ENABLE_PIN                         26
121
+#define E0_CS_PIN                             66
122 122
 
123 123
 //
124 124
 // Temperature Sensors
125 125
 //
126
-#define TEMP_0_PIN          0   // Analog Input
127
-#define TEMP_1_PIN          1   // Analog Input
128
-#define TEMP_BED_PIN        2   // Analog Input
126
+#define TEMP_0_PIN                             0  // Analog Input
127
+#define TEMP_1_PIN                             1  // Analog Input
128
+#define TEMP_BED_PIN                           2  // Analog Input
129 129
 
130 130
 //
131 131
 // Heaters / Fans
132 132
 //
133
-#define HEATER_0_PIN        3
134
-#define HEATER_BED_PIN      4
133
+#define HEATER_0_PIN                           3
134
+#define HEATER_BED_PIN                         4
135 135
 
136 136
 #ifndef FAN_PIN
137
-  #define FAN_PIN           8
137
+  #define FAN_PIN                              8
138 138
 #endif
139
-#define FAN1_PIN            6
139
+#define FAN1_PIN                               6
140 140
 
141 141
 //
142 142
 // Misc. Functions
143 143
 //
144
-#define SDSS               53
145
-#define LED_PIN            13
146
-#define CASE_LIGHT_PIN      9
144
+#define SDSS                                  53
145
+#define LED_PIN                               13
146
+#define CASE_LIGHT_PIN                         9
147 147
 
148 148
 //
149 149
 // M3/M4/M5 - Spindle/Laser Control
150 150
 //
151 151
 // use P1 connector for spindle pins
152
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
153
-#define SPINDLE_LASER_ENA_PIN    18   // Pullup!
154
-#define SPINDLE_DIR_PIN          19
152
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
153
+#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
154
+#define SPINDLE_DIR_PIN                       19
155 155
 
156 156
 //
157 157
 // Průša i3 MK2 Multiplexer Support
158 158
 //
159
-#define E_MUX0_PIN         17
160
-#define E_MUX1_PIN         16
161
-#define E_MUX2_PIN         78   // 84 in MK2 Firmware, with BEEPER as 78
159
+#define E_MUX0_PIN                            17
160
+#define E_MUX1_PIN                            16
161
+#define E_MUX2_PIN                            78  // 84 in MK2 Firmware, with BEEPER as 78
162 162
 
163 163
 //
164 164
 // LCD / Controller
165 165
 //
166 166
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
167 167
 
168
-  #define KILL_PIN         32
168
+  #define KILL_PIN                            32
169 169
 
170 170
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
171 171
 
172 172
     #if ENABLED(CR10_STOCKDISPLAY)
173
-      #define LCD_PINS_RS     85
174
-      #define LCD_PINS_ENABLE 71
175
-      #define LCD_PINS_D4     70
176
-      #define BTN_EN1         18
177
-      #define BTN_EN2         19
173
+      #define LCD_PINS_RS                     85
174
+      #define LCD_PINS_ENABLE                 71
175
+      #define LCD_PINS_D4                     70
176
+      #define BTN_EN1                         18
177
+      #define BTN_EN2                         19
178 178
     #else
179
-      #define LCD_PINS_RS     82
180
-      #define LCD_PINS_ENABLE 18   // On 0.6b, use 61
181
-      #define LCD_PINS_D4     19   // On 0.6b, use 59
182
-      #define LCD_PINS_D5     70
183
-      #define LCD_PINS_D6     85
184
-      #define LCD_PINS_D7     71
185
-      #define BTN_EN1         14
186
-      #define BTN_EN2         72
179
+      #define LCD_PINS_RS                     82
180
+      #define LCD_PINS_ENABLE                 18  // On 0.6b, use 61
181
+      #define LCD_PINS_D4                     19  // On 0.6b, use 59
182
+      #define LCD_PINS_D5                     70
183
+      #define LCD_PINS_D6                     85
184
+      #define LCD_PINS_D7                     71
185
+      #define BTN_EN1                         14
186
+      #define BTN_EN2                         72
187 187
     #endif
188 188
 
189
-    #define BTN_ENC            9   // AUX-2
190
-    #define BEEPER_PIN        84   // AUX-4
189
+    #define BTN_ENC                            9  // AUX-2
190
+    #define BEEPER_PIN                        84  // AUX-4
191 191
 
192
-    #define SD_DETECT_PIN     15
192
+    #define SD_DETECT_PIN                     15
193 193
 
194 194
   #endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
195 195
 #endif // HAS_SPI_LCD

+ 76
- 76
Marlin/src/pins/rambo/pins_MINIRAMBO.h Parādīt failu

@@ -38,104 +38,104 @@
38 38
 //
39 39
 // Limit Switches
40 40
 //
41
-#define X_MIN_PIN          12
42
-#define X_MAX_PIN          30
43
-#define Y_MIN_PIN          11
44
-#define Y_MAX_PIN          24
45
-#define Z_MIN_PIN          10
46
-#define Z_MAX_PIN          23
41
+#define X_MIN_PIN                             12
42
+#define X_MAX_PIN                             30
43
+#define Y_MIN_PIN                             11
44
+#define Y_MAX_PIN                             24
45
+#define Z_MIN_PIN                             10
46
+#define Z_MAX_PIN                             23
47 47
 
48 48
 //
49 49
 // Z Probe (when not Z_MIN_PIN)
50 50
 //
51 51
 #ifndef Z_MIN_PROBE_PIN
52
-  #define Z_MIN_PROBE_PIN  23
52
+  #define Z_MIN_PROBE_PIN                     23
53 53
 #endif
54 54
 
55 55
 //
56 56
 // Steppers
57 57
 //
58
-#define X_STEP_PIN         37
59
-#define X_DIR_PIN          48
60
-#define X_ENABLE_PIN       29
58
+#define X_STEP_PIN                            37
59
+#define X_DIR_PIN                             48
60
+#define X_ENABLE_PIN                          29
61 61
 
62
-#define Y_STEP_PIN         36
63
-#define Y_DIR_PIN          49
64
-#define Y_ENABLE_PIN       28
62
+#define Y_STEP_PIN                            36
63
+#define Y_DIR_PIN                             49
64
+#define Y_ENABLE_PIN                          28
65 65
 
66
-#define Z_STEP_PIN         35
67
-#define Z_DIR_PIN          47
68
-#define Z_ENABLE_PIN       27
66
+#define Z_STEP_PIN                            35
67
+#define Z_DIR_PIN                             47
68
+#define Z_ENABLE_PIN                          27
69 69
 
70
-#define E0_STEP_PIN        34
71
-#define E0_DIR_PIN         43
72
-#define E0_ENABLE_PIN      26
70
+#define E0_STEP_PIN                           34
71
+#define E0_DIR_PIN                            43
72
+#define E0_ENABLE_PIN                         26
73 73
 
74 74
 // Microstepping pins - Mapping not from fastio.h (?)
75
-#define X_MS1_PIN          40
76
-#define X_MS2_PIN          41
77
-#define Y_MS1_PIN          69
78
-#define Y_MS2_PIN          39
79
-#define Z_MS1_PIN          68
80
-#define Z_MS2_PIN          67
81
-#define E0_MS1_PIN         65
82
-#define E0_MS2_PIN         66
83
-
84
-#define MOTOR_CURRENT_PWM_XY_PIN 46
85
-#define MOTOR_CURRENT_PWM_Z_PIN  45
86
-#define MOTOR_CURRENT_PWM_E_PIN  44
75
+#define X_MS1_PIN                             40
76
+#define X_MS2_PIN                             41
77
+#define Y_MS1_PIN                             69
78
+#define Y_MS2_PIN                             39
79
+#define Z_MS1_PIN                             68
80
+#define Z_MS2_PIN                             67
81
+#define E0_MS1_PIN                            65
82
+#define E0_MS2_PIN                            66
83
+
84
+#define MOTOR_CURRENT_PWM_XY_PIN              46
85
+#define MOTOR_CURRENT_PWM_Z_PIN               45
86
+#define MOTOR_CURRENT_PWM_E_PIN               44
87 87
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
88 88
 #ifndef MOTOR_CURRENT_PWM_RANGE
89
-  #define MOTOR_CURRENT_PWM_RANGE 2000
89
+  #define MOTOR_CURRENT_PWM_RANGE            2000
90 90
 #endif
91 91
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
92 92
 
93 93
 //
94 94
 // Temperature Sensors
95 95
 //
96
-#define TEMP_0_PIN          0   // Analog Input
97
-#define TEMP_1_PIN          1   // Analog Input
98
-#define TEMP_BED_PIN        2   // Analog Input
96
+#define TEMP_0_PIN                             0  // Analog Input
97
+#define TEMP_1_PIN                             1  // Analog Input
98
+#define TEMP_BED_PIN                           2  // Analog Input
99 99
 
100 100
 //
101 101
 // Heaters / Fans
102 102
 //
103
-#define HEATER_0_PIN        3
104
-#define HEATER_1_PIN        7
103
+#define HEATER_0_PIN                           3
104
+#define HEATER_1_PIN                           7
105 105
 #if !MB(MINIRAMBO_10A)
106
-  #define HEATER_2_PIN      6
106
+  #define HEATER_2_PIN                         6
107 107
 #endif
108
-#define HEATER_BED_PIN      4
108
+#define HEATER_BED_PIN                         4
109 109
 
110 110
 #ifndef FAN_PIN
111
-  #define FAN_PIN           8
111
+  #define FAN_PIN                              8
112 112
 #endif
113
-#define FAN1_PIN            6
113
+#define FAN1_PIN                               6
114 114
 
115 115
 //
116 116
 // Misc. Functions
117 117
 //
118
-#define SDSS               53
119
-#define LED_PIN            13
118
+#define SDSS                                  53
119
+#define LED_PIN                               13
120 120
 #if !MB(MINIRAMBO_10A)
121
-  #define CASE_LIGHT_PIN    9
121
+  #define CASE_LIGHT_PIN                       9
122 122
 #endif
123 123
 
124 124
 //
125 125
 // M3/M4/M5 - Spindle/Laser Control
126 126
 //
127 127
 // use P1 connector for spindle pins
128
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
129
-#define SPINDLE_LASER_ENA_PIN    18   // Pullup!
130
-#define SPINDLE_DIR_PIN          19
128
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
129
+#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
130
+#define SPINDLE_DIR_PIN                       19
131 131
 
132 132
 //
133 133
 // Průša i3 MK2 Multiplexer Support
134 134
 //
135
-#define E_MUX0_PIN         17
136
-#define E_MUX1_PIN         16
135
+#define E_MUX0_PIN                            17
136
+#define E_MUX1_PIN                            16
137 137
 #if !MB(MINIRAMBO_10A)
138
-  #define E_MUX2_PIN       78   // 84 in MK2 Firmware, with BEEPER as 78
138
+  #define E_MUX2_PIN                          78  // 84 in MK2 Firmware, with BEEPER as 78
139 139
 #endif
140 140
 
141 141
 //
@@ -144,46 +144,46 @@
144 144
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
145 145
 
146 146
   #if !MB(MINIRAMBO_10A)
147
-    #define KILL_PIN       32
147
+    #define KILL_PIN                          32
148 148
   #endif
149 149
 
150 150
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
151 151
 
152 152
     #if MB(MINIRAMBO_10A)
153 153
 
154
-      #define BEEPER_PIN   78
154
+      #define BEEPER_PIN                      78
155 155
 
156
-      #define BTN_EN1      80
157
-      #define BTN_EN2      73
158
-      #define BTN_ENC      21
156
+      #define BTN_EN1                         80
157
+      #define BTN_EN2                         73
158
+      #define BTN_ENC                         21
159 159
 
160
-      #define LCD_PINS_RS  38
161
-      #define LCD_PINS_ENABLE 5
162
-      #define LCD_PINS_D4  14
163
-      #define LCD_PINS_D5  15
164
-      #define LCD_PINS_D6  32
165
-      #define LCD_PINS_D7  31
160
+      #define LCD_PINS_RS                     38
161
+      #define LCD_PINS_ENABLE                  5
162
+      #define LCD_PINS_D4                     14
163
+      #define LCD_PINS_D5                     15
164
+      #define LCD_PINS_D6                     32
165
+      #define LCD_PINS_D7                     31
166 166
 
167
-      #define SD_DETECT_PIN  72
167
+      #define SD_DETECT_PIN                   72
168 168
 
169
-    #else // !MINIRAMBO_10A
169
+    #else                                         // !MINIRAMBO_10A
170 170
 
171 171
       // AUX-4
172
-      #define BEEPER_PIN   84
172
+      #define BEEPER_PIN                      84
173 173
 
174 174
       // AUX-2
175
-      #define BTN_EN1      14
176
-      #define BTN_EN2      72
177
-      #define BTN_ENC       9
178
-
179
-      #define LCD_PINS_RS  82
180
-      #define LCD_PINS_ENABLE 18
181
-      #define LCD_PINS_D4  19
182
-      #define LCD_PINS_D5  70
183
-      #define LCD_PINS_D6  85
184
-      #define LCD_PINS_D7  71
185
-
186
-      #define SD_DETECT_PIN  15
175
+      #define BTN_EN1                         14
176
+      #define BTN_EN2                         72
177
+      #define BTN_ENC                          9
178
+
179
+      #define LCD_PINS_RS                     82
180
+      #define LCD_PINS_ENABLE                 18
181
+      #define LCD_PINS_D4                     19
182
+      #define LCD_PINS_D5                     70
183
+      #define LCD_PINS_D6                     85
184
+      #define LCD_PINS_D7                     71
185
+
186
+      #define SD_DETECT_PIN                   15
187 187
 
188 188
     #endif // !MINIRAMBO_10A
189 189
 

+ 96
- 96
Marlin/src/pins/rambo/pins_RAMBO.h Parādīt failu

@@ -50,64 +50,64 @@
50 50
 //
51 51
 // Servos
52 52
 //
53
-#define SERVO0_PIN         22   // Motor header MX1
54
-#define SERVO1_PIN         23   // Motor header MX2
55
-#define SERVO2_PIN         24   // Motor header MX3
56
-#define SERVO3_PIN          5   // PWM header pin 5
53
+#define SERVO0_PIN                            22  // Motor header MX1
54
+#define SERVO1_PIN                            23  // Motor header MX2
55
+#define SERVO2_PIN                            24  // Motor header MX3
56
+#define SERVO3_PIN                             5  // PWM header pin 5
57 57
 
58 58
 //
59 59
 // Limit Switches
60 60
 //
61
-#define X_MIN_PIN          12
62
-#define X_MAX_PIN          24
63
-#define Y_MIN_PIN          11
64
-#define Y_MAX_PIN          23
65
-#define Z_MIN_PIN          10
66
-#define Z_MAX_PIN          30
61
+#define X_MIN_PIN                             12
62
+#define X_MAX_PIN                             24
63
+#define Y_MIN_PIN                             11
64
+#define Y_MAX_PIN                             23
65
+#define Z_MIN_PIN                             10
66
+#define Z_MAX_PIN                             30
67 67
 
68 68
 //
69 69
 // Z Probe (when not Z_MIN_PIN)
70 70
 //
71 71
 #ifndef Z_MIN_PROBE_PIN
72
-  #define Z_MIN_PROBE_PIN  30
72
+  #define Z_MIN_PROBE_PIN                     30
73 73
 #endif
74 74
 
75 75
 //
76 76
 // Steppers
77 77
 //
78
-#define X_STEP_PIN         37
79
-#define X_DIR_PIN          48
80
-#define X_ENABLE_PIN       29
78
+#define X_STEP_PIN                            37
79
+#define X_DIR_PIN                             48
80
+#define X_ENABLE_PIN                          29
81 81
 
82
-#define Y_STEP_PIN         36
83
-#define Y_DIR_PIN          49
84
-#define Y_ENABLE_PIN       28
82
+#define Y_STEP_PIN                            36
83
+#define Y_DIR_PIN                             49
84
+#define Y_ENABLE_PIN                          28
85 85
 
86
-#define Z_STEP_PIN         35
87
-#define Z_DIR_PIN          47
88
-#define Z_ENABLE_PIN       27
86
+#define Z_STEP_PIN                            35
87
+#define Z_DIR_PIN                             47
88
+#define Z_ENABLE_PIN                          27
89 89
 
90
-#define E0_STEP_PIN        34
91
-#define E0_DIR_PIN         43
92
-#define E0_ENABLE_PIN      26
90
+#define E0_STEP_PIN                           34
91
+#define E0_DIR_PIN                            43
92
+#define E0_ENABLE_PIN                         26
93 93
 
94
-#define E1_STEP_PIN        33
95
-#define E1_DIR_PIN         42
96
-#define E1_ENABLE_PIN      25
94
+#define E1_STEP_PIN                           33
95
+#define E1_DIR_PIN                            42
96
+#define E1_ENABLE_PIN                         25
97 97
 
98 98
 // Microstepping pins - Mapping not from fastio.h (?)
99
-#define X_MS1_PIN          40
100
-#define X_MS2_PIN          41
101
-#define Y_MS1_PIN          69
102
-#define Y_MS2_PIN          39
103
-#define Z_MS1_PIN          68
104
-#define Z_MS2_PIN          67
105
-#define E0_MS1_PIN         65
106
-#define E0_MS2_PIN         66
107
-#define E1_MS1_PIN         63
108
-#define E1_MS2_PIN         64
109
-
110
-#define DIGIPOTSS_PIN      38
99
+#define X_MS1_PIN                             40
100
+#define X_MS2_PIN                             41
101
+#define Y_MS1_PIN                             69
102
+#define Y_MS2_PIN                             39
103
+#define Z_MS1_PIN                             68
104
+#define Z_MS2_PIN                             67
105
+#define E0_MS1_PIN                            65
106
+#define E0_MS2_PIN                            66
107
+#define E1_MS1_PIN                            63
108
+#define E1_MS2_PIN                            64
109
+
110
+#define DIGIPOTSS_PIN                         38
111 111
 #define DIGIPOT_CHANNELS  { 4,5,3,0,1 }   // X Y Z E0 E1 digipot channels to stepper driver mapping
112 112
 #ifndef DIGIPOT_MOTOR_CURRENT
113 113
   #define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 }   // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
@@ -116,122 +116,122 @@
116 116
 //
117 117
 // Temperature Sensors
118 118
 //
119
-#define TEMP_0_PIN          0   // Analog Input
120
-#define TEMP_1_PIN          1   // Analog Input
121
-#define TEMP_BED_PIN        2   // Analog Input
119
+#define TEMP_0_PIN                             0  // Analog Input
120
+#define TEMP_1_PIN                             1  // Analog Input
121
+#define TEMP_BED_PIN                           2  // Analog Input
122 122
 
123 123
 //
124 124
 // Heaters / Fans
125 125
 //
126
-#define HEATER_0_PIN        9
127
-#define HEATER_1_PIN        7
128
-#define HEATER_2_PIN        6
129
-#define HEATER_BED_PIN      3
126
+#define HEATER_0_PIN                           9
127
+#define HEATER_1_PIN                           7
128
+#define HEATER_2_PIN                           6
129
+#define HEATER_BED_PIN                         3
130 130
 
131 131
 #ifndef FAN_PIN
132
-  #define FAN_PIN           8
132
+  #define FAN_PIN                              8
133 133
 #endif
134
-#define FAN1_PIN            6
135
-#define FAN2_PIN            2
134
+#define FAN1_PIN                               6
135
+#define FAN2_PIN                               2
136 136
 
137 137
 //
138 138
 // Misc. Functions
139 139
 //
140
-#define SDSS               53
141
-#define LED_PIN            13
142
-#define PS_ON_PIN           4
143
-#define CASE_LIGHT_PIN     46
140
+#define SDSS                                  53
141
+#define LED_PIN                               13
142
+#define PS_ON_PIN                              4
143
+#define CASE_LIGHT_PIN                        46
144 144
 
145 145
 #ifndef FILWIDTH_PIN
146
-  #define FILWIDTH_PIN      3   // Analog Input
146
+  #define FILWIDTH_PIN                         3  // Analog Input
147 147
 #endif
148 148
 
149 149
 //
150 150
 // M3/M4/M5 - Spindle/Laser Control
151 151
 //
152
-#define SPINDLE_LASER_PWM_PIN    45   // Hardware PWM
153
-#define SPINDLE_LASER_ENA_PIN    31   // Pullup!
154
-#define SPINDLE_DIR_PIN          32
152
+#define SPINDLE_LASER_PWM_PIN                 45  // Hardware PWM
153
+#define SPINDLE_LASER_ENA_PIN                 31  // Pullup!
154
+#define SPINDLE_DIR_PIN                       32
155 155
 
156 156
 //
157 157
 // M7/M8/M9 - Coolant Control
158 158
 //
159
-#define COOLANT_MIST_PIN   22
160
-#define COOLANT_FLOOD_PIN  44
159
+#define COOLANT_MIST_PIN                      22
160
+#define COOLANT_FLOOD_PIN                     44
161 161
 
162 162
 //
163 163
 // Průša i3 MK2 Multiplexer Support
164 164
 //
165
-#define E_MUX0_PIN         17
166
-#define E_MUX1_PIN         16
167
-#define E_MUX2_PIN         84   // 84 in MK2 Firmware
165
+#define E_MUX0_PIN                            17
166
+#define E_MUX1_PIN                            16
167
+#define E_MUX2_PIN                            84  // 84 in MK2 Firmware
168 168
 
169 169
 //
170 170
 // LCD / Controller
171 171
 //
172 172
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
173 173
 
174
-  #define KILL_PIN         80
174
+  #define KILL_PIN                            80
175 175
 
176 176
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
177 177
 
178
-    #define LCD_PINS_RS     70
179
-    #define LCD_PINS_ENABLE 71
180
-    #define LCD_PINS_D4     72
181
-    #define LCD_PINS_D5     73
182
-    #define LCD_PINS_D6     74
183
-    #define LCD_PINS_D7     75
178
+    #define LCD_PINS_RS                       70
179
+    #define LCD_PINS_ENABLE                   71
180
+    #define LCD_PINS_D4                       72
181
+    #define LCD_PINS_D5                       73
182
+    #define LCD_PINS_D6                       74
183
+    #define LCD_PINS_D7                       75
184 184
 
185 185
     #if ANY(VIKI2, miniVIKI)
186
-      #define BEEPER_PIN   44
186
+      #define BEEPER_PIN                      44
187 187
       // NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
188 188
       //     beeper/buzzer is connected to pin 33; however, the pin used in the
189 189
       //     diagram is actually pin 44, so this is correct.
190 190
 
191
-      #define DOGLCD_A0    70
192
-      #define DOGLCD_CS    71
191
+      #define DOGLCD_A0                       70
192
+      #define DOGLCD_CS                       71
193 193
       #define LCD_SCREEN_ROT_180
194 194
 
195
-      #define BTN_EN1      85
196
-      #define BTN_EN2      84
197
-      #define BTN_ENC      83
195
+      #define BTN_EN1                         85
196
+      #define BTN_EN2                         84
197
+      #define BTN_ENC                         83
198 198
 
199
-      #define SD_DETECT_PIN -1   // Pin 72 if using easy adapter board
199
+      #define SD_DETECT_PIN                   -1  // Pin 72 if using easy adapter board
200 200
 
201
-      #define STAT_LED_RED_PIN 22
202
-      #define STAT_LED_BLUE_PIN 32
201
+      #define STAT_LED_RED_PIN                22
202
+      #define STAT_LED_BLUE_PIN               32
203 203
 
204
-    #else // !VIKI2 && !miniVIKI
204
+    #else                                         // !VIKI2 && !miniVIKI
205 205
 
206
-      #define BEEPER_PIN   79   // AUX-4
206
+      #define BEEPER_PIN                      79  // AUX-4
207 207
 
208 208
       // AUX-2
209
-      #define BTN_EN1      76
210
-      #define BTN_EN2      77
211
-      #define BTN_ENC      78
209
+      #define BTN_EN1                         76
210
+      #define BTN_EN2                         77
211
+      #define BTN_ENC                         78
212 212
 
213
-      #define SD_DETECT_PIN 81
213
+      #define SD_DETECT_PIN                   81
214 214
 
215 215
     #endif // !VIKI2 && !miniVIKI
216 216
 
217
-  #else // !NEWPANEL - old style panel with shift register
217
+  #else                                           // !NEWPANEL - old style panel with shift register
218 218
 
219 219
     // No Beeper added
220
-    #define BEEPER_PIN     33
220
+    #define BEEPER_PIN                        33
221 221
 
222 222
     // Buttons attached to a shift register
223 223
     // Not wired yet
224
-    //#define SHIFT_CLK 38
225
-    //#define SHIFT_LD 42
226
-    //#define SHIFT_OUT 40
227
-    //#define SHIFT_EN 17
228
-
229
-    #define LCD_PINS_RS     75
230
-    #define LCD_PINS_ENABLE 17
231
-    #define LCD_PINS_D4     23
232
-    #define LCD_PINS_D5     25
233
-    #define LCD_PINS_D6     27
234
-    #define LCD_PINS_D7     29
224
+    //#define SHIFT_CLK                       38
225
+    //#define SHIFT_LD                        42
226
+    //#define SHIFT_OUT                       40
227
+    //#define SHIFT_EN                        17
228
+
229
+    #define LCD_PINS_RS                       75
230
+    #define LCD_PINS_ENABLE                   17
231
+    #define LCD_PINS_D4                       23
232
+    #define LCD_PINS_D5                       25
233
+    #define LCD_PINS_D6                       27
234
+    #define LCD_PINS_D7                       29
235 235
 
236 236
   #endif // !NEWPANEL
237 237
 

+ 71
- 71
Marlin/src/pins/rambo/pins_SCOOVO_X9H.h Parādīt failu

@@ -34,126 +34,126 @@
34 34
 //
35 35
 // Servos
36 36
 //
37
-#define SERVO0_PIN         22   // Motor header MX1
38
-#define SERVO1_PIN         23   // Motor header MX2
39
-#define SERVO2_PIN         24   // Motor header MX3
40
-#define SERVO3_PIN          5   // PWM header pin 5
37
+#define SERVO0_PIN                            22  // Motor header MX1
38
+#define SERVO1_PIN                            23  // Motor header MX2
39
+#define SERVO2_PIN                            24  // Motor header MX3
40
+#define SERVO3_PIN                             5  // PWM header pin 5
41 41
 
42 42
 //
43 43
 // Limit Switches
44 44
 //
45
-#define X_MIN_PIN          12
46
-#define X_MAX_PIN          24
47
-#define Y_MIN_PIN          11
48
-#define Y_MAX_PIN          23
49
-#define Z_MIN_PIN          10
50
-#define Z_MAX_PIN          30
45
+#define X_MIN_PIN                             12
46
+#define X_MAX_PIN                             24
47
+#define Y_MIN_PIN                             11
48
+#define Y_MAX_PIN                             23
49
+#define Z_MIN_PIN                             10
50
+#define Z_MAX_PIN                             30
51 51
 
52 52
 //
53 53
 // Z Probe (when not Z_MIN_IN)
54 54
 //
55 55
 #ifndef Z_MIN_PROBE_PIN
56
-  #define Z_MIN_PROBE_PIN  30
56
+  #define Z_MIN_PROBE_PIN                     30
57 57
 #endif
58 58
 
59 59
 //
60 60
 // Steppers
61 61
 //
62
-#define X_STEP_PIN         37
63
-#define X_DIR_PIN          48
64
-#define X_ENABLE_PIN       29
62
+#define X_STEP_PIN                            37
63
+#define X_DIR_PIN                             48
64
+#define X_ENABLE_PIN                          29
65 65
 
66
-#define Y_STEP_PIN         36
67
-#define Y_DIR_PIN          49
68
-#define Y_ENABLE_PIN       28
66
+#define Y_STEP_PIN                            36
67
+#define Y_DIR_PIN                             49
68
+#define Y_ENABLE_PIN                          28
69 69
 
70
-#define Z_STEP_PIN         35
71
-#define Z_DIR_PIN          47
72
-#define Z_ENABLE_PIN       27
70
+#define Z_STEP_PIN                            35
71
+#define Z_DIR_PIN                             47
72
+#define Z_ENABLE_PIN                          27
73 73
 
74
-#define E0_STEP_PIN        34
75
-#define E0_DIR_PIN         43
76
-#define E0_ENABLE_PIN      26
74
+#define E0_STEP_PIN                           34
75
+#define E0_DIR_PIN                            43
76
+#define E0_ENABLE_PIN                         26
77 77
 
78
-#define E1_STEP_PIN        33
79
-#define E1_DIR_PIN         42
80
-#define E1_ENABLE_PIN      25
78
+#define E1_STEP_PIN                           33
79
+#define E1_DIR_PIN                            42
80
+#define E1_ENABLE_PIN                         25
81 81
 
82 82
 // Microstepping pins - Mapping not from fastio.h (?)
83
-#define X_MS1_PIN          40
84
-#define X_MS2_PIN          41
85
-#define Y_MS1_PIN          69
86
-#define Y_MS2_PIN          39
87
-#define Z_MS1_PIN          68
88
-#define Z_MS2_PIN          67
89
-#define E0_MS1_PIN         65
90
-#define E0_MS2_PIN         66
91
-#define E1_MS1_PIN         63
92
-#define E1_MS2_PIN         64
93
-
94
-#define DIGIPOTSS_PIN      38
83
+#define X_MS1_PIN                             40
84
+#define X_MS2_PIN                             41
85
+#define Y_MS1_PIN                             69
86
+#define Y_MS2_PIN                             39
87
+#define Z_MS1_PIN                             68
88
+#define Z_MS2_PIN                             67
89
+#define E0_MS1_PIN                            65
90
+#define E0_MS2_PIN                            66
91
+#define E1_MS1_PIN                            63
92
+#define E1_MS2_PIN                            64
93
+
94
+#define DIGIPOTSS_PIN                         38
95 95
 #define DIGIPOT_CHANNELS {4,5,3,0,1}   // X Y Z E0 E1 digipot channels to stepper driver mapping
96 96
 
97 97
 //
98 98
 // Temperature Sensors
99 99
 //
100
-#define TEMP_0_PIN          0   // Analog Input
101
-#define TEMP_BED_PIN        7   // Analog Input
100
+#define TEMP_0_PIN                             0  // Analog Input
101
+#define TEMP_BED_PIN                           7  // Analog Input
102 102
 
103 103
 //
104 104
 // Heaters / Fans
105 105
 //
106
-#define HEATER_0_PIN        9
107
-#define HEATER_1_PIN        7
108
-#define HEATER_BED_PIN      3
106
+#define HEATER_0_PIN                           9
107
+#define HEATER_1_PIN                           7
108
+#define HEATER_BED_PIN                         3
109 109
 
110 110
 #ifndef FAN_PIN
111
-  #define FAN_PIN           8
111
+  #define FAN_PIN                              8
112 112
 #endif
113
-#define FAN1_PIN            6
114
-#define FAN2_PIN            2
113
+#define FAN1_PIN                               6
114
+#define FAN2_PIN                               2
115 115
 
116 116
 //
117 117
 // Misc. Functions
118 118
 //
119
-#define SDSS               53
120
-#define LED_PIN            13
121
-#define PS_ON_PIN           4
119
+#define SDSS                                  53
120
+#define LED_PIN                               13
121
+#define PS_ON_PIN                              4
122 122
 
123 123
 #ifndef FILWIDTH_PIN
124
-  #define FILWIDTH_PIN      3   // Analog Input
124
+  #define FILWIDTH_PIN                         3  // Analog Input
125 125
 #endif
126 126
 
127 127
 //
128 128
 // LCD / Controller
129 129
 //
130
-#define LCD_PINS_RS        70   // Ext2_5
131
-#define LCD_PINS_ENABLE    71   // Ext2_7
132
-#define LCD_PINS_D4        72   // Ext2_9 ?
133
-#define LCD_PINS_D5        73   // Ext2_11 ?
134
-#define LCD_PINS_D6        74   // Ext2_13
135
-#define LCD_PINS_D7        75   // Ext2_15 ?
136
-#define BEEPER_PIN         -1
130
+#define LCD_PINS_RS                           70  // Ext2_5
131
+#define LCD_PINS_ENABLE                       71  // Ext2_7
132
+#define LCD_PINS_D4                           72  // Ext2_9 ?
133
+#define LCD_PINS_D5                           73  // Ext2_11 ?
134
+#define LCD_PINS_D6                           74  // Ext2_13
135
+#define LCD_PINS_D7                           75  // Ext2_15 ?
136
+#define BEEPER_PIN                            -1
137 137
 
138
-#define BTN_HOME           80   // Ext_16
139
-#define BTN_CENTER         81   // Ext_14
140
-#define BTN_ENC            BTN_CENTER
141
-#define BTN_RIGHT          82   // Ext_12
142
-#define BTN_LEFT           83   // Ext_10
143
-#define BTN_UP             84   // Ext2_8
144
-#define BTN_DOWN           85   // Ext2_6
138
+#define BTN_HOME                              80  // Ext_16
139
+#define BTN_CENTER                            81  // Ext_14
140
+#define BTN_ENC                       BTN_CENTER
141
+#define BTN_RIGHT                             82  // Ext_12
142
+#define BTN_LEFT                              83  // Ext_10
143
+#define BTN_UP                                84  // Ext2_8
144
+#define BTN_DOWN                              85  // Ext2_6
145 145
 
146
-#define HOME_PIN           BTN_HOME
146
+#define HOME_PIN                        BTN_HOME
147 147
 
148 148
 #if ANY(VIKI2, miniVIKI)
149
-  #define BEEPER_PIN       44
149
+  #define BEEPER_PIN                          44
150 150
   // Pins for DOGM SPI LCD Support
151
-  #define DOGLCD_A0        70
152
-  #define DOGLCD_CS        71
151
+  #define DOGLCD_A0                           70
152
+  #define DOGLCD_CS                           71
153 153
   #define LCD_SCREEN_ROT_180
154 154
 
155
-  #define SD_DETECT_PIN    -1   // Pin 72 if using easy adapter board
155
+  #define SD_DETECT_PIN                       -1  // Pin 72 if using easy adapter board
156 156
 
157
-  #define STAT_LED_RED_PIN  22
158
-  #define STAT_LED_BLUE_PIN 32
157
+  #define STAT_LED_RED_PIN                    22
158
+  #define STAT_LED_BLUE_PIN                   32
159 159
 #endif // VIKI2/miniVIKI

+ 28
- 28
Marlin/src/pins/ramps/pins_3DRAG.h Parādīt failu

@@ -40,11 +40,11 @@
40 40
 //
41 41
 // Heaters / Fans
42 42
 //
43
-#define RAMPS_D8_PIN        9
44
-#define RAMPS_D9_PIN        8
45
-#define MOSFET_D_PIN       12
43
+#define RAMPS_D8_PIN                           9
44
+#define RAMPS_D9_PIN                           8
45
+#define MOSFET_D_PIN                          12
46 46
 
47
-#define CASE_LIGHT_PIN     -1   // Hardware PWM but one is not available on expansion header
47
+#define CASE_LIGHT_PIN                        -1  // Hardware PWM but one is not available on expansion header
48 48
 
49 49
 #include "pins_RAMPS.h"
50 50
 
@@ -57,21 +57,21 @@
57 57
 // Steppers
58 58
 //
59 59
 #undef Z_ENABLE_PIN
60
-#define Z_ENABLE_PIN       63
60
+#define Z_ENABLE_PIN                          63
61 61
 
62 62
 //
63 63
 // Heaters / Fans
64 64
 //
65
-#define HEATER_2_PIN        6
65
+#define HEATER_2_PIN                           6
66 66
 
67 67
 //
68 68
 // Misc. Functions
69 69
 //
70 70
 #undef SDSS
71
-#define SDSS               25
71
+#define SDSS                                  25
72 72
 
73 73
 #undef SD_DETECT_PIN
74
-#define SD_DETECT_PIN      53
74
+#define SD_DETECT_PIN                         53
75 75
 
76 76
 //
77 77
 // LCD / Controller
@@ -85,24 +85,24 @@
85 85
   #undef LCD_PINS_D5
86 86
   #undef LCD_PINS_D6
87 87
   #undef LCD_PINS_D7
88
-  #define LCD_PINS_RS      27
89
-  #define LCD_PINS_ENABLE  29
90
-  #define LCD_PINS_D4      37
91
-  #define LCD_PINS_D5      35
92
-  #define LCD_PINS_D6      33
93
-  #define LCD_PINS_D7      31
88
+  #define LCD_PINS_RS                         27
89
+  #define LCD_PINS_ENABLE                     29
90
+  #define LCD_PINS_D4                         37
91
+  #define LCD_PINS_D5                         35
92
+  #define LCD_PINS_D6                         33
93
+  #define LCD_PINS_D7                         31
94 94
 
95 95
   // Buttons
96 96
   #undef BTN_EN1
97 97
   #undef BTN_EN2
98 98
   #undef BTN_ENC
99
-  #define BTN_EN1          16
100
-  #define BTN_EN2          17
101
-  #define BTN_ENC          23
99
+  #define BTN_EN1                             16
100
+  #define BTN_EN2                             17
101
+  #define BTN_ENC                             23
102 102
 
103 103
 #else
104 104
 
105
-  #define BEEPER_PIN       33
105
+  #define BEEPER_PIN                          33
106 106
 
107 107
 #endif // HAS_SPI_LCD && NEWPANEL
108 108
 
@@ -137,7 +137,7 @@
137 137
  *
138 138
  *  Note: Socket names vary from vendor to vendor
139 139
  */
140
-#undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are not good with 3DRAG
140
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are not good with 3DRAG
141 141
 #undef SPINDLE_LASER_ENA_PIN
142 142
 #undef SPINDLE_DIR_PIN
143 143
 
@@ -149,14 +149,14 @@
149 149
     #undef Z_DIR_PIN
150 150
     #undef Z_ENABLE_PIN
151 151
     #undef Z_STEP_PIN
152
-    #define Z_DIR_PIN                28
153
-    #define Z_ENABLE_PIN             24
154
-    #define Z_STEP_PIN               26
155
-    #define SPINDLE_LASER_PWM_PIN    46   // Hardware PWM
156
-    #define SPINDLE_LASER_ENA_PIN    62   // Pullup!
157
-    #define SPINDLE_DIR_PIN          48
158
-  #elif !BOTH(ULTRA_LCD, NEWPANEL)     // use expansion header if no LCD in use
159
-    #define SPINDLE_LASER_ENA_PIN    16   // Pullup or pulldown!
160
-    #define SPINDLE_DIR_PIN          17
152
+    #define Z_DIR_PIN                         28
153
+    #define Z_ENABLE_PIN                      24
154
+    #define Z_STEP_PIN                        26
155
+    #define SPINDLE_LASER_PWM_PIN             46  // Hardware PWM
156
+    #define SPINDLE_LASER_ENA_PIN             62  // Pullup!
157
+    #define SPINDLE_DIR_PIN                   48
158
+  #elif !BOTH(ULTRA_LCD, NEWPANEL)                // use expansion header if no LCD in use
159
+    #define SPINDLE_LASER_ENA_PIN             16  // Pullup or pulldown!
160
+    #define SPINDLE_DIR_PIN                   17
161 161
   #endif
162 162
 #endif

+ 16
- 16
Marlin/src/pins/ramps/pins_AZTEEG_X3.h Parādīt failu

@@ -32,15 +32,15 @@
32 32
 #endif
33 33
 
34 34
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
35
-  #define CASE_LIGHT_PIN    6   // Define before RAMPS pins include
35
+  #define CASE_LIGHT_PIN                       6  // Define before RAMPS pins include
36 36
 #endif
37 37
 #define BOARD_INFO_NAME "Azteeg X3"
38 38
 
39 39
 //
40 40
 // Servos
41 41
 //
42
-#define SERVO0_PIN         44   // SERVO1 port
43
-#define SERVO1_PIN         55   // SERVO2 port
42
+#define SERVO0_PIN                            44  // SERVO1 port
43
+#define SERVO1_PIN                            55  // SERVO2 port
44 44
 
45 45
 #include "pins_RAMPS_13.h"
46 46
 
@@ -55,17 +55,17 @@
55 55
   #undef DOGLCD_A0
56 56
   #undef DOGLCD_CS
57 57
   #undef BTN_ENC
58
-  #define DOGLCD_A0         31
59
-  #define DOGLCD_CS         32
60
-  #define BTN_ENC           12
58
+  #define DOGLCD_A0                           31
59
+  #define DOGLCD_CS                           32
60
+  #define BTN_ENC                             12
61 61
 
62
-  #define STAT_LED_RED_PIN  64
63
-  #define STAT_LED_BLUE_PIN 63
62
+  #define STAT_LED_RED_PIN                    64
63
+  #define STAT_LED_BLUE_PIN                   63
64 64
 
65 65
 #else
66 66
 
67
-  #define STAT_LED_RED_PIN   6
68
-  #define STAT_LED_BLUE_PIN 11
67
+  #define STAT_LED_RED_PIN                     6
68
+  #define STAT_LED_BLUE_PIN                   11
69 69
 
70 70
 #endif
71 71
 
@@ -79,18 +79,18 @@
79 79
 //
80 80
 // M3/M4/M5 - Spindle/Laser Control
81 81
 //
82
-#undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
82
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
83 83
 #undef SPINDLE_LASER_ENA_PIN
84 84
 #undef SPINDLE_DIR_PIN
85 85
 
86 86
 #if HAS_CUTTER
87
-  #undef SDA                       // use EXP3 header
87
+  #undef SDA                                      // use EXP3 header
88 88
   #undef SCL
89 89
   #if SERVO0_PIN == 7
90 90
     #undef SERVO0_PIN
91
-    #define SERVO0_PIN     11
91
+    #define SERVO0_PIN                        11
92 92
   #endif
93
-  #define SPINDLE_LASER_PWM_PIN     7   // Hardware PWM
94
-  #define SPINDLE_LASER_ENA_PIN    20   // Pullup!
95
-  #define SPINDLE_DIR_PIN          21
93
+  #define SPINDLE_LASER_PWM_PIN                7  // Hardware PWM
94
+  #define SPINDLE_LASER_ENA_PIN               20  // Pullup!
95
+  #define SPINDLE_DIR_PIN                     21
96 96
 #endif

+ 47
- 47
Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h Parādīt failu

@@ -43,21 +43,21 @@
43 43
 // Tested this pin with bed leveling on a Delta with 1 servo.
44 44
 // Physical wire attachment on EXT1: GND, 5V, D47.
45 45
 //
46
-#define SERVO0_PIN         47
46
+#define SERVO0_PIN                            47
47 47
 
48 48
 //
49 49
 // Limit Switches
50 50
 //
51
-#define X_STOP_PIN          3
52
-#define Y_STOP_PIN         14
53
-#define Z_STOP_PIN         18
51
+#define X_STOP_PIN                             3
52
+#define Y_STOP_PIN                            14
53
+#define Z_STOP_PIN                            18
54 54
 
55 55
 #ifndef FAN_PIN
56
-  #define FAN_PIN           6
56
+  #define FAN_PIN                              6
57 57
 #endif
58 58
 
59 59
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
60
-  #define CASE_LIGHT_PIN   44
60
+  #define CASE_LIGHT_PIN                      44
61 61
 #endif
62 62
 
63 63
 //
@@ -67,100 +67,100 @@
67 67
 
68 68
 // DIGIPOT slave addresses
69 69
 #ifndef DIGIPOT_I2C_ADDRESS_A
70
-  #define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
70
+  #define DIGIPOT_I2C_ADDRESS_A 0x2C              // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
71 71
 #endif
72 72
 #ifndef DIGIPOT_I2C_ADDRESS_B
73
-  #define DIGIPOT_I2C_ADDRESS_B 0x2E   // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
73
+  #define DIGIPOT_I2C_ADDRESS_B 0x2E              // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
74 74
 #endif
75 75
 
76 76
 //
77 77
 // Z Probe (when not Z_MIN_PIN)
78 78
 //
79 79
 #ifndef Z_MIN_PROBE_PIN
80
-  #define Z_MIN_PROBE_PIN  18
80
+  #define Z_MIN_PROBE_PIN                     18
81 81
 #endif
82 82
 
83 83
 //
84 84
 // Steppers
85 85
 //
86
-#define E2_STEP_PIN        23
87
-#define E2_DIR_PIN         25
88
-#define E2_ENABLE_PIN      40
86
+#define E2_STEP_PIN                           23
87
+#define E2_DIR_PIN                            25
88
+#define E2_ENABLE_PIN                         40
89 89
 
90
-#define E3_STEP_PIN        27
91
-#define E3_DIR_PIN         29
92
-#define E3_ENABLE_PIN      41
90
+#define E3_STEP_PIN                           27
91
+#define E3_DIR_PIN                            29
92
+#define E3_ENABLE_PIN                         41
93 93
 
94
-#define E4_STEP_PIN        43
95
-#define E4_DIR_PIN         37
96
-#define E4_ENABLE_PIN      42
94
+#define E4_STEP_PIN                           43
95
+#define E4_DIR_PIN                            37
96
+#define E4_ENABLE_PIN                         42
97 97
 
98 98
 //
99 99
 // Temperature Sensors
100 100
 //
101
-#define TEMP_2_PIN         12   // Analog Input
102
-#define TEMP_3_PIN         11   // Analog Input
103
-#define TEMP_4_PIN         10   // Analog Input
104
-#define TC1                 4   // Analog Input (Thermo couple on Azteeg X3Pro)
105
-#define TC2                 5   // Analog Input (Thermo couple on Azteeg X3Pro)
101
+#define TEMP_2_PIN                            12  // Analog Input
102
+#define TEMP_3_PIN                            11  // Analog Input
103
+#define TEMP_4_PIN                            10  // Analog Input
104
+#define TC1                                    4  // Analog Input (Thermo couple on Azteeg X3Pro)
105
+#define TC2                                    5  // Analog Input (Thermo couple on Azteeg X3Pro)
106 106
 
107 107
 //
108 108
 // Heaters / Fans
109 109
 //
110
-#define HEATER_2_PIN       16
111
-#define HEATER_3_PIN       17
112
-#define HEATER_4_PIN        4
113
-#define HEATER_5_PIN        5
114
-#define HEATER_6_PIN        6
115
-#define HEATER_7_PIN       11
110
+#define HEATER_2_PIN                          16
111
+#define HEATER_3_PIN                          17
112
+#define HEATER_4_PIN                           4
113
+#define HEATER_5_PIN                           5
114
+#define HEATER_6_PIN                           6
115
+#define HEATER_7_PIN                          11
116 116
 
117 117
 #ifndef CONTROLLER_FAN_PIN
118
-  #define CONTROLLER_FAN_PIN 4   // Pin used for the fan to cool motherboard (-1 to disable)
118
+  #define CONTROLLER_FAN_PIN                   4  // Pin used for the fan to cool motherboard (-1 to disable)
119 119
 #endif
120 120
 
121 121
 // Fans/Water Pump to cool the hotend cool side.
122
-#define ORIG_E0_AUTO_FAN_PIN 5
123
-#define ORIG_E1_AUTO_FAN_PIN 5
124
-#define ORIG_E2_AUTO_FAN_PIN 5
125
-#define ORIG_E3_AUTO_FAN_PIN 5
122
+#define ORIG_E0_AUTO_FAN_PIN                   5
123
+#define ORIG_E1_AUTO_FAN_PIN                   5
124
+#define ORIG_E2_AUTO_FAN_PIN                   5
125
+#define ORIG_E3_AUTO_FAN_PIN                   5
126 126
 
127 127
 //
128 128
 // LCD / Controller
129 129
 //
130 130
 #undef BEEPER_PIN
131
-#define BEEPER_PIN         33
131
+#define BEEPER_PIN                            33
132 132
 
133 133
 #if ANY(VIKI2, miniVIKI)
134 134
   #undef SD_DETECT_PIN
135
-  #define SD_DETECT_PIN    49   // For easy adapter board
135
+  #define SD_DETECT_PIN                       49  // For easy adapter board
136 136
   #undef BEEPER_PIN
137
-  #define  BEEPER_PIN      12   // 33 isn't physically available to the LCD display
137
+  #define BEEPER_PIN                          12  // 33 isn't physically available to the LCD display
138 138
 #else
139
-  #define STAT_LED_RED_PIN  32
140
-  #define STAT_LED_BLUE_PIN 35
139
+  #define STAT_LED_RED_PIN                    32
140
+  #define STAT_LED_BLUE_PIN                   35
141 141
 #endif
142 142
 
143 143
 //
144 144
 // Misc. Functions
145 145
 //
146 146
 #if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN
147
-  #undef DOGLCD_A0              // Steal pin 44 for the case light; if you have a Viki2 and have connected it
148
-  #define DOGLCD_A0        57   // following the Panucatt wiring diagram, you may need to tweak these pin assignments
147
+  #undef DOGLCD_A0                                // Steal pin 44 for the case light; if you have a Viki2 and have connected it
148
+  #define DOGLCD_A0                           57  // following the Panucatt wiring diagram, you may need to tweak these pin assignments
149 149
                                 // as the wiring diagram uses pin 44 for DOGLCD_A0
150 150
 #endif
151 151
 
152 152
 //
153 153
 // M3/M4/M5 - Spindle/Laser Control
154 154
 //
155
-#undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
155
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
156 156
 #undef SPINDLE_LASER_ENA_PIN
157 157
 #undef SPINDLE_DIR_PIN
158 158
 
159
-#if HAS_CUTTER   // EXP2 header
159
+#if HAS_CUTTER                                    // EXP2 header
160 160
   #if ANY(VIKI2, miniVIKI)
161
-    #define BTN_EN2        31   // Pin 7 needed for Spindle PWM
161
+    #define BTN_EN2                           31  // Pin 7 needed for Spindle PWM
162 162
   #endif
163
-  #define SPINDLE_LASER_PWM_PIN  7   // Hardware PWM
164
-  #define SPINDLE_LASER_ENA_PIN 20   // Pullup!
165
-  #define SPINDLE_DIR_PIN       21
163
+  #define SPINDLE_LASER_PWM_PIN                7  // Hardware PWM
164
+  #define SPINDLE_LASER_ENA_PIN               20  // Pullup!
165
+  #define SPINDLE_DIR_PIN                     21
166 166
 #endif

+ 5
- 5
Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h Parādīt failu

@@ -34,9 +34,9 @@
34 34
 //
35 35
 // M3/M4/M5 - Spindle/Laser Control
36 36
 //
37
-#define SPINDLE_LASER_ENA_PIN    66   // Pullup or pulldown!
38
-#define SPINDLE_DIR_PIN          67
39
-#define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
37
+#define SPINDLE_LASER_ENA_PIN                66   // Pullup or pulldown!
38
+#define SPINDLE_DIR_PIN                      67
39
+#define SPINDLE_LASER_PWM_PIN                44   // Hardware PWM
40 40
 
41 41
 #include "pins_RAMPS.h"
42 42
 
@@ -45,5 +45,5 @@
45 45
 //
46 46
 #undef TEMP_0_PIN
47 47
 #undef TEMP_1_PIN
48
-#define TEMP_0_PIN          9   // Analog Input
49
-#define TEMP_1_PIN         11   // Analog Input
48
+#define TEMP_0_PIN                            9   // Analog Input
49
+#define TEMP_1_PIN                           11   // Analog Input

+ 23
- 24
Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h Parādīt failu

@@ -34,30 +34,30 @@
34 34
 //
35 35
 // Heaters / Fans
36 36
 //
37
-#define RAMPS_D8_PIN       10
38
-#define RAMPS_D9_PIN       12
39
-#define RAMPS_D10_PIN       9
40
-#define MOSFET_D_PIN        7
37
+#define RAMPS_D8_PIN                          10
38
+#define RAMPS_D9_PIN                          12
39
+#define RAMPS_D10_PIN                          9
40
+#define MOSFET_D_PIN                           7
41 41
 
42 42
 //
43 43
 // Auto fans
44 44
 //
45
-#define ORIG_E0_AUTO_FAN_PIN 11
46
-#define ORIG_E1_AUTO_FAN_PIN  6
47
-#define ORIG_E2_AUTO_FAN_PIN  6
48
-#define ORIG_E3_AUTO_FAN_PIN  6
45
+#define ORIG_E0_AUTO_FAN_PIN                  11
46
+#define ORIG_E1_AUTO_FAN_PIN                   6
47
+#define ORIG_E2_AUTO_FAN_PIN                   6
48
+#define ORIG_E3_AUTO_FAN_PIN                   6
49 49
 
50 50
 //
51 51
 // M3/M4/M5 - Spindle/Laser Control
52 52
 //
53
-#define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
54
-#define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
55
-#define SPINDLE_DIR_PIN          42
53
+#define SPINDLE_LASER_ENA_PIN                 40  // Pullup or pulldown!
54
+#define SPINDLE_LASER_PWM_PIN                 44  // Hardware PWM
55
+#define SPINDLE_DIR_PIN                       42
56 56
 
57 57
 //
58 58
 // Limit Switches
59 59
 //
60
-#define X_MAX_PIN          79   // 2
60
+#define X_MAX_PIN                             79  // 2
61 61
 
62 62
 //
63 63
 // Import RAMPS 1.3 pins
@@ -68,34 +68,33 @@
68 68
 // Z Probe (when not Z_MIN_PIN)
69 69
 //
70 70
 #undef Z_MIN_PROBE_PIN
71
-#define Z_MIN_PROBE_PIN    19   // IND_S_5V
71
+#define Z_MIN_PROBE_PIN                       19  // IND_S_5V
72 72
 
73 73
 #undef Z_ENABLE_PIN
74
-#define Z_ENABLE_PIN       77   // 62
74
+#define Z_ENABLE_PIN                          77  // 62
75 75
 
76 76
 //
77 77
 // Steppers
78 78
 //
79
-#define DIGIPOTSS_PIN      22
79
+#define DIGIPOTSS_PIN                         22
80 80
 #define DIGIPOT_CHANNELS   { 4, 5, 3, 0, 1 }
81 81
 
82 82
 //
83 83
 // Temperature Sensors
84 84
 //
85 85
 #undef TEMP_1_PIN
86
-#define TEMP_1_PIN         14   // Analog Input (15)
86
+#define TEMP_1_PIN                            14  // Analog Input (15)
87 87
 
88 88
 #undef TEMP_BED_PIN
89
-#define TEMP_BED_PIN       15   // Analog Input (14)
89
+#define TEMP_BED_PIN                          15  // Analog Input (14)
90 90
 
91 91
 //
92 92
 // Misc. Functions
93 93
 //
94
-#undef PS_ON_PIN                // 12
95
-#define PS_ON_PIN          81   // External Power Supply
96
-
97
-#define CASE_LIGHT_PIN     44   // Hardware PWM
94
+#undef PS_ON_PIN                                  // 12
95
+#define PS_ON_PIN                             81  // External Power Supply
98 96
 
97
+#define CASE_LIGHT_PIN                        44  // Hardware PWM
99 98
 
100 99
 // This board has headers for Z-min, Z-max and IND_S_5V *but* as the bq team
101 100
 // decided to ship the printer only with the probe and no additional Z-min
@@ -104,8 +103,8 @@
104 103
 #ifdef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
105 104
   #undef Z_MIN_PIN
106 105
   #undef Z_MAX_PIN
107
-  #define Z_MIN_PIN        19   // IND_S_5V
108
-  #define Z_MAX_PIN        18   // Z-MIN Label
106
+  #define Z_MIN_PIN                           19  // IND_S_5V
107
+  #define Z_MAX_PIN                           18  // Z-MIN Label
109 108
 #endif
110 109
 
111 110
 //
@@ -113,5 +112,5 @@
113 112
 //
114 113
 #if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
115 114
   #undef HEATER_BED_PIN
116
-  #define HEATER_BED_PIN    8
115
+  #define HEATER_BED_PIN                       8
117 116
 #endif

+ 35
- 35
Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h Parādīt failu

@@ -34,68 +34,68 @@
34 34
 //
35 35
 // Limit Switches
36 36
 //
37
-#define X_STOP_PIN         54   // PF0 / A0
38
-#define Y_STOP_PIN         24   // PA2 / AD2
39
-#define Z_MIN_PIN          23   // PA1 / AD1
40
-#define Z_MAX_PIN          25   // PA3 / AD3
41
-#define SERVO0_PIN         40   // PG1 / !RD
37
+#define X_STOP_PIN                            54  // PF0 / A0
38
+#define Y_STOP_PIN                            24  // PA2 / AD2
39
+#define Z_MIN_PIN                             23  // PA1 / AD1
40
+#define Z_MAX_PIN                             25  // PA3 / AD3
41
+#define SERVO0_PIN                            40  // PG1 / !RD
42 42
 
43 43
 //
44 44
 // Steppers
45 45
 //
46
-#define X_STEP_PIN         61   // PF7 / A7
47
-#define X_DIR_PIN          62   // PK0 / A8
48
-#define X_ENABLE_PIN       60   // PF6 / A6
46
+#define X_STEP_PIN                            61  // PF7 / A7
47
+#define X_DIR_PIN                             62  // PK0 / A8
48
+#define X_ENABLE_PIN                          60  // PF6 / A6
49 49
 
50
-#define Y_STEP_PIN         64   // PK2 / A10
51
-#define Y_DIR_PIN          65   // PK3 / A11
52
-#define Y_ENABLE_PIN       63   // PK1 / A9
50
+#define Y_STEP_PIN                            64  // PK2 / A10
51
+#define Y_DIR_PIN                             65  // PK3 / A11
52
+#define Y_ENABLE_PIN                          63  // PK1 / A9
53 53
 
54
-#define Z_STEP_PIN         67   // PK5 / A13
55
-#define Z_DIR_PIN          69   // PK7 / A15
56
-#define Z_ENABLE_PIN       66   // PK4 / A12
57
-#define Z_MIN_PROBE_PIN    25   // PA3 / AD3
54
+#define Z_STEP_PIN                            67  // PK5 / A13
55
+#define Z_DIR_PIN                             69  // PK7 / A15
56
+#define Z_ENABLE_PIN                          66  // PK4 / A12
57
+#define Z_MIN_PROBE_PIN                       25  // PA3 / AD3
58 58
 
59
-#define E0_STEP_PIN        58   // PF4 / A4
60
-#define E0_DIR_PIN         59   // PF5 / A5
61
-#define E0_ENABLE_PIN      57   // PF3 / A3
59
+#define E0_STEP_PIN                           58  // PF4 / A4
60
+#define E0_DIR_PIN                            59  // PF5 / A5
61
+#define E0_ENABLE_PIN                         57  // PF3 / A3
62 62
 
63 63
 //
64 64
 // Temperature Sensors
65 65
 //
66
-#define TEMP_0_PIN          1   // PF1 / A1   Analog
67
-#define TEMP_BED_PIN       14   // PK6 / A14  Analog
66
+#define TEMP_0_PIN                             1  // PF1 / A1   Analog
67
+#define TEMP_BED_PIN                          14  // PK6 / A14  Analog
68 68
 
69 69
 //
70 70
 // Heaters / Fans
71 71
 //
72
-#define HEATER_0_PIN        4   // PG5 / PWM4
73
-#define HEATER_BED_PIN      3   // PE5 / PWM3
72
+#define HEATER_0_PIN                           4  // PG5 / PWM4
73
+#define HEATER_BED_PIN                         3  // PE5 / PWM3
74 74
 
75
-#define FAN_PIN             5   // PE3 / PWM5
75
+#define FAN_PIN                                5  // PE3 / PWM5
76 76
 
77 77
 //
78 78
 // Misc. Functions
79 79
 //
80
-#define SDSS               53   // PB0 / SS
81
-#define LED_PIN            13   // PB7 / PWM13
80
+#define SDSS                                  53  // PB0 / SS
81
+#define LED_PIN                               13  // PB7 / PWM13
82 82
 
83
-#define MISO_PIN           50   // PB3
84
-#define MOSI_PIN           51   // PB2
85
-#define SCK_PIN            52   // PB1
83
+#define MISO_PIN                              50  // PB3
84
+#define MOSI_PIN                              51  // PB2
85
+#define SCK_PIN                               52  // PB1
86 86
 
87 87
 //
88 88
 // LCDs and Controllers
89 89
 //
90 90
 #if HAS_SPI_LCD
91 91
   #if ENABLED(ZONESTAR_LCD)
92
-    #define LCD_PINS_RS        2
93
-    #define LCD_PINS_ENABLE   36
94
-    #define LCD_PINS_D4       37
95
-    #define LCD_PINS_D5       34
96
-    #define LCD_PINS_D6       35
97
-    #define LCD_PINS_D7       32
98
-    #define ADC_KEYPAD_PIN    12   // Analog
92
+    #define LCD_PINS_RS                        2
93
+    #define LCD_PINS_ENABLE                   36
94
+    #define LCD_PINS_D4                       37
95
+    #define LCD_PINS_D5                       34
96
+    #define LCD_PINS_D6                       35
97
+    #define LCD_PINS_D7                       32
98
+    #define ADC_KEYPAD_PIN                    12  // Analog
99 99
   #endif
100 100
 #endif
101 101
 

+ 5
- 5
Marlin/src/pins/ramps/pins_FELIX2.h Parādīt failu

@@ -35,29 +35,29 @@
35 35
 // Heaters / Fans
36 36
 //
37 37
 // Power outputs EFBF or EFBE
38
-#define MOSFET_D_PIN        7
38
+#define MOSFET_D_PIN                          7
39 39
 
40 40
 #include "pins_RAMPS.h"
41 41
 
42 42
 //
43 43
 // Misc. Functions
44 44
 //
45
-#define SDPOWER_PIN         1
45
+#define SDPOWER_PIN                           1
46 46
 
47
-#define PS_ON_PIN          12
47
+#define PS_ON_PIN                            12
48 48
 
49 49
 //
50 50
 // LCD / Controller
51 51
 //
52 52
 #if BOTH(ULTRA_LCD, NEWPANEL)
53 53
 
54
-  #define SD_DETECT_PIN     6
54
+  #define SD_DETECT_PIN                       6
55 55
 
56 56
 #endif // NEWPANEL && ULTRA_LCD
57 57
 
58 58
 //
59 59
 // M3/M4/M5 - Spindle/Laser Control
60 60
 //
61
-#undef SPINDLE_LASER_PWM_PIN     // Definitions in pins_RAMPS.h are not valid with this board
61
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are not valid with this board
62 62
 #undef SPINDLE_LASER_ENA_PIN
63 63
 #undef SPINDLE_DIR_PIN

+ 62
- 62
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h Parādīt failu

@@ -41,83 +41,83 @@
41 41
 //
42 42
 // Servos
43 43
 //
44
-#define SERVO0_PIN         11
45
-#define SERVO1_PIN          6
46
-#define SERVO2_PIN          5
44
+#define SERVO0_PIN                            11
45
+#define SERVO1_PIN                             6
46
+#define SERVO2_PIN                             5
47 47
 
48 48
 //
49 49
 // Limit Switches
50 50
 //
51
-#define X_MIN_PIN           3
51
+#define X_MIN_PIN                              3
52 52
 #ifndef X_MAX_PIN
53
-  #define X_MAX_PIN         2
53
+  #define X_MAX_PIN                            2
54 54
 #endif
55
-#define Y_MIN_PIN          14
56
-#define Y_MAX_PIN          15
57
-#define Z_MIN_PIN          18
58
-#define Z_MAX_PIN          19
55
+#define Y_MIN_PIN                             14
56
+#define Y_MAX_PIN                             15
57
+#define Z_MIN_PIN                             18
58
+#define Z_MAX_PIN                             19
59 59
 
60 60
 //
61 61
 // Z Probe (when not Z_MIN_PIN)
62 62
 //
63 63
 #ifndef Z_MIN_PROBE_PIN
64
-  #define Z_MIN_PROBE_PIN  32
64
+  #define Z_MIN_PROBE_PIN                     32
65 65
 #endif
66 66
 
67 67
 //
68 68
 // Steppers
69 69
 //
70
-#define X_STEP_PIN         54
71
-#define X_DIR_PIN          55
72
-#define X_ENABLE_PIN       38
70
+#define X_STEP_PIN                            54
71
+#define X_DIR_PIN                             55
72
+#define X_ENABLE_PIN                          38
73 73
 #ifndef X_CS_PIN
74
-  #define X_CS_PIN         53
74
+  #define X_CS_PIN                            53
75 75
 #endif
76 76
 
77
-#define Y_STEP_PIN         60
78
-#define Y_DIR_PIN          61
79
-#define Y_ENABLE_PIN       56
77
+#define Y_STEP_PIN                            60
78
+#define Y_DIR_PIN                             61
79
+#define Y_ENABLE_PIN                          56
80 80
 #ifndef Y_CS_PIN
81
-  #define Y_CS_PIN         49
81
+  #define Y_CS_PIN                            49
82 82
 #endif
83 83
 
84
-#define Z_STEP_PIN         46
85
-#define Z_DIR_PIN          48
86
-#define Z_ENABLE_PIN       62
84
+#define Z_STEP_PIN                            46
85
+#define Z_DIR_PIN                             48
86
+#define Z_ENABLE_PIN                          62
87 87
 #ifndef Z_CS_PIN
88
-  #define Z_CS_PIN         40
88
+  #define Z_CS_PIN                            40
89 89
 #endif
90 90
 
91
-#define E0_STEP_PIN        26
92
-#define E0_DIR_PIN         28
93
-#define E0_ENABLE_PIN      24
91
+#define E0_STEP_PIN                           26
92
+#define E0_DIR_PIN                            28
93
+#define E0_ENABLE_PIN                         24
94 94
 #ifndef E0_CS_PIN
95
-  #define E0_CS_PIN        42
95
+  #define E0_CS_PIN                           42
96 96
 #endif
97 97
 
98
-#define E1_STEP_PIN        36
99
-#define E1_DIR_PIN         34
100
-#define E1_ENABLE_PIN      30
98
+#define E1_STEP_PIN                           36
99
+#define E1_DIR_PIN                            34
100
+#define E1_ENABLE_PIN                         30
101 101
 #ifndef E1_CS_PIN
102
-  #define E1_CS_PIN        44
102
+  #define E1_CS_PIN                           44
103 103
 #endif
104 104
 
105
-#define E2_STEP_PIN        42
106
-#define E2_DIR_PIN         43
107
-#define E2_ENABLE_PIN      44
105
+#define E2_STEP_PIN                           42
106
+#define E2_DIR_PIN                            43
107
+#define E2_ENABLE_PIN                         44
108 108
 
109 109
 //
110 110
 // Temperature Sensors
111 111
 //
112
-#define TEMP_0_PIN         13   // Analog Input
113
-#define TEMP_1_PIN         15   // Analog Input
114
-#define TEMP_BED_PIN       14   // Analog Input
112
+#define TEMP_0_PIN                            13  // Analog Input
113
+#define TEMP_1_PIN                            15  // Analog Input
114
+#define TEMP_BED_PIN                          14  // Analog Input
115 115
 
116 116
 // SPI for Max6675 or Max31855 Thermocouple
117 117
 #if DISABLED(SDSUPPORT)
118
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
118
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
119 119
 #else
120
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
120
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
121 121
 #endif
122 122
 
123 123
 //
@@ -140,39 +140,39 @@
140 140
 //
141 141
 // Heaters / Fans
142 142
 //
143
-#define HEATER_0_PIN       10
144
-#define HEATER_1_PIN        7
145
-#define HEATER_BED_PIN      8
143
+#define HEATER_0_PIN                          10
144
+#define HEATER_1_PIN                           7
145
+#define HEATER_BED_PIN                         8
146 146
 
147 147
 #ifndef FAN_PIN
148
-  #define FAN_PIN           9
148
+  #define FAN_PIN                              9
149 149
 #endif
150 150
 
151 151
 #ifndef FIL_RUNOUT_PIN
152
-  #define FIL_RUNOUT_PIN   57
152
+  #define FIL_RUNOUT_PIN                      57
153 153
 #endif
154 154
 
155 155
 #if !HAS_FILAMENT_SENSOR
156
-  #define FAN1_PIN          4
156
+  #define FAN1_PIN                             4
157 157
 #endif
158 158
 
159 159
 //
160 160
 // Misc. Functions
161 161
 //
162 162
 #ifndef SDSS
163
-  #define SDSS             53
163
+  #define SDSS                                53
164 164
 #endif
165
-#define LED_PIN            13
166
-#define LED4_PIN            5
165
+#define LED_PIN                               13
166
+#define LED4_PIN                               5
167 167
 
168 168
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
169
-#define FILWIDTH_PIN        5   // Analog Input
169
+#define FILWIDTH_PIN                           5  // Analog Input
170 170
 
171 171
 #ifndef PS_ON_PIN
172
-  #define PS_ON_PIN        12
172
+  #define PS_ON_PIN                           12
173 173
 #endif
174 174
 
175
-#define CASE_LIGHT_PIN      5
175
+#define CASE_LIGHT_PIN                         5
176 176
 
177 177
 //
178 178
 // LCD / Controller
@@ -180,16 +180,16 @@
180 180
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
181 181
 //
182 182
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
183
-  #define BEEPER_PIN       37
184
-  #define BTN_EN1          31
185
-  #define BTN_EN2          33
186
-  #define BTN_ENC          35
187
-  #define SD_DETECT_PIN    49
188
-  #define KILL_PIN         41
189
-  #define LCD_PINS_RS      16
190
-  #define LCD_PINS_ENABLE  17
191
-  #define LCD_PINS_D4      23
192
-  #define LCD_PINS_D5      25
193
-  #define LCD_PINS_D6      27
194
-  #define LCD_PINS_D7      29
183
+  #define BEEPER_PIN                          37
184
+  #define BTN_EN1                             31
185
+  #define BTN_EN2                             33
186
+  #define BTN_ENC                             35
187
+  #define SD_DETECT_PIN                       49
188
+  #define KILL_PIN                            41
189
+  #define LCD_PINS_RS                         16
190
+  #define LCD_PINS_ENABLE                     17
191
+  #define LCD_PINS_D4                         23
192
+  #define LCD_PINS_D5                         25
193
+  #define LCD_PINS_D6                         27
194
+  #define LCD_PINS_D7                         29
195 195
 #endif

+ 14
- 14
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h Parādīt failu

@@ -28,10 +28,10 @@
28 28
 #define BOARD_INFO_NAME      "Formbot Raptor2"
29 29
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
30 30
 
31
-#define FAN_PIN             6
31
+#define FAN_PIN                                6
32 32
 
33 33
 #ifndef FIL_RUNOUT_PIN
34
-  #define FIL_RUNOUT_PIN   22
34
+  #define FIL_RUNOUT_PIN                      22
35 35
 #endif
36 36
 
37 37
 #include "pins_FORMBOT_RAPTOR.h"
@@ -42,22 +42,22 @@
42 42
 // M3/M4/M5 - Spindle/Laser Control
43 43
 //
44 44
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
45
-  #if !NUM_SERVOS                       // Try to use servo connector first
46
-    #define SPINDLE_LASER_ENA_PIN     6 // Pullup or pulldown!
47
-    #define SPINDLE_LASER_PWM_PIN     4 // Hardware PWM
48
-    #define SPINDLE_DIR_PIN           5
49
-  #elif !GREEDY_PANEL                   // Try to use AUX2
50
-    #define SPINDLE_LASER_ENA_PIN     4 // Pullup or pulldown!
51
-    #define SPINDLE_LASER_PWM_PIN    44 // Hardware PWM
52
-    #define SPINDLE_DIR_PIN          65
45
+  #if !NUM_SERVOS                                 // Try to use servo connector first
46
+    #define SPINDLE_LASER_ENA_PIN              6  // Pullup or pulldown!
47
+    #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM
48
+    #define SPINDLE_DIR_PIN                    5
49
+  #elif !GREEDY_PANEL                             // Try to use AUX2
50
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
51
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
52
+    #define SPINDLE_DIR_PIN                   65
53 53
   #endif
54 54
 #endif
55 55
 
56 56
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
57
-  #if NUM_SERVOS <= 1                   // Try to use servo connector first
58
-    #define CASE_LIGHT_PIN  6           // Hardware PWM
59
-  #elif !GREEDY_PANEL                   // Try to use AUX2
60
-    #define CASE_LIGHT_PIN 44           // Hardware PWM
57
+  #if NUM_SERVOS <= 1                             // Try to use servo connector first
58
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
59
+  #elif !GREEDY_PANEL                             // Try to use AUX2
60
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
61 61
   #endif
62 62
 #endif
63 63
 

+ 63
- 63
Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h Parādīt failu

@@ -37,84 +37,84 @@
37 37
 //
38 38
 // Servos
39 39
 //
40
-#define SERVO0_PIN         11
41
-#define SERVO1_PIN         -1    // was 6
42
-#define SERVO2_PIN         -1    // was 5
43
-#define SERVO3_PIN         -1
40
+#define SERVO0_PIN                            11
41
+#define SERVO1_PIN                            -1  // was 6
42
+#define SERVO2_PIN                            -1  // was 5
43
+#define SERVO3_PIN                            -1
44 44
 
45 45
 //
46 46
 // Limit Switches
47 47
 //
48
-#define X_MIN_PIN           3
48
+#define X_MIN_PIN                              3
49 49
 #ifndef X_MAX_PIN
50
-  #define X_MAX_PIN         2
50
+  #define X_MAX_PIN                            2
51 51
 #endif
52
-#define Y_MIN_PIN          14
53
-#define Y_MAX_PIN          15
54
-#define Z_MIN_PIN          18
55
-#define Z_MAX_PIN          19
52
+#define Y_MIN_PIN                             14
53
+#define Y_MAX_PIN                             15
54
+#define Z_MIN_PIN                             18
55
+#define Z_MAX_PIN                             19
56 56
 
57 57
 //
58 58
 // Z Probe (when not Z_MIN_PIN)
59 59
 //
60 60
 #ifndef Z_MIN_PROBE_PIN
61
-  #define Z_MIN_PROBE_PIN  32
61
+  #define Z_MIN_PROBE_PIN                     32
62 62
 #endif
63 63
 
64 64
 //
65 65
 // Steppers
66 66
 //
67
-#define X_STEP_PIN         54
68
-#define X_DIR_PIN          55
69
-#define X_ENABLE_PIN       38
67
+#define X_STEP_PIN                            54
68
+#define X_DIR_PIN                             55
69
+#define X_ENABLE_PIN                          38
70 70
 #ifndef X_CS_PIN
71
-  #define X_CS_PIN         53
71
+  #define X_CS_PIN                            53
72 72
 #endif
73 73
 
74
-#define Y_STEP_PIN         60
75
-#define Y_DIR_PIN          61
76
-#define Y_ENABLE_PIN       56
74
+#define Y_STEP_PIN                            60
75
+#define Y_DIR_PIN                             61
76
+#define Y_ENABLE_PIN                          56
77 77
 #ifndef Y_CS_PIN
78
-  #define Y_CS_PIN         49
78
+  #define Y_CS_PIN                            49
79 79
 #endif
80 80
 
81
-#define Z_STEP_PIN         46
82
-#define Z_DIR_PIN          48
83
-#define Z_ENABLE_PIN       62
81
+#define Z_STEP_PIN                            46
82
+#define Z_DIR_PIN                             48
83
+#define Z_ENABLE_PIN                          62
84 84
 #ifndef Z_CS_PIN
85
-  #define Z_CS_PIN         40
85
+  #define Z_CS_PIN                            40
86 86
 #endif
87 87
 
88
-#define E0_STEP_PIN        26
89
-#define E0_DIR_PIN         28
90
-#define E0_ENABLE_PIN      24
88
+#define E0_STEP_PIN                           26
89
+#define E0_DIR_PIN                            28
90
+#define E0_ENABLE_PIN                         24
91 91
 #ifndef E0_CS_PIN
92
-  #define E0_CS_PIN        42
92
+  #define E0_CS_PIN                           42
93 93
 #endif
94 94
 
95
-#define E1_STEP_PIN        36
96
-#define E1_DIR_PIN         34
97
-#define E1_ENABLE_PIN      30
95
+#define E1_STEP_PIN                           36
96
+#define E1_DIR_PIN                            34
97
+#define E1_ENABLE_PIN                         30
98 98
 #ifndef E1_CS_PIN
99
-  #define E1_CS_PIN        44
99
+  #define E1_CS_PIN                           44
100 100
 #endif
101 101
 
102
-#define E2_STEP_PIN        42
103
-#define E2_DIR_PIN         43
104
-#define E2_ENABLE_PIN      44
102
+#define E2_STEP_PIN                           42
103
+#define E2_DIR_PIN                            43
104
+#define E2_ENABLE_PIN                         44
105 105
 
106 106
 //
107 107
 // Temperature Sensors
108 108
 //
109
-#define TEMP_0_PIN         13   // Analog Input
110
-#define TEMP_1_PIN         15   // Analog Input
111
-#define TEMP_BED_PIN        3   // Analog Input
109
+#define TEMP_0_PIN                            13  // Analog Input
110
+#define TEMP_1_PIN                            15  // Analog Input
111
+#define TEMP_BED_PIN                           3  // Analog Input
112 112
 
113 113
 // SPI for Max6675 or Max31855 Thermocouple
114 114
 #if DISABLED(SDSUPPORT)
115
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
115
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
116 116
 #else
117
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
117
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
118 118
 #endif
119 119
 
120 120
 //
@@ -137,36 +137,36 @@
137 137
 //
138 138
 // Heaters / Fans
139 139
 //
140
-#define HEATER_0_PIN       10
141
-#define HEATER_1_PIN        7
142
-#define HEATER_BED_PIN     58
140
+#define HEATER_0_PIN                          10
141
+#define HEATER_1_PIN                           7
142
+#define HEATER_BED_PIN                        58
143 143
 
144
-#define FAN_PIN             9
144
+#define FAN_PIN                                9
145 145
 
146 146
 #if HAS_FILAMENT_SENSOR
147
-  #define FIL_RUNOUT_PIN    4
148
-  //#define FIL_RUNOUT2_PIN  -1
147
+  #define FIL_RUNOUT_PIN                       4
148
+  //#define FIL_RUNOUT2_PIN                   -1
149 149
 #else
150 150
   // Though defined as a fan pin, it is utilized as a dedicated laser pin by Formbot.
151
-  #define FAN1_PIN          4
151
+  #define FAN1_PIN                             4
152 152
 #endif
153 153
 
154 154
 //
155 155
 // Misc. Functions
156 156
 //
157
-#define SDSS               53
157
+#define SDSS                                  53
158 158
 #ifndef LED_PIN
159
-  #define LED_PIN          13   // The Formbot v 1 board has almost no unassigned pins on it.  The Board's LED
159
+  #define LED_PIN                             13  // The Formbot v 1 board has almost no unassigned pins on it.  The Board's LED
160 160
 #endif                          // is a good place to get a signal to control the Max7219 LED Matrix.
161 161
 
162 162
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
163
-#define FILWIDTH_PIN        5   // Analog Input
163
+#define FILWIDTH_PIN                           5  // Analog Input
164 164
 
165 165
 #ifndef PS_ON_PIN
166
-  #define PS_ON_PIN        12
166
+  #define PS_ON_PIN                           12
167 167
 #endif
168 168
 
169
-#define CASE_LIGHT_PIN      8
169
+#define CASE_LIGHT_PIN                         8
170 170
 
171 171
 //
172 172
 // LCD / Controller
@@ -175,22 +175,22 @@
175 175
 //
176 176
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
177 177
   #ifndef BEEPER_PIN
178
-    #define BEEPER_PIN     37
178
+    #define BEEPER_PIN                        37
179 179
   #endif
180
-  #define BTN_EN1          31
181
-  #define BTN_EN2          33
182
-  #define BTN_ENC          35
183
-  #define SD_DETECT_PIN    49
180
+  #define BTN_EN1                             31
181
+  #define BTN_EN2                             33
182
+  #define BTN_ENC                             35
183
+  #define SD_DETECT_PIN                       49
184 184
 
185 185
   // Allow MAX7219 to steal the KILL pin
186 186
   #if !defined(KILL_PIN) && MAX7219_CLK_PIN != 41 && MAX7219_DIN_PIN != 41 && MAX7219_LOAD_PIN != 41
187
-    #define KILL_PIN       41
187
+    #define KILL_PIN                          41
188 188
   #endif
189 189
 
190
-  #define LCD_PINS_RS      16
191
-  #define LCD_PINS_ENABLE  17
192
-  #define LCD_PINS_D4      23
193
-  #define LCD_PINS_D5      25
194
-  #define LCD_PINS_D6      27
195
-  #define LCD_PINS_D7      29
190
+  #define LCD_PINS_RS                         16
191
+  #define LCD_PINS_ENABLE                     17
192
+  #define LCD_PINS_D4                         23
193
+  #define LCD_PINS_D5                         25
194
+  #define LCD_PINS_D6                         27
195
+  #define LCD_PINS_D7                         29
196 196
 #endif

+ 65
- 67
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h Parādīt failu

@@ -37,116 +37,114 @@
37 37
 //
38 38
 // Servos
39 39
 //
40
-#define SERVO0_PIN         11
41
-#define SERVO1_PIN         -1    // was 6
42
-#define SERVO2_PIN         -1
43
-#define SERVO3_PIN         -1
40
+#define SERVO0_PIN                            11
41
+#define SERVO1_PIN                            -1  // was 6
42
+#define SERVO2_PIN                            -1
43
+#define SERVO3_PIN                            -1
44 44
 
45 45
 //
46 46
 // Limit Switches
47 47
 //
48
-#define X_MIN_PIN           3
48
+#define X_MIN_PIN                              3
49 49
 #ifndef X_MAX_PIN
50
-  #define X_MAX_PIN         2
50
+  #define X_MAX_PIN                            2
51 51
 #endif
52
-#define Y_MIN_PIN          14
53
-#define Y_MAX_PIN          15
54
-#define Z_MIN_PIN          18
55
-#define Z_MAX_PIN          19
52
+#define Y_MIN_PIN                             14
53
+#define Y_MAX_PIN                             15
54
+#define Z_MIN_PIN                             18
55
+#define Z_MAX_PIN                             19
56 56
 
57 57
 //
58 58
 // Z Probe (when not Z_MIN_PIN)
59 59
 //
60 60
 #ifndef Z_MIN_PROBE_PIN
61
-  #define Z_MIN_PROBE_PIN  32
61
+  #define Z_MIN_PROBE_PIN                     32
62 62
 #endif
63 63
 
64 64
 //
65 65
 // Steppers
66 66
 //
67
-#define X_STEP_PIN         54
68
-#define X_DIR_PIN          55
69
-#define X_ENABLE_PIN       38
67
+#define X_STEP_PIN                            54
68
+#define X_DIR_PIN                             55
69
+#define X_ENABLE_PIN                          38
70 70
 #ifndef X_CS_PIN
71
-  #define X_CS_PIN         53
71
+  #define X_CS_PIN                            53
72 72
 #endif
73 73
 
74
-#define Y_STEP_PIN         60
75
-#define Y_DIR_PIN          61
76
-#define Y_ENABLE_PIN       56
74
+#define Y_STEP_PIN                            60
75
+#define Y_DIR_PIN                             61
76
+#define Y_ENABLE_PIN                          56
77 77
 #ifndef Y_CS_PIN
78
-  #define Y_CS_PIN         49
78
+  #define Y_CS_PIN                            49
79 79
 #endif
80 80
 
81
-#define Z_STEP_PIN         46
82
-#define Z_DIR_PIN          48
83
-#define Z_ENABLE_PIN       62
81
+#define Z_STEP_PIN                            46
82
+#define Z_DIR_PIN                             48
83
+#define Z_ENABLE_PIN                          62
84 84
 #ifndef Z_CS_PIN
85
-  #define Z_CS_PIN         40
85
+  #define Z_CS_PIN                            40
86 86
 #endif
87 87
 
88
-#define E0_STEP_PIN        26
89
-#define E0_DIR_PIN         28
90
-#define E0_ENABLE_PIN      24
88
+#define E0_STEP_PIN                           26
89
+#define E0_DIR_PIN                            28
90
+#define E0_ENABLE_PIN                         24
91 91
 #ifndef E0_CS_PIN
92
-  #define E0_CS_PIN        42
92
+  #define E0_CS_PIN                           42
93 93
 #endif
94 94
 
95
-#define E1_STEP_PIN        36
96
-#define E1_DIR_PIN         34
97
-#define E1_ENABLE_PIN      30
95
+#define E1_STEP_PIN                           36
96
+#define E1_DIR_PIN                            34
97
+#define E1_ENABLE_PIN                         30
98 98
 #ifndef E1_CS_PIN
99
-  #define E1_CS_PIN        44
99
+  #define E1_CS_PIN                           44
100 100
 #endif
101 101
 
102
-#define E2_STEP_PIN        42
103
-#define E2_DIR_PIN         43
104
-#define E2_ENABLE_PIN      44
102
+#define E2_STEP_PIN                           42
103
+#define E2_DIR_PIN                            43
104
+#define E2_ENABLE_PIN                         44
105 105
 
106 106
 //
107 107
 // Temperature Sensors
108 108
 //
109
-#define TEMP_0_PIN         13   // Analog Input
110
-#define TEMP_1_PIN         15   // Analog Input
111
-#define TEMP_BED_PIN       14   // Analog Input
109
+#define TEMP_0_PIN                            13  // Analog Input
110
+#define TEMP_1_PIN                            15  // Analog Input
111
+#define TEMP_BED_PIN                          14  // Analog Input
112 112
 
113 113
 // SPI for Max6675 or Max31855 Thermocouple
114 114
 #if DISABLED(SDSUPPORT)
115
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
115
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
116 116
 #else
117
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
117
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
118 118
 #endif
119 119
 
120
-
121
-
122 120
 //
123 121
 // Heaters / Fans
124 122
 //
125
-#define HEATER_0_PIN       10
126
-#define HEATER_1_PIN        7
127
-#define HEATER_BED_PIN      8
123
+#define HEATER_0_PIN                          10
124
+#define HEATER_1_PIN                           7
125
+#define HEATER_BED_PIN                         8
128 126
 
129
-#define FAN_PIN             9
130
-#define FAN1_PIN           12
127
+#define FAN_PIN                                9
128
+#define FAN1_PIN                              12
131 129
 
132
-#define NUM_RUNOUT_SENSORS  2
133
-#define FIL_RUNOUT_PIN     22
134
-#define FIL_RUNOUT2_PIN    21
130
+#define NUM_RUNOUT_SENSORS                     2
131
+#define FIL_RUNOUT_PIN                        22
132
+#define FIL_RUNOUT2_PIN                       21
135 133
 
136 134
 //
137 135
 // Misc. Functions
138 136
 //
139
-#define CASE_LIGHT_PIN      5
140
-#define SDSS               53
137
+#define CASE_LIGHT_PIN                         5
138
+#define SDSS                                  53
141 139
 #ifndef LED_PIN
142
-  #define LED_PIN          13
140
+  #define LED_PIN                             13
143 141
 #endif
144 142
 
145
-#define SPINDLE_LASER_PWM_PIN    -1   // Hardware PWM
146
-#define SPINDLE_LASER_ENA_PIN     4   // Pullup!
143
+#define SPINDLE_LASER_PWM_PIN                 -1  // Hardware PWM
144
+#define SPINDLE_LASER_ENA_PIN                  4  // Pullup!
147 145
 
148 146
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
149
-#define FILWIDTH_PIN        5   // Analog Input
147
+#define FILWIDTH_PIN                           5  // Analog Input
150 148
 
151 149
 //
152 150
 // LCD / Controller
@@ -154,20 +152,20 @@
154 152
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
155 153
 //
156 154
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
157
-  #define LCD_PINS_RS      16
158
-  #define LCD_PINS_ENABLE  17
159
-  #define LCD_PINS_D4      23
160
-  #define LCD_PINS_D5      25
161
-  #define LCD_PINS_D6      27
162
-  #define LCD_PINS_D7      29
163
-  #define BTN_EN1          31
164
-  #define BTN_EN2          33
165
-  #define BTN_ENC          35
166
-  #define SD_DETECT_PIN    49
155
+  #define LCD_PINS_RS                         16
156
+  #define LCD_PINS_ENABLE                     17
157
+  #define LCD_PINS_D4                         23
158
+  #define LCD_PINS_D5                         25
159
+  #define LCD_PINS_D6                         27
160
+  #define LCD_PINS_D7                         29
161
+  #define BTN_EN1                             31
162
+  #define BTN_EN2                             33
163
+  #define BTN_ENC                             35
164
+  #define SD_DETECT_PIN                       49
167 165
   #ifndef KILL_PIN
168
-    #define KILL_PIN       41
166
+    #define KILL_PIN                          41
169 167
   #endif
170 168
   #ifndef BEEPER_PIN
171
-    #define BEEPER_PIN     37
169
+    #define BEEPER_PIN                        37
172 170
   #endif
173 171
 #endif

+ 92
- 92
Marlin/src/pins/ramps/pins_FYSETC_F6_13.h Parādīt failu

@@ -33,83 +33,83 @@
33 33
   #define BOARD_INFO_NAME "FYSETC F6 1.3"
34 34
 #endif
35 35
 
36
-#define RESET_PIN          30
37
-#define SPI_FLASH_CS       83
36
+#define RESET_PIN                             30
37
+#define SPI_FLASH_CS                          83
38 38
 
39 39
 //
40 40
 // Servos
41 41
 //
42
-#define SERVO0_PIN         13
43
-#define SERVO1_PIN         11    // (PS_ON_PIN)
44
-#define SERVO2_PIN         10    // (FIL_RUNOUT_PIN)
45
-#define SERVO3_PIN          4    // (RGB_LED_G_PIN)
42
+#define SERVO0_PIN                            13
43
+#define SERVO1_PIN                            11  // (PS_ON_PIN)
44
+#define SERVO2_PIN                            10  // (FIL_RUNOUT_PIN)
45
+#define SERVO3_PIN                             4  // (RGB_LED_G_PIN)
46 46
 
47 47
 //
48 48
 // Limit Switches
49 49
 //
50
-#define X_MIN_PIN          63
51
-#define X_MAX_PIN          64
52
-#define Y_MIN_PIN          14
53
-#define Y_MAX_PIN          15
54
-#define Z_MIN_PIN          12
50
+#define X_MIN_PIN                             63
51
+#define X_MAX_PIN                             64
52
+#define Y_MIN_PIN                             14
53
+#define Y_MAX_PIN                             15
54
+#define Z_MIN_PIN                             12
55 55
 #ifndef Z_MAX_PIN
56
-  #define Z_MAX_PIN         9
56
+  #define Z_MAX_PIN                            9
57 57
 #endif
58 58
 
59 59
 #ifndef FIL_RUNOUT_PIN
60
-  #define FIL_RUNOUT_PIN   SERVO2_PIN
60
+  #define FIL_RUNOUT_PIN              SERVO2_PIN
61 61
 #endif
62 62
 
63 63
 //
64 64
 // Z Probe (when not Z_MIN_PIN)
65 65
 //
66 66
 #ifndef Z_MIN_PROBE_PIN
67
-  #define Z_MIN_PROBE_PIN   9   // Servos pin
67
+  #define Z_MIN_PROBE_PIN                      9  // Servos pin
68 68
 #endif
69 69
 
70 70
 //
71 71
 // Steppers
72 72
 //
73
-#define X_STEP_PIN         54
74
-#define X_DIR_PIN          55
75
-#define X_ENABLE_PIN       38
73
+#define X_STEP_PIN                            54
74
+#define X_DIR_PIN                             55
75
+#define X_ENABLE_PIN                          38
76 76
 #ifndef X_CS_PIN
77
-  #define X_CS_PIN         70
77
+  #define X_CS_PIN                            70
78 78
 #endif
79 79
 
80
-#define Y_STEP_PIN         60
81
-#define Y_DIR_PIN          61
82
-#define Y_ENABLE_PIN       56
80
+#define Y_STEP_PIN                            60
81
+#define Y_DIR_PIN                             61
82
+#define Y_ENABLE_PIN                          56
83 83
 #ifndef Y_CS_PIN
84
-  #define Y_CS_PIN         39
84
+  #define Y_CS_PIN                            39
85 85
 #endif
86 86
 
87
-#define Z_STEP_PIN         43
88
-#define Z_DIR_PIN          48
89
-#define Z_ENABLE_PIN       58
87
+#define Z_STEP_PIN                            43
88
+#define Z_DIR_PIN                             48
89
+#define Z_ENABLE_PIN                          58
90 90
 #ifndef Z_CS_PIN
91
-  #define Z_CS_PIN         74
91
+  #define Z_CS_PIN                            74
92 92
 #endif
93 93
 
94
-#define E0_STEP_PIN        26
95
-#define E0_DIR_PIN         28
96
-#define E0_ENABLE_PIN      24
94
+#define E0_STEP_PIN                           26
95
+#define E0_DIR_PIN                            28
96
+#define E0_ENABLE_PIN                         24
97 97
 #ifndef E0_CS_PIN
98
-  #define E0_CS_PIN        47
98
+  #define E0_CS_PIN                           47
99 99
 #endif
100 100
 
101
-#define E1_STEP_PIN        36
102
-#define E1_DIR_PIN         34
103
-#define E1_ENABLE_PIN      30
101
+#define E1_STEP_PIN                           36
102
+#define E1_DIR_PIN                            34
103
+#define E1_ENABLE_PIN                         30
104 104
 #ifndef E1_CS_PIN
105
-  #define E1_CS_PIN        32
105
+  #define E1_CS_PIN                           32
106 106
 #endif
107 107
 
108
-#define E2_STEP_PIN        59
109
-#define E2_DIR_PIN         57
110
-#define E2_ENABLE_PIN      40
108
+#define E2_STEP_PIN                           59
109
+#define E2_DIR_PIN                            57
110
+#define E2_ENABLE_PIN                         40
111 111
 #ifndef E2_CS_PIN
112
-  #define E2_CS_PIN        42
112
+  #define E2_CS_PIN                           42
113 113
 #endif
114 114
 
115 115
 //
@@ -125,76 +125,76 @@
125 125
    * At the moment, F6 rx pins are not pc interrupt pins
126 126
    */
127 127
   #ifndef X_SERIAL_RX_PIN
128
-    #define X_SERIAL_RX_PIN  -1   // 71
128
+    #define X_SERIAL_RX_PIN                   -1  // 71
129 129
   #endif
130 130
   #ifndef X_SERIAL_TX_PIN
131
-    #define X_SERIAL_TX_PIN  72
131
+    #define X_SERIAL_TX_PIN                   72
132 132
   #endif
133 133
   #ifndef Y_SERIAL_RX_PIN
134
-    #define Y_SERIAL_RX_PIN  -1   // 73
134
+    #define Y_SERIAL_RX_PIN                   -1  // 73
135 135
   #endif
136 136
   #ifndef Y_SERIAL_TX_PIN
137
-    #define Y_SERIAL_TX_PIN  75
137
+    #define Y_SERIAL_TX_PIN                   75
138 138
   #endif
139 139
   #ifndef Z_SERIAL_RX_PIN
140
-    #define Z_SERIAL_RX_PIN  -1   // 78
140
+    #define Z_SERIAL_RX_PIN                   -1  // 78
141 141
   #endif
142 142
   #ifndef Z_SERIAL_TX_PIN
143
-    #define Z_SERIAL_TX_PIN  79
143
+    #define Z_SERIAL_TX_PIN                   79
144 144
   #endif
145 145
   #ifndef E0_SERIAL_RX_PIN
146
-    #define E0_SERIAL_RX_PIN -1   // 76
146
+    #define E0_SERIAL_RX_PIN                  -1  // 76
147 147
   #endif
148 148
   #ifndef E0_SERIAL_TX_PIN
149
-    #define E0_SERIAL_TX_PIN 77
149
+    #define E0_SERIAL_TX_PIN                  77
150 150
   #endif
151 151
   #ifndef E1_SERIAL_RX_PIN
152
-    #define E1_SERIAL_RX_PIN -1   // 80
152
+    #define E1_SERIAL_RX_PIN                  -1  // 80
153 153
   #endif
154 154
   #ifndef E1_SERIAL_TX_PIN
155
-    #define E1_SERIAL_TX_PIN 81
155
+    #define E1_SERIAL_TX_PIN                  81
156 156
   #endif
157 157
   #ifndef E2_SERIAL_RX_PIN
158
-    #define E2_SERIAL_RX_PIN -1   // 22
158
+    #define E2_SERIAL_RX_PIN                  -1  // 22
159 159
   #endif
160 160
   #ifndef E2_SERIAL_TX_PIN
161
-    #define E2_SERIAL_TX_PIN 82
161
+    #define E2_SERIAL_TX_PIN                  82
162 162
   #endif
163 163
 #endif
164 164
 
165 165
 //
166 166
 // Temperature Sensors
167 167
 //
168
-#define TEMP_0_PIN         12   // Analog Input
169
-#define TEMP_1_PIN         13   // Analog Input
170
-#define TEMP_2_PIN         14   // Analog Input
171
-#define TEMP_BED_PIN       15   // Analog Input
168
+#define TEMP_0_PIN                            12  // Analog Input
169
+#define TEMP_1_PIN                            13  // Analog Input
170
+#define TEMP_2_PIN                            14  // Analog Input
171
+#define TEMP_BED_PIN                          15  // Analog Input
172 172
 
173 173
 #ifndef FILWIDTH_PIN
174
-  #define FILWIDTH_PIN      9   // Analog Input on X+ endstop
174
+  #define FILWIDTH_PIN                         9  // Analog Input on X+ endstop
175 175
 #endif
176 176
 
177 177
 //
178 178
 // Heaters / Fans
179 179
 //
180
-#define HEATER_0_PIN        5
181
-#define HEATER_1_PIN        6
182
-#define HEATER_2_PIN        7
183
-#define HEATER_BED_PIN      8
180
+#define HEATER_0_PIN                           5
181
+#define HEATER_1_PIN                           6
182
+#define HEATER_2_PIN                           7
183
+#define HEATER_BED_PIN                         8
184 184
 
185
-#define FAN_PIN            44
186
-#define FAN1_PIN           45
187
-#define FAN2_PIN           46
185
+#define FAN_PIN                               44
186
+#define FAN1_PIN                              45
187
+#define FAN2_PIN                              46
188 188
 
189 189
 //
190 190
 // Misc. Functions
191 191
 //
192
-#define SDSS               53
193
-#define LED_PIN            13
194
-#define KILL_PIN           41
192
+#define SDSS                                  53
193
+#define LED_PIN                               13
194
+#define KILL_PIN                              41
195 195
 
196 196
 #ifndef PS_ON_PIN
197
-  #define PS_ON_PIN        SERVO1_PIN
197
+  #define PS_ON_PIN                   SERVO1_PIN
198 198
 #endif
199 199
 
200 200
 /**
@@ -211,69 +211,69 @@
211 211
 //
212 212
 // LCDs and Controllers
213 213
 //
214
-#define BEEPER_PIN         37
215
-#define SD_DETECT_PIN      49
214
+#define BEEPER_PIN                            37
215
+#define SD_DETECT_PIN                         49
216 216
 
217 217
 #if ENABLED(FYSETC_MINI_12864)
218 218
   //
219 219
   // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
220 220
   //
221
-  #define DOGLCD_A0        16
222
-  #define DOGLCD_CS        17
221
+  #define DOGLCD_A0                           16
222
+  #define DOGLCD_CS                           17
223 223
 
224 224
   #if ENABLED(FYSETC_GENERIC_12864_1_1)
225
-    #define LCD_BACKLIGHT_PIN 27
225
+    #define LCD_BACKLIGHT_PIN                 27
226 226
   #endif
227 227
 
228
-  #define KILL_PIN         41
229
-  #define LCD_RESET_PIN    23   // Must be high or open for LCD to operate normally.
228
+  #define KILL_PIN                            41
229
+  #define LCD_RESET_PIN                       23  // Must be high or open for LCD to operate normally.
230 230
                                 // Seems to work best if left open.
231 231
 
232 232
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
233 233
     #ifndef RGB_LED_R_PIN
234
-      #define RGB_LED_R_PIN 25
234
+      #define RGB_LED_R_PIN                   25
235 235
     #endif
236 236
     #ifndef RGB_LED_G_PIN
237
-      #define RGB_LED_G_PIN 27
237
+      #define RGB_LED_G_PIN                   27
238 238
     #endif
239 239
     #ifndef RGB_LED_B_PIN
240
-      #define RGB_LED_B_PIN 29
240
+      #define RGB_LED_B_PIN                   29
241 241
     #endif
242 242
   #elif ENABLED(FYSETC_MINI_12864_2_1)
243
-    #define NEOPIXEL_PIN    25
243
+    #define NEOPIXEL_PIN                      25
244 244
   #endif
245 245
 
246 246
 #elif HAS_GRAPHICAL_LCD
247 247
 
248
-  #define LCD_PINS_RS      16
249
-  #define LCD_PINS_ENABLE  17
250
-  #define LCD_PINS_D4      23
251
-  #define LCD_PINS_D5      25
252
-  #define LCD_PINS_D6      27
253
-  #define LCD_PINS_D7      29
248
+  #define LCD_PINS_RS                         16
249
+  #define LCD_PINS_ENABLE                     17
250
+  #define LCD_PINS_D4                         23
251
+  #define LCD_PINS_D5                         25
252
+  #define LCD_PINS_D6                         27
253
+  #define LCD_PINS_D7                         29
254 254
 
255 255
   #if ENABLED(MKS_MINI_12864)
256
-    #define DOGLCD_CS      25
257
-    #define DOGLCD_A0      27
256
+    #define DOGLCD_CS                         25
257
+    #define DOGLCD_A0                         27
258 258
   #endif
259 259
 
260 260
 #endif
261 261
 
262 262
 #if ENABLED(NEWPANEL)
263
-  #define BTN_EN1          31
264
-  #define BTN_EN2          33
265
-  #define BTN_ENC          35
263
+  #define BTN_EN1                             31
264
+  #define BTN_EN2                             33
265
+  #define BTN_ENC                             35
266 266
 #endif
267 267
 
268 268
 #ifndef RGB_LED_R_PIN
269
-  #define RGB_LED_R_PIN     3
269
+  #define RGB_LED_R_PIN                        3
270 270
 #endif
271 271
 #ifndef RGB_LED_G_PIN
272
-  #define RGB_LED_G_PIN     4
272
+  #define RGB_LED_G_PIN                        4
273 273
 #endif
274 274
 #ifndef RGB_LED_B_PIN
275
-  #define RGB_LED_B_PIN     9
275
+  #define RGB_LED_B_PIN                        9
276 276
 #endif
277 277
 #ifndef RGB_LED_W_PIN
278
-  #define RGB_LED_W_PIN    -1
278
+  #define RGB_LED_W_PIN                       -1
279 279
 #endif

+ 13
- 13
Marlin/src/pins/ramps/pins_FYSETC_F6_14.h Parādīt failu

@@ -27,24 +27,24 @@
27 27
 
28 28
 #define BOARD_NAME "FYSETC F6 1.4"
29 29
 
30
-#define Z_MAX_PIN           2
30
+#define Z_MAX_PIN                              2
31 31
 
32 32
 #if HAS_TMC_UART
33 33
   /**
34 34
    * TMC2208/TMC2209 stepper drivers
35 35
    */
36
-  #define X_SERIAL_RX_PIN  72
37
-  #define X_SERIAL_TX_PIN  71
38
-  #define Y_SERIAL_RX_PIN  73
39
-  #define Y_SERIAL_TX_PIN  78
40
-  #define Z_SERIAL_RX_PIN  75
41
-  #define Z_SERIAL_TX_PIN  79
42
-  #define E0_SERIAL_RX_PIN 77
43
-  #define E0_SERIAL_TX_PIN 81
44
-  #define E1_SERIAL_RX_PIN 76
45
-  #define E1_SERIAL_TX_PIN 80
46
-  #define E2_SERIAL_RX_PIN 62
47
-  #define E2_SERIAL_TX_PIN 82
36
+  #define X_SERIAL_RX_PIN                     72
37
+  #define X_SERIAL_TX_PIN                     71
38
+  #define Y_SERIAL_RX_PIN                     73
39
+  #define Y_SERIAL_TX_PIN                     78
40
+  #define Z_SERIAL_RX_PIN                     75
41
+  #define Z_SERIAL_TX_PIN                     79
42
+  #define E0_SERIAL_RX_PIN                    77
43
+  #define E0_SERIAL_TX_PIN                    81
44
+  #define E1_SERIAL_RX_PIN                    76
45
+  #define E1_SERIAL_TX_PIN                    80
46
+  #define E2_SERIAL_RX_PIN                    62
47
+  #define E2_SERIAL_TX_PIN                    82
48 48
 #endif
49 49
 
50 50
 #include "pins_FYSETC_F6_13.h"

+ 5
- 5
Marlin/src/pins/ramps/pins_K8400.h Parādīt failu

@@ -40,8 +40,8 @@
40 40
 //
41 41
 // Limit Switches
42 42
 //
43
-#define X_STOP_PIN  3
44
-#define Y_STOP_PIN 14
43
+#define X_STOP_PIN                            3
44
+#define Y_STOP_PIN                           14
45 45
 
46 46
 #undef X_MIN_PIN
47 47
 #undef X_MAX_PIN
@@ -52,13 +52,13 @@
52 52
 // Steppers
53 53
 //
54 54
 #undef E1_STEP_PIN
55
-#define E1_STEP_PIN 32
55
+#define E1_STEP_PIN                          32
56 56
 
57 57
 //
58 58
 // Heaters / Fans
59 59
 //
60 60
 #undef HEATER_1_PIN
61
-#define HEATER_1_PIN 11
61
+#define HEATER_1_PIN                         11
62 62
 
63 63
 //
64 64
 // Misc. Functions
@@ -69,5 +69,5 @@
69 69
 
70 70
 #if Z_STEP_PIN == 26
71 71
   #undef Z_STEP_PIN
72
-  #define Z_STEP_PIN 32
72
+  #define Z_STEP_PIN                         32
73 73
 #endif

+ 40
- 40
Marlin/src/pins/ramps/pins_K8800.h Parādīt failu

@@ -37,73 +37,73 @@
37 37
 //
38 38
 // Limit Switches
39 39
 //
40
-#define X_STOP_PIN          3
41
-#define Y_STOP_PIN         14
42
-#define Z_MIN_PIN          68  // Used for bed leveling
43
-#define Z_MAX_PIN          66
40
+#define X_STOP_PIN                             3
41
+#define Y_STOP_PIN                            14
42
+#define Z_MIN_PIN                             68  // Used for bed leveling
43
+#define Z_MAX_PIN                             66
44 44
 
45 45
 //
46 46
 // Steppers
47 47
 //
48
-#define X_STEP_PIN         54
49
-#define X_DIR_PIN          55
50
-#define X_ENABLE_PIN       38
48
+#define X_STEP_PIN                            54
49
+#define X_DIR_PIN                             55
50
+#define X_ENABLE_PIN                          38
51 51
 
52
-#define Y_STEP_PIN         60
53
-#define Y_DIR_PIN          61
54
-#define Y_ENABLE_PIN       56
52
+#define Y_STEP_PIN                            60
53
+#define Y_DIR_PIN                             61
54
+#define Y_ENABLE_PIN                          56
55 55
 
56
-#define Z_STEP_PIN         46
57
-#define Z_DIR_PIN          48
58
-#define Z_ENABLE_PIN       63
56
+#define Z_STEP_PIN                            46
57
+#define Z_DIR_PIN                             48
58
+#define Z_ENABLE_PIN                          63
59 59
 
60
-#define E0_STEP_PIN        26
61
-#define E0_DIR_PIN         28
62
-#define E0_ENABLE_PIN      24
60
+#define E0_STEP_PIN                           26
61
+#define E0_DIR_PIN                            28
62
+#define E0_ENABLE_PIN                         24
63 63
 
64
-#define E1_STEP_PIN        32
65
-#define E1_DIR_PIN         34
66
-#define E1_ENABLE_PIN      30
64
+#define E1_STEP_PIN                           32
65
+#define E1_DIR_PIN                            34
66
+#define E1_ENABLE_PIN                         30
67 67
 
68 68
 //
69 69
 // Temperature Sensors
70 70
 //
71
-#define TEMP_0_PIN         13
71
+#define TEMP_0_PIN                            13
72 72
 
73 73
 //
74 74
 // Heaters / Fans
75 75
 //
76
-#define HEATER_0_PIN       10
77
-#define FAN_PIN             8
78
-#define CONTROLLER_FAN_PIN  9
76
+#define HEATER_0_PIN                          10
77
+#define FAN_PIN                                8
78
+#define CONTROLLER_FAN_PIN                     9
79 79
 
80 80
 //
81 81
 // Misc. Functions
82 82
 //
83
-#define SDSS               25
83
+#define SDSS                                  25
84 84
 
85
-#define FIL_RUNOUT_PIN     69   // PK7
86
-#define KILL_PIN           20   // PD1
85
+#define FIL_RUNOUT_PIN                        69  // PK7
86
+#define KILL_PIN                              20  // PD1
87 87
 
88 88
 //
89 89
 // LCD / Controller
90 90
 //
91
-#define SD_DETECT_PIN      21   // PD0
92
-#define LCD_SDSS           53
93
-#define BEEPER_PIN          6
91
+#define SD_DETECT_PIN                         21  // PD0
92
+#define LCD_SDSS                              53
93
+#define BEEPER_PIN                             6
94 94
 
95
-#define DOGLCD_CS          29
96
-#define DOGLCD_A0          27
95
+#define DOGLCD_CS                             29
96
+#define DOGLCD_A0                             27
97 97
 
98
-#define LCD_PINS_RS        27
99
-#define LCD_PINS_ENABLE    29
100
-#define LCD_PINS_D4        37
101
-#define LCD_PINS_D5        35
102
-#define LCD_PINS_D6        33
103
-#define LCD_PINS_D7        31
98
+#define LCD_PINS_RS                           27
99
+#define LCD_PINS_ENABLE                       29
100
+#define LCD_PINS_D4                           37
101
+#define LCD_PINS_D5                           35
102
+#define LCD_PINS_D6                           33
103
+#define LCD_PINS_D7                           31
104 104
 
105 105
 #if ENABLED(NEWPANEL)
106
-  #define BTN_EN1          17
107
-  #define BTN_EN2          16
108
-  #define BTN_ENC          23
106
+  #define BTN_EN1                             17
107
+  #define BTN_EN2                             16
108
+  #define BTN_ENC                             23
109 109
 #endif

+ 10
- 10
Marlin/src/pins/ramps/pins_MKS_BASE_14.h Parādīt failu

@@ -30,28 +30,28 @@
30 30
 #endif
31 31
 
32 32
 #define BOARD_INFO_NAME "MKS BASE 1.4"
33
-#define MKS_BASE_VERSION 14
33
+#define MKS_BASE_VERSION                      14
34 34
 
35 35
 //
36 36
 // Heaters / Fans
37 37
 //
38
-#define FAN_PIN             9   // PH6 ** Pin18 ** PWM9
38
+#define FAN_PIN                                9  // PH6 ** Pin18 ** PWM9
39 39
 
40 40
 // Other Mods
41
-#define CASE_LIGHT_PIN     11   // PB5 ** Pin24 ** PWM11
42
-#define SERVO3_PIN         12   // PB6 ** Pin25 ** D12
43
-#define PS_ON_PIN           2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
44
-#define FILWIDTH_PIN       15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
45
-#define FIL_RUNOUT_PIN     19   // Z+ // PD2 ** Pin45 ** USART1_RX
41
+#define CASE_LIGHT_PIN                        11  // PB5 ** Pin24 ** PWM11
42
+#define SERVO3_PIN                            12  // PB6 ** Pin25 ** D12
43
+#define PS_ON_PIN                              2  // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
44
+#define FILWIDTH_PIN                          15  // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
45
+#define FIL_RUNOUT_PIN                        19  // Z+ // PD2 ** Pin45 ** USART1_RX
46 46
 
47 47
 #ifndef RGB_LED_R_PIN
48
-  #define RGB_LED_R_PIN    50
48
+  #define RGB_LED_R_PIN                       50
49 49
 #endif
50 50
 #ifndef RGB_LED_R_PIN
51
-  #define RGB_LED_G_PIN    51
51
+  #define RGB_LED_G_PIN                       51
52 52
 #endif
53 53
 #ifndef RGB_LED_R_PIN
54
-  #define RGB_LED_B_PIN    52
54
+  #define RGB_LED_B_PIN                       52
55 55
 #endif
56 56
 
57 57
 #include "pins_MKS_BASE_common.h"

+ 7
- 7
Marlin/src/pins/ramps/pins_MKS_BASE_16.h Parādīt failu

@@ -30,30 +30,30 @@
30 30
 #endif
31 31
 
32 32
 #define BOARD_INFO_NAME "MKS BASE 1.6"
33
-#define MKS_BASE_VERSION 16
33
+#define MKS_BASE_VERSION                     16
34 34
 
35 35
 //
36 36
 // Servos
37 37
 //
38
-#define SERVO1_PIN         12   // Digital 12 / Pin 25
38
+#define SERVO1_PIN                           12   // Digital 12 / Pin 25
39 39
 
40 40
 //
41 41
 // Omitted RAMPS pins
42 42
 //
43 43
 #ifndef SERVO2_PIN
44
-  #define SERVO2_PIN       -1
44
+  #define SERVO2_PIN                         -1
45 45
 #endif
46 46
 #ifndef SERVO3_PIN
47
-  #define SERVO3_PIN       -1
47
+  #define SERVO3_PIN                         -1
48 48
 #endif
49 49
 #ifndef FILWIDTH_PIN
50
-  #define FILWIDTH_PIN     -1
50
+  #define FILWIDTH_PIN                       -1
51 51
 #endif
52 52
 #ifndef FIL_RUNOUT_PIN
53
-  #define FIL_RUNOUT_PIN   -1
53
+  #define FIL_RUNOUT_PIN                     -1
54 54
 #endif
55 55
 #ifndef PS_ON_PIN
56
-  #define PS_ON_PIN        -1
56
+  #define PS_ON_PIN                          -1
57 57
 #endif
58 58
 
59 59
 #include "pins_MKS_BASE_common.h"

+ 18
- 18
Marlin/src/pins/ramps/pins_MKS_BASE_common.h Parādīt failu

@@ -34,19 +34,19 @@
34 34
   // Heaters / Fans
35 35
   //
36 36
   // Power outputs EFBF or EFBE
37
-  #define MOSFET_D_PIN      7
37
+  #define MOSFET_D_PIN                         7
38 38
 
39 39
   //
40 40
   // M3/M4/M5 - Spindle/Laser Control
41 41
   //
42 42
   #if HAS_CUTTER
43
-    #define SPINDLE_LASER_PWM_PIN  2   // Hardware PWM
44
-    #define SPINDLE_LASER_ENA_PIN 15   // Pullup!
45
-    #define SPINDLE_DIR_PIN       19
43
+    #define SPINDLE_LASER_PWM_PIN              2  // Hardware PWM
44
+    #define SPINDLE_LASER_ENA_PIN             15  // Pullup!
45
+    #define SPINDLE_DIR_PIN                   19
46 46
   #endif
47 47
 
48 48
   #ifndef CASE_LIGHT_PIN
49
-    #define CASE_LIGHT_PIN  2
49
+    #define CASE_LIGHT_PIN                     2
50 50
   #endif
51 51
 
52 52
 #endif
@@ -54,22 +54,22 @@
54 54
 //
55 55
 // Microstepping pins
56 56
 //
57
-#if MKS_BASE_VERSION >= 14      //     |===== 1.4 =====|===== 1.5+ =====|
58
-  #define X_MS1_PIN         5   // PE3 | Pin  5 | PWM5 |        | D3    | SERVO2_PIN
59
-  #define X_MS2_PIN         6   // PH3 | Pin 15 | PWM6 | Pin 14 | D6    | SERVO1_PIN
60
-  #define Y_MS1_PIN        59   // PF5 | Pin 92 | A5   |        |       |
61
-  #define Y_MS2_PIN        58   // PF4 | Pin 93 | A4   |        |       |
62
-  #define Z_MS1_PIN        22   // PA0 | Pin 78 | D22  |        |       |
63
-  #define Z_MS2_PIN        39   // PG2 | Pin 70 | D39  |        |       |
57
+#if MKS_BASE_VERSION >= 14                        //     |===== 1.4 =====|===== 1.5+ =====|
58
+  #define X_MS1_PIN                            5  // PE3 | Pin  5 | PWM5 |        | D3    | SERVO2_PIN
59
+  #define X_MS2_PIN                            6  // PH3 | Pin 15 | PWM6 | Pin 14 | D6    | SERVO1_PIN
60
+  #define Y_MS1_PIN                           59  // PF5 | Pin 92 | A5   |        |       |
61
+  #define Y_MS2_PIN                           58  // PF4 | Pin 93 | A4   |        |       |
62
+  #define Z_MS1_PIN                           22  // PA0 | Pin 78 | D22  |        |       |
63
+  #define Z_MS2_PIN                           39  // PG2 | Pin 70 | D39  |        |       |
64 64
   #if MKS_BASE_VERSION == 14
65
-    #define E0_MS1_PIN     64   // PK2 | Pin 87 | A10  |        |       |
66
-    #define E0_MS2_PIN     63   // PK1 | Pin 88 | A9   |        |       |
65
+    #define E0_MS1_PIN                        64  // PK2 | Pin 87 | A10  |        |       |
66
+    #define E0_MS2_PIN                        63  // PK1 | Pin 88 | A9   |        |       |
67 67
   #else
68
-    #define E0_MS1_PIN     63   // PK1 |        |      | Pin 86 | A9    |
69
-    #define E0_MS2_PIN     64   // PK2 |        |      | Pin 87 | A10   |
68
+    #define E0_MS1_PIN                        63  // PK1 |        |      | Pin 86 | A9    |
69
+    #define E0_MS2_PIN                        64  // PK2 |        |      | Pin 87 | A10   |
70 70
   #endif
71
-  #define E1_MS1_PIN       57   // PF3 | Pin 94 | A3   | Pin 93 | A3    |
72
-  #define E1_MS2_PIN        4   // PG5 | Pin  1 | PWM4 |        | D4    | SERVO3_PIN
71
+  #define E1_MS1_PIN                          57  // PF3 | Pin 94 | A3   | Pin 93 | A3    |
72
+  #define E1_MS2_PIN                           4  // PG5 | Pin  1 | PWM4 |        | D4    | SERVO3_PIN
73 73
 #endif
74 74
 
75 75
 #include "pins_RAMPS.h"

+ 14
- 14
Marlin/src/pins/ramps/pins_MKS_GEN_13.h Parādīt failu

@@ -40,7 +40,7 @@
40 40
 // Heaters / Fans
41 41
 //
42 42
 // Power outputs EFBF or EFBE
43
-#define MOSFET_D_PIN        7
43
+#define MOSFET_D_PIN                           7
44 44
 
45 45
 //
46 46
 // PSU / SERVO
@@ -48,8 +48,8 @@
48 48
 // If PSU_CONTROL is specified, always hijack Servo 3
49 49
 //
50 50
 #if ENABLED(PSU_CONTROL)
51
-  #define SERVO3_PIN       -1
52
-  #define PS_ON_PIN         4
51
+  #define SERVO3_PIN                          -1
52
+  #define PS_ON_PIN                            4
53 53
 #endif
54 54
 
55 55
 #include "pins_RAMPS.h"
@@ -104,44 +104,44 @@
104 104
   //
105 105
 
106 106
   // orange/white          SDCD
107
-  #define SD_DETECT_PIN    49
107
+  #define SD_DETECT_PIN                       49
108 108
 
109 109
   // white                 ENCA
110
-  #define BTN_EN1          35
110
+  #define BTN_EN1                             35
111 111
 
112 112
   // green                 ENCB
113
-  #define BTN_EN2          37
113
+  #define BTN_EN2                             37
114 114
 
115 115
   // purple                ENCBTN
116
-  #define BTN_ENC          31
116
+  #define BTN_ENC                             31
117 117
 
118 118
   // brown                 A0
119
-  #define DOGLCD_A0        27
119
+  #define DOGLCD_A0                           27
120 120
 
121 121
   // green/white           LCS
122
-  #define DOGLCD_CS        29
122
+  #define DOGLCD_CS                           29
123 123
 
124 124
                         // 50    gray   MISO
125 125
                         // 51    yellow MOSI
126 126
                         // 52    orange SCK
127 127
 
128 128
   // blue                  SDCS
129
-  //#define SDSS           53
129
+  //#define SDSS                              53
130 130
 
131 131
   //
132 132
   // VIKI2 4-wire lead
133 133
   //
134 134
 
135 135
   // blue                  BTN
136
-  #define KILL_PIN         23
136
+  #define KILL_PIN                            23
137 137
 
138 138
   // green                 BUZZER
139
-  #define BEEPER_PIN       25
139
+  #define BEEPER_PIN                          25
140 140
 
141 141
   // yellow                RED-LED
142
-  #define STAT_LED_RED_PIN 16
142
+  #define STAT_LED_RED_PIN                    16
143 143
 
144 144
   // white                 BLUE-LED
145
-  #define STAT_LED_BLUE_PIN 17
145
+  #define STAT_LED_BLUE_PIN                   17
146 146
 
147 147
 #endif

+ 16
- 16
Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h Parādīt failu

@@ -35,7 +35,7 @@
35 35
 // Heaters / Fans
36 36
 //
37 37
 // Power outputs EFBF or EFBE
38
-#define MOSFET_D_PIN           7
38
+#define MOSFET_D_PIN                           7
39 39
 
40 40
 //
41 41
 // CS Pins wired to avoid conflict with the LCD
@@ -43,47 +43,47 @@
43 43
 //
44 44
 
45 45
 #ifndef X_CS_PIN
46
-  #define X_CS_PIN            63
46
+  #define X_CS_PIN                            63
47 47
 #endif
48 48
 
49 49
 #ifndef Y_CS_PIN
50
-  #define Y_CS_PIN            64
50
+  #define Y_CS_PIN                            64
51 51
 #endif
52 52
 
53 53
 #ifndef Z_CS_PIN
54
-  #define Z_CS_PIN            65
54
+  #define Z_CS_PIN                            65
55 55
 #endif
56 56
 
57 57
 #ifndef E0_CS_PIN
58
-  #define E0_CS_PIN           66
58
+  #define E0_CS_PIN                           66
59 59
 #endif
60 60
 
61 61
 #ifndef E1_CS_PIN
62
-  #define E1_CS_PIN           21
62
+  #define E1_CS_PIN                           21
63 63
 #endif
64 64
 
65 65
 // TMC2130 Diag Pins (currently just for reference)
66
-#define X_DIAG_PIN             3
67
-#define Y_DIAG_PIN            14
68
-#define Z_DIAG_PIN            18
69
-#define E0_DIAG_PIN            2
70
-#define E1_DIAG_PIN           15
66
+#define X_DIAG_PIN                             3
67
+#define Y_DIAG_PIN                            14
68
+#define Z_DIAG_PIN                            18
69
+#define E0_DIAG_PIN                            2
70
+#define E1_DIAG_PIN                           15
71 71
 
72 72
 #ifndef SERVO1_PIN
73
-  #define SERVO1_PIN          12
73
+  #define SERVO1_PIN                          12
74 74
 #endif
75 75
 #ifndef SERVO2_PIN
76
-  #define SERVO2_PIN          39
76
+  #define SERVO2_PIN                          39
77 77
 #endif
78 78
 #ifndef SERVO3_PIN
79
-  #define SERVO3_PIN          32
79
+  #define SERVO3_PIN                          32
80 80
 #endif
81 81
 
82 82
 #ifndef E1_SERIAL_TX_PIN
83
-  #define E1_SERIAL_TX_PIN    20
83
+  #define E1_SERIAL_TX_PIN                    20
84 84
 #endif
85 85
 #ifndef E1_SERIAL_RX_PIN
86
-  #define E1_SERIAL_RX_PIN    21
86
+  #define E1_SERIAL_RX_PIN                    21
87 87
 #endif
88 88
 
89 89
 #include "pins_RAMPS.h"

+ 241
- 241
Marlin/src/pins/ramps/pins_RAMPS.h Parādīt failu

@@ -66,19 +66,19 @@
66 66
 //
67 67
 #ifndef SERVO0_PIN
68 68
   #ifdef IS_RAMPS_13
69
-    #define SERVO0_PIN      7
69
+    #define SERVO0_PIN                         7
70 70
   #else
71
-    #define SERVO0_PIN     11
71
+    #define SERVO0_PIN                        11
72 72
   #endif
73 73
 #endif
74 74
 #ifndef SERVO1_PIN
75
-  #define SERVO1_PIN        6
75
+  #define SERVO1_PIN                           6
76 76
 #endif
77 77
 #ifndef SERVO2_PIN
78
-  #define SERVO2_PIN        5
78
+  #define SERVO2_PIN                           5
79 79
 #endif
80 80
 #ifndef SERVO3_PIN
81
-  #define SERVO3_PIN        4
81
+  #define SERVO3_PIN                           4
82 82
 #endif
83 83
 
84 84
 //
@@ -86,26 +86,26 @@
86 86
 //
87 87
 #ifndef X_STOP_PIN
88 88
   #ifndef X_MIN_PIN
89
-    #define X_MIN_PIN       3
89
+    #define X_MIN_PIN                          3
90 90
   #endif
91 91
   #ifndef X_MAX_PIN
92
-    #define X_MAX_PIN       2
92
+    #define X_MAX_PIN                          2
93 93
   #endif
94 94
 #endif
95 95
 #ifndef Y_STOP_PIN
96 96
   #ifndef Y_MIN_PIN
97
-    #define Y_MIN_PIN      14
97
+    #define Y_MIN_PIN                         14
98 98
   #endif
99 99
   #ifndef Y_MAX_PIN
100
-    #define Y_MAX_PIN      15
100
+    #define Y_MAX_PIN                         15
101 101
   #endif
102 102
 #endif
103 103
 #ifndef Z_STOP_PIN
104 104
   #ifndef Z_MIN_PIN
105
-    #define Z_MIN_PIN      18
105
+    #define Z_MIN_PIN                         18
106 106
   #endif
107 107
   #ifndef Z_MAX_PIN
108
-    #define Z_MAX_PIN      19
108
+    #define Z_MAX_PIN                         19
109 109
   #endif
110 110
 #endif
111 111
 
@@ -113,67 +113,67 @@
113 113
 // Z Probe (when not Z_MIN_PIN)
114 114
 //
115 115
 #ifndef Z_MIN_PROBE_PIN
116
-  #define Z_MIN_PROBE_PIN  32
116
+  #define Z_MIN_PROBE_PIN                     32
117 117
 #endif
118 118
 
119 119
 //
120 120
 // Steppers
121 121
 //
122
-#define X_STEP_PIN         54
123
-#define X_DIR_PIN          55
124
-#define X_ENABLE_PIN       38
122
+#define X_STEP_PIN                            54
123
+#define X_DIR_PIN                             55
124
+#define X_ENABLE_PIN                          38
125 125
 #ifndef X_CS_PIN
126
-  #define X_CS_PIN         53
126
+  #define X_CS_PIN                            53
127 127
 #endif
128 128
 
129
-#define Y_STEP_PIN         60
130
-#define Y_DIR_PIN          61
131
-#define Y_ENABLE_PIN       56
129
+#define Y_STEP_PIN                            60
130
+#define Y_DIR_PIN                             61
131
+#define Y_ENABLE_PIN                          56
132 132
 #ifndef Y_CS_PIN
133
-  #define Y_CS_PIN         49
133
+  #define Y_CS_PIN                            49
134 134
 #endif
135 135
 
136 136
 #ifndef Z_STEP_PIN
137
-  #define Z_STEP_PIN       46
137
+  #define Z_STEP_PIN                          46
138 138
 #endif
139
-#define Z_DIR_PIN          48
140
-#define Z_ENABLE_PIN       62
139
+#define Z_DIR_PIN                             48
140
+#define Z_ENABLE_PIN                          62
141 141
 #ifndef Z_CS_PIN
142
-  #define Z_CS_PIN         40
142
+  #define Z_CS_PIN                            40
143 143
 #endif
144 144
 
145
-#define E0_STEP_PIN        26
146
-#define E0_DIR_PIN         28
147
-#define E0_ENABLE_PIN      24
145
+#define E0_STEP_PIN                           26
146
+#define E0_DIR_PIN                            28
147
+#define E0_ENABLE_PIN                         24
148 148
 #ifndef E0_CS_PIN
149
-  #define E0_CS_PIN        42
149
+  #define E0_CS_PIN                           42
150 150
 #endif
151 151
 
152
-#define E1_STEP_PIN        36
153
-#define E1_DIR_PIN         34
154
-#define E1_ENABLE_PIN      30
152
+#define E1_STEP_PIN                           36
153
+#define E1_DIR_PIN                            34
154
+#define E1_ENABLE_PIN                         30
155 155
 #ifndef E1_CS_PIN
156
-  #define E1_CS_PIN        44
156
+  #define E1_CS_PIN                           44
157 157
 #endif
158 158
 
159 159
 //
160 160
 // Temperature Sensors
161 161
 //
162 162
 #ifndef TEMP_0_PIN
163
-  #define TEMP_0_PIN       13   // Analog Input
163
+  #define TEMP_0_PIN                          13  // Analog Input
164 164
 #endif
165 165
 #ifndef TEMP_1_PIN
166
-  #define TEMP_1_PIN       15   // Analog Input
166
+  #define TEMP_1_PIN                          15  // Analog Input
167 167
 #endif
168 168
 #ifndef TEMP_BED_PIN
169
-  #define TEMP_BED_PIN     14   // Analog Input
169
+  #define TEMP_BED_PIN                        14  // Analog Input
170 170
 #endif
171 171
 
172 172
 // SPI for Max6675 or Max31855 Thermocouple
173 173
 #if DISABLED(SDSUPPORT)
174
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
174
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
175 175
 #else
176
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
176
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
177 177
 #endif
178 178
 
179 179
 //
@@ -197,74 +197,74 @@
197 197
 // Heaters / Fans
198 198
 //
199 199
 #ifndef MOSFET_D_PIN
200
-  #define MOSFET_D_PIN     -1
200
+  #define MOSFET_D_PIN                        -1
201 201
 #endif
202 202
 #ifndef RAMPS_D8_PIN
203
-  #define RAMPS_D8_PIN      8
203
+  #define RAMPS_D8_PIN                         8
204 204
 #endif
205 205
 #ifndef RAMPS_D9_PIN
206
-  #define RAMPS_D9_PIN      9
206
+  #define RAMPS_D9_PIN                         9
207 207
 #endif
208 208
 #ifndef RAMPS_D10_PIN
209
-  #define RAMPS_D10_PIN    10
210
-#endif
211
-
212
-#define HEATER_0_PIN       RAMPS_D10_PIN
213
-
214
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
215
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
216
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
217
-  #define HEATER_1_PIN     RAMPS_D9_PIN
218
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
219
-  #define HEATER_1_PIN     RAMPS_D9_PIN
220
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
221
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
222
-  #define FAN1_PIN         RAMPS_D8_PIN
223
-#elif DISABLED(IS_RAMPS_SF)                    // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
224
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
209
+  #define RAMPS_D10_PIN                       10
210
+#endif
211
+
212
+#define HEATER_0_PIN               RAMPS_D10_PIN
213
+
214
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
215
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
216
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
217
+  #define HEATER_1_PIN              RAMPS_D9_PIN
218
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
219
+  #define HEATER_1_PIN              RAMPS_D9_PIN
220
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
221
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
222
+  #define FAN1_PIN                  RAMPS_D8_PIN
223
+#elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
224
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
225 225
   #if HOTENDS == 1
226
-    #define FAN1_PIN       MOSFET_D_PIN
226
+    #define FAN1_PIN                MOSFET_D_PIN
227 227
   #else
228
-    #define HEATER_1_PIN   MOSFET_D_PIN
228
+    #define HEATER_1_PIN            MOSFET_D_PIN
229 229
   #endif
230 230
 #endif
231 231
 
232 232
 #ifndef FAN_PIN
233 233
   #if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF)          // Hotend, Fan, Bed or Hotend, Fan, Fan
234
-    #define FAN_PIN        RAMPS_D9_PIN
234
+    #define FAN_PIN                 RAMPS_D9_PIN
235 235
   #elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF)         // Hotend, Hotend, Fan or Spindle, Fan
236
-    #define FAN_PIN        RAMPS_D8_PIN
237
-  #elif ENABLED(IS_RAMPS_EEB)                  // Hotend, Hotend, Bed
238
-    #define FAN_PIN         4                  // IO pin. Buffer needed
239
-  #else                                        // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
240
-    #define FAN_PIN        RAMPS_D9_PIN
236
+    #define FAN_PIN                 RAMPS_D8_PIN
237
+  #elif ENABLED(IS_RAMPS_EEB)                     // Hotend, Hotend, Bed
238
+    #define FAN_PIN                            4  // IO pin. Buffer needed
239
+  #else                                           // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
240
+    #define FAN_PIN                 RAMPS_D9_PIN
241 241
   #endif
242 242
 #endif
243 243
 
244 244
 //
245 245
 // Misc. Functions
246 246
 //
247
-#define SDSS               53
248
-#define LED_PIN            13
247
+#define SDSS                                  53
248
+#define LED_PIN                               13
249 249
 
250 250
 #ifndef FILWIDTH_PIN
251
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
251
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
252 252
 #endif
253 253
 
254 254
 // RAMPS 1.4 DIO 4 on the servos connector
255 255
 #ifndef FIL_RUNOUT_PIN
256
-  #define FIL_RUNOUT_PIN    4
256
+  #define FIL_RUNOUT_PIN                       4
257 257
 #endif
258 258
 
259 259
 #ifndef PS_ON_PIN
260
-  #define PS_ON_PIN        12
260
+  #define PS_ON_PIN                           12
261 261
 #endif
262 262
 
263 263
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
264
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
265
-    #define CASE_LIGHT_PIN  6   // Hardware PWM
264
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
265
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
266 266
   #elif HAS_FREE_AUX2_PINS
267
-    #define CASE_LIGHT_PIN 44   // Hardware PWM
267
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
268 268
   #endif
269 269
 #endif
270 270
 
@@ -272,14 +272,14 @@
272 272
 // M3/M4/M5 - Spindle/Laser Control
273 273
 //
274 274
 #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
275
-  #if !NUM_SERVOS                         // Use servo connector if possible
276
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
277
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
278
-    #define SPINDLE_DIR_PIN           5
275
+  #if !NUM_SERVOS                                 // Use servo connector if possible
276
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
277
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
278
+    #define SPINDLE_DIR_PIN                    5
279 279
   #elif HAS_FREE_AUX2_PINS
280
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
281
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
282
-    #define SPINDLE_DIR_PIN          65
280
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
281
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
282
+    #define SPINDLE_DIR_PIN                   65
283 283
   #else
284 284
     #error "No auto-assignable Spindle/Laser pins available."
285 285
   #endif
@@ -290,13 +290,13 @@
290 290
 //
291 291
 #if ENABLED(TMC_USE_SW_SPI)
292 292
   #ifndef TMC_SW_MOSI
293
-    #define TMC_SW_MOSI    66
293
+    #define TMC_SW_MOSI                       66
294 294
   #endif
295 295
   #ifndef TMC_SW_MISO
296
-    #define TMC_SW_MISO    44
296
+    #define TMC_SW_MISO                       44
297 297
   #endif
298 298
   #ifndef TMC_SW_SCK
299
-    #define TMC_SW_SCK     64
299
+    #define TMC_SW_SCK                        64
300 300
   #endif
301 301
 #endif
302 302
 
@@ -307,11 +307,11 @@
307 307
    * Hardware serial communication ports.
308 308
    * If undefined software serial is used according to the pins below
309 309
    */
310
-  //#define X_HARDWARE_SERIAL  Serial1
310
+  //#define X_HARDWARE_SERIAL Serial1
311 311
   //#define X2_HARDWARE_SERIAL Serial1
312
-  //#define Y_HARDWARE_SERIAL  Serial1
312
+  //#define Y_HARDWARE_SERIAL Serial1
313 313
   //#define Y2_HARDWARE_SERIAL Serial1
314
-  //#define Z_HARDWARE_SERIAL  Serial1
314
+  //#define Z_HARDWARE_SERIAL Serial1
315 315
   //#define Z2_HARDWARE_SERIAL Serial1
316 316
   //#define E0_HARDWARE_SERIAL Serial1
317 317
   //#define E1_HARDWARE_SERIAL Serial1
@@ -324,91 +324,91 @@
324 324
   //
325 325
 
326 326
   #ifndef X_SERIAL_TX_PIN
327
-    #define X_SERIAL_TX_PIN  40
327
+    #define X_SERIAL_TX_PIN                   40
328 328
   #endif
329 329
   #ifndef X_SERIAL_RX_PIN
330
-    #define X_SERIAL_RX_PIN  63
330
+    #define X_SERIAL_RX_PIN                   63
331 331
   #endif
332 332
   #ifndef X2_SERIAL_TX_PIN
333
-    #define X2_SERIAL_TX_PIN -1
333
+    #define X2_SERIAL_TX_PIN                  -1
334 334
   #endif
335 335
   #ifndef X2_SERIAL_RX_PIN
336
-    #define X2_SERIAL_RX_PIN -1
336
+    #define X2_SERIAL_RX_PIN                  -1
337 337
   #endif
338 338
 
339 339
   #ifndef Y_SERIAL_TX_PIN
340
-    #define Y_SERIAL_TX_PIN  59
340
+    #define Y_SERIAL_TX_PIN                   59
341 341
   #endif
342 342
   #ifndef Y_SERIAL_RX_PIN
343
-    #define Y_SERIAL_RX_PIN  64
343
+    #define Y_SERIAL_RX_PIN                   64
344 344
   #endif
345 345
   #ifndef Y2_SERIAL_TX_PIN
346
-    #define Y2_SERIAL_TX_PIN -1
346
+    #define Y2_SERIAL_TX_PIN                  -1
347 347
   #endif
348 348
   #ifndef Y2_SERIAL_RX_PIN
349
-    #define Y2_SERIAL_RX_PIN -1
349
+    #define Y2_SERIAL_RX_PIN                  -1
350 350
   #endif
351 351
 
352 352
   #ifndef Z_SERIAL_TX_PIN
353
-    #define Z_SERIAL_TX_PIN  42
353
+    #define Z_SERIAL_TX_PIN                   42
354 354
   #endif
355 355
   #ifndef Z_SERIAL_RX_PIN
356
-    #define Z_SERIAL_RX_PIN  65
356
+    #define Z_SERIAL_RX_PIN                   65
357 357
   #endif
358 358
   #ifndef Z2_SERIAL_TX_PIN
359
-    #define Z2_SERIAL_TX_PIN -1
359
+    #define Z2_SERIAL_TX_PIN                  -1
360 360
   #endif
361 361
   #ifndef Z2_SERIAL_RX_PIN
362
-    #define Z2_SERIAL_RX_PIN -1
362
+    #define Z2_SERIAL_RX_PIN                  -1
363 363
   #endif
364 364
 
365 365
   #ifndef E0_SERIAL_TX_PIN
366
-    #define E0_SERIAL_TX_PIN 44
366
+    #define E0_SERIAL_TX_PIN                  44
367 367
   #endif
368 368
   #ifndef E0_SERIAL_RX_PIN
369
-    #define E0_SERIAL_RX_PIN 66
369
+    #define E0_SERIAL_RX_PIN                  66
370 370
   #endif
371 371
   #ifndef E1_SERIAL_TX_PIN
372
-    #define E1_SERIAL_TX_PIN -1
372
+    #define E1_SERIAL_TX_PIN                  -1
373 373
   #endif
374 374
   #ifndef E1_SERIAL_RX_PIN
375
-    #define E1_SERIAL_RX_PIN -1
375
+    #define E1_SERIAL_RX_PIN                  -1
376 376
   #endif
377 377
   #ifndef E2_SERIAL_TX_PIN
378
-    #define E2_SERIAL_TX_PIN -1
378
+    #define E2_SERIAL_TX_PIN                  -1
379 379
   #endif
380 380
   #ifndef E2_SERIAL_RX_PIN
381
-    #define E2_SERIAL_RX_PIN -1
381
+    #define E2_SERIAL_RX_PIN                  -1
382 382
   #endif
383 383
   #ifndef E3_SERIAL_TX_PIN
384
-    #define E3_SERIAL_TX_PIN -1
384
+    #define E3_SERIAL_TX_PIN                  -1
385 385
   #endif
386 386
   #ifndef E3_SERIAL_RX_PIN
387
-    #define E3_SERIAL_RX_PIN -1
387
+    #define E3_SERIAL_RX_PIN                  -1
388 388
   #endif
389 389
   #ifndef E4_SERIAL_TX_PIN
390
-    #define E4_SERIAL_TX_PIN -1
390
+    #define E4_SERIAL_TX_PIN                  -1
391 391
   #endif
392 392
   #ifndef E4_SERIAL_RX_PIN
393
-    #define E4_SERIAL_RX_PIN -1
393
+    #define E4_SERIAL_RX_PIN                  -1
394 394
   #endif
395 395
   #ifndef E5_SERIAL_TX_PIN
396
-    #define E5_SERIAL_TX_PIN -1
396
+    #define E5_SERIAL_TX_PIN                  -1
397 397
   #endif
398 398
   #ifndef E5_SERIAL_RX_PIN
399
-    #define E5_SERIAL_RX_PIN -1
399
+    #define E5_SERIAL_RX_PIN                  -1
400 400
   #endif
401 401
   #ifndef E6_SERIAL_TX_PIN
402
-    #define E6_SERIAL_TX_PIN -1
402
+    #define E6_SERIAL_TX_PIN                  -1
403 403
   #endif
404 404
   #ifndef E6_SERIAL_RX_PIN
405
-    #define E6_SERIAL_RX_PIN -1
405
+    #define E6_SERIAL_RX_PIN                  -1
406 406
   #endif
407 407
   #ifndef E7_SERIAL_TX_PIN
408
-    #define E7_SERIAL_TX_PIN -1
408
+    #define E7_SERIAL_TX_PIN                  -1
409 409
   #endif
410 410
   #ifndef E7_SERIAL_RX_PIN
411
-    #define E7_SERIAL_RX_PIN -1
411
+    #define E7_SERIAL_RX_PIN                  -1
412 412
   #endif
413 413
 #endif
414 414
 
@@ -416,13 +416,13 @@
416 416
 // Průša i3 MK2 Multiplexer Support
417 417
 //
418 418
 #ifndef E_MUX0_PIN
419
-  #define E_MUX0_PIN 40   // Z_CS_PIN
419
+  #define E_MUX0_PIN                          40  // Z_CS_PIN
420 420
 #endif
421 421
 #ifndef E_MUX1_PIN
422
-  #define E_MUX1_PIN 42   // E0_CS_PIN
422
+  #define E_MUX1_PIN                          42  // E0_CS_PIN
423 423
 #endif
424 424
 #ifndef E_MUX2_PIN
425
-  #define E_MUX2_PIN 44   // E1_CS_PIN
425
+  #define E_MUX2_PIN                          44  // E1_CS_PIN
426 426
 #endif
427 427
 
428 428
 //////////////////////////
@@ -436,62 +436,62 @@
436 436
   //
437 437
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
438 438
 
439
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
440
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
441
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
439
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
440
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
441
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
442 442
 
443 443
   #elif BOTH(NEWPANEL, PANEL_ONE)
444 444
 
445
-    #define LCD_PINS_RS         40
446
-    #define LCD_PINS_ENABLE     42
447
-    #define LCD_PINS_D4         65
448
-    #define LCD_PINS_D5         66
449
-    #define LCD_PINS_D6         44
450
-    #define LCD_PINS_D7         64
445
+    #define LCD_PINS_RS                       40
446
+    #define LCD_PINS_ENABLE                   42
447
+    #define LCD_PINS_D4                       65
448
+    #define LCD_PINS_D5                       66
449
+    #define LCD_PINS_D6                       44
450
+    #define LCD_PINS_D7                       64
451 451
 
452 452
   #else
453 453
 
454 454
     #if ENABLED(CR10_STOCKDISPLAY)
455 455
 
456
-      #define LCD_PINS_RS       27
457
-      #define LCD_PINS_ENABLE   29
458
-      #define LCD_PINS_D4       25
456
+      #define LCD_PINS_RS                     27
457
+      #define LCD_PINS_ENABLE                 29
458
+      #define LCD_PINS_D4                     25
459 459
 
460 460
       #if DISABLED(NEWPANEL)
461
-        #define BEEPER_PIN      37
461
+        #define BEEPER_PIN                    37
462 462
       #endif
463 463
 
464 464
     #elif ENABLED(ZONESTAR_LCD)
465 465
 
466
-      #define LCD_PINS_RS       64
467
-      #define LCD_PINS_ENABLE   44
468
-      #define LCD_PINS_D4       63
469
-      #define LCD_PINS_D5       40
470
-      #define LCD_PINS_D6       42
471
-      #define LCD_PINS_D7       65
466
+      #define LCD_PINS_RS                     64
467
+      #define LCD_PINS_ENABLE                 44
468
+      #define LCD_PINS_D4                     63
469
+      #define LCD_PINS_D5                     40
470
+      #define LCD_PINS_D6                     42
471
+      #define LCD_PINS_D7                     65
472 472
 
473 473
     #else
474 474
 
475 475
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
476
-        #define LCD_PINS_DC     25   // Set as output on init
477
-        #define LCD_PINS_RS     27   // Pull low for 1s to init
476
+        #define LCD_PINS_DC                   25  // Set as output on init
477
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
478 478
         // DOGM SPI LCD Support
479
-        #define DOGLCD_CS       16
480
-        #define DOGLCD_MOSI     17
481
-        #define DOGLCD_SCK      23
482
-        #define DOGLCD_A0       LCD_PINS_DC
479
+        #define DOGLCD_CS                     16
480
+        #define DOGLCD_MOSI                   17
481
+        #define DOGLCD_SCK                    23
482
+        #define DOGLCD_A0            LCD_PINS_DC
483 483
       #else
484
-        #define LCD_PINS_RS     16
485
-        #define LCD_PINS_ENABLE 17
486
-        #define LCD_PINS_D4     23
487
-        #define LCD_PINS_D5     25
488
-        #define LCD_PINS_D6     27
484
+        #define LCD_PINS_RS                   16
485
+        #define LCD_PINS_ENABLE               17
486
+        #define LCD_PINS_D4                   23
487
+        #define LCD_PINS_D5                   25
488
+        #define LCD_PINS_D6                   27
489 489
       #endif
490 490
 
491
-      #define LCD_PINS_D7       29
491
+      #define LCD_PINS_D7                     29
492 492
 
493 493
       #if DISABLED(NEWPANEL)
494
-        #define BEEPER_PIN      33
494
+        #define BEEPER_PIN                    33
495 495
       #endif
496 496
 
497 497
     #endif
@@ -499,10 +499,10 @@
499 499
     #if DISABLED(NEWPANEL)
500 500
       // Buttons attached to a shift register
501 501
       // Not wired yet
502
-      //#define SHIFT_CLK       38
503
-      //#define SHIFT_LD        42
504
-      //#define SHIFT_OUT       40
505
-      //#define SHIFT_EN        17
502
+      //#define SHIFT_CLK                     38
503
+      //#define SHIFT_LD                      42
504
+      //#define SHIFT_OUT                     40
505
+      //#define SHIFT_EN                      17
506 506
     #endif
507 507
 
508 508
   #endif
@@ -514,99 +514,99 @@
514 514
 
515 515
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
516 516
 
517
-      #define BEEPER_PIN        37
517
+      #define BEEPER_PIN                      37
518 518
 
519 519
       #if ENABLED(CR10_STOCKDISPLAY)
520
-        #define BTN_EN1         17
521
-        #define BTN_EN2         23
520
+        #define BTN_EN1                       17
521
+        #define BTN_EN2                       23
522 522
       #else
523
-        #define BTN_EN1         31
524
-        #define BTN_EN2         33
523
+        #define BTN_EN1                       31
524
+        #define BTN_EN2                       33
525 525
       #endif
526 526
 
527
-      #define BTN_ENC           35
527
+      #define BTN_ENC                         35
528 528
       #ifndef SD_DETECT_PIN
529
-        #define SD_DETECT_PIN   49
529
+        #define SD_DETECT_PIN                 49
530 530
       #endif
531 531
       #ifndef KILL_PIN
532
-        #define KILL_PIN        41
532
+        #define KILL_PIN                      41
533 533
       #endif
534 534
 
535 535
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
536
-        #define LCD_BACKLIGHT_PIN 39
536
+        #define LCD_BACKLIGHT_PIN             39
537 537
       #endif
538 538
 
539 539
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
540 540
 
541
-      #define BTN_EN1           64
542
-      #define BTN_EN2           59
543
-      #define BTN_ENC           63
544
-      #define SD_DETECT_PIN     42
541
+      #define BTN_EN1                         64
542
+      #define BTN_EN2                         59
543
+      #define BTN_ENC                         63
544
+      #define SD_DETECT_PIN                   42
545 545
 
546 546
     #elif ENABLED(LCD_I2C_PANELOLU2)
547 547
 
548
-      #define BTN_EN1           47
549
-      #define BTN_EN2           43
550
-      #define BTN_ENC           32
551
-      #define LCD_SDSS          SDSS
552
-      #define KILL_PIN          41
548
+      #define BTN_EN1                         47
549
+      #define BTN_EN2                         43
550
+      #define BTN_ENC                         32
551
+      #define LCD_SDSS                      SDSS
552
+      #define KILL_PIN                        41
553 553
 
554 554
     #elif ENABLED(LCD_I2C_VIKI)
555 555
 
556
-      #define BTN_EN1           40   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
557
-      #define BTN_EN2           42
558
-      #define BTN_ENC           -1
556
+      #define BTN_EN1                         40  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
557
+      #define BTN_EN2                         42
558
+      #define BTN_ENC                         -1
559 559
 
560
-      #define LCD_SDSS          SDSS
561
-      #define SD_DETECT_PIN     49
560
+      #define LCD_SDSS                      SDSS
561
+      #define SD_DETECT_PIN                   49
562 562
 
563 563
     #elif ANY(VIKI2, miniVIKI)
564 564
 
565
-      #define DOGLCD_CS         45
566
-      #define DOGLCD_A0         44
565
+      #define DOGLCD_CS                       45
566
+      #define DOGLCD_A0                       44
567 567
       #define LCD_SCREEN_ROT_180
568 568
 
569
-      #define BEEPER_PIN        33
570
-      #define STAT_LED_RED_PIN  32
571
-      #define STAT_LED_BLUE_PIN 35
569
+      #define BEEPER_PIN                      33
570
+      #define STAT_LED_RED_PIN                32
571
+      #define STAT_LED_BLUE_PIN               35
572 572
 
573
-      #define BTN_EN1           22
574
-      #define BTN_EN2            7
575
-      #define BTN_ENC           39
573
+      #define BTN_EN1                         22
574
+      #define BTN_EN2                          7
575
+      #define BTN_ENC                         39
576 576
 
577
-      #define SD_DETECT_PIN     -1   // Pin 49 for display SD interface, 72 for easy adapter board
578
-      #define KILL_PIN          31
577
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
578
+      #define KILL_PIN                        31
579 579
 
580 580
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
581 581
 
582
-      #define DOGLCD_CS         29
583
-      #define DOGLCD_A0         27
582
+      #define DOGLCD_CS                       29
583
+      #define DOGLCD_A0                       27
584 584
 
585
-      #define BEEPER_PIN        23
586
-      #define LCD_BACKLIGHT_PIN 33
585
+      #define BEEPER_PIN                      23
586
+      #define LCD_BACKLIGHT_PIN               33
587 587
 
588
-      #define BTN_EN1           35
589
-      #define BTN_EN2           37
590
-      #define BTN_ENC           31
588
+      #define BTN_EN1                         35
589
+      #define BTN_EN2                         37
590
+      #define BTN_ENC                         31
591 591
 
592
-      #define LCD_SDSS          SDSS
593
-      #define SD_DETECT_PIN     49
594
-      #define KILL_PIN          41
592
+      #define LCD_SDSS                      SDSS
593
+      #define SD_DETECT_PIN                   49
594
+      #define KILL_PIN                        41
595 595
 
596 596
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
597 597
 
598
-      #define BEEPER_PIN        37
599
-      #define BTN_ENC           35
600
-      #define SD_DETECT_PIN     49
598
+      #define BEEPER_PIN                      37
599
+      #define BTN_ENC                         35
600
+      #define SD_DETECT_PIN                   49
601 601
 
602 602
       #ifndef KILL_PIN
603
-        #define KILL_PIN        41
603
+        #define KILL_PIN                      41
604 604
       #endif
605 605
 
606
-      #if ENABLED(MKS_MINI_12864)   // Added in Marlin 1.1.6
606
+      #if ENABLED(MKS_MINI_12864)                 // Added in Marlin 1.1.6
607 607
 
608
-        #define DOGLCD_A0       27
609
-        #define DOGLCD_CS       25
608
+        #define DOGLCD_A0                     27
609
+        #define DOGLCD_CS                     25
610 610
 
611 611
         // GLCD features
612 612
         // Uncomment screen orientation
@@ -615,50 +615,50 @@
615 615
         //#define LCD_SCREEN_ROT_270
616 616
 
617 617
         // not connected to a pin
618
-        #define LCD_BACKLIGHT_PIN -1  // 65 (MKS mini12864 can't adjust backlight by software!)
618
+        #define LCD_BACKLIGHT_PIN             -1  // 65 (MKS mini12864 can't adjust backlight by software!)
619 619
 
620
-        #define BTN_EN1         31
621
-        #define BTN_EN2         33
620
+        #define BTN_EN1                       31
621
+        #define BTN_EN2                       33
622 622
 
623 623
       #elif ENABLED(FYSETC_MINI_12864)
624 624
 
625 625
         // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
626 626
 
627
-        #define DOGLCD_A0       16
628
-        #define DOGLCD_CS       17
627
+        #define DOGLCD_A0                     16
628
+        #define DOGLCD_CS                     17
629 629
 
630
-        #define BTN_EN1         33
631
-        #define BTN_EN2         31
630
+        #define BTN_EN1                       33
631
+        #define BTN_EN2                       31
632 632
 
633
-        //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
634
-                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
633
+        //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
634
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
635 635
 
636
-        #define LCD_RESET_PIN   23   // Must be high or open for LCD to operate normally.
636
+        #define LCD_RESET_PIN                 23  // Must be high or open for LCD to operate normally.
637 637
 
638 638
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
639 639
           #ifndef RGB_LED_R_PIN
640
-            #define RGB_LED_R_PIN 25
640
+            #define RGB_LED_R_PIN             25
641 641
           #endif
642 642
           #ifndef RGB_LED_G_PIN
643
-            #define RGB_LED_G_PIN 27
643
+            #define RGB_LED_G_PIN             27
644 644
           #endif
645 645
           #ifndef RGB_LED_B_PIN
646
-            #define RGB_LED_B_PIN 29
646
+            #define RGB_LED_B_PIN             29
647 647
           #endif
648 648
         #elif ENABLED(FYSETC_MINI_12864_2_1)
649
-          #define NEOPIXEL_PIN    25
649
+          #define NEOPIXEL_PIN                25
650 650
         #endif
651 651
 
652 652
       #endif
653 653
 
654 654
     #elif ENABLED(MINIPANEL)
655 655
 
656
-      #define BEEPER_PIN        42
656
+      #define BEEPER_PIN                      42
657 657
       // not connected to a pin
658
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
658
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
659 659
 
660
-      #define DOGLCD_A0         44
661
-      #define DOGLCD_CS         66
660
+      #define DOGLCD_A0                       44
661
+      #define DOGLCD_CS                       66
662 662
 
663 663
       // GLCD features
664 664
       // Uncomment screen orientation
@@ -666,16 +666,16 @@
666 666
       //#define LCD_SCREEN_ROT_180
667 667
       //#define LCD_SCREEN_ROT_270
668 668
 
669
-      #define BTN_EN1           40
670
-      #define BTN_EN2           63
671
-      #define BTN_ENC           59
669
+      #define BTN_EN1                         40
670
+      #define BTN_EN2                         63
671
+      #define BTN_ENC                         59
672 672
 
673
-      #define SD_DETECT_PIN     49
674
-      #define KILL_PIN          64
673
+      #define SD_DETECT_PIN                   49
674
+      #define KILL_PIN                        64
675 675
 
676 676
     #elif ENABLED(ZONESTAR_LCD)
677 677
 
678
-      #define ADC_KEYPAD_PIN    12
678
+      #define ADC_KEYPAD_PIN                  12
679 679
 
680 680
     #elif ENABLED(AZSMZ_12864)
681 681
 
@@ -684,22 +684,22 @@
684 684
     #else
685 685
 
686 686
       // Beeper on AUX-4
687
-      #define BEEPER_PIN        33
687
+      #define BEEPER_PIN                      33
688 688
 
689 689
       // Buttons are directly attached to AUX-2
690 690
       #if ENABLED(PANEL_ONE)
691
-        #define BTN_EN1         59   // AUX2 PIN 3
692
-        #define BTN_EN2         63   // AUX2 PIN 4
693
-        #define BTN_ENC         49   // AUX3 PIN 7
691
+        #define BTN_EN1                       59  // AUX2 PIN 3
692
+        #define BTN_EN2                       63  // AUX2 PIN 4
693
+        #define BTN_ENC                       49  // AUX3 PIN 7
694 694
       #else
695
-        #define BTN_EN1         37
696
-        #define BTN_EN2         35
697
-        #define BTN_ENC         31
695
+        #define BTN_EN1                       37
696
+        #define BTN_EN2                       35
697
+        #define BTN_ENC                       31
698 698
       #endif
699 699
 
700 700
       #if ENABLED(G3D_PANEL)
701
-        #define SD_DETECT_PIN   49
702
-        #define KILL_PIN        41
701
+        #define SD_DETECT_PIN                 49
702
+        #define KILL_PIN                      41
703 703
       #endif
704 704
 
705 705
     #endif
@@ -708,16 +708,16 @@
708 708
 #endif // HAS_SPI_LCD
709 709
 
710 710
 #if ENABLED(REPRAPWORLD_KEYPAD)
711
-  #define SHIFT_OUT        40
712
-  #define SHIFT_CLK        44
713
-  #define SHIFT_LD         42
711
+  #define SHIFT_OUT                           40
712
+  #define SHIFT_CLK                           44
713
+  #define SHIFT_LD                            42
714 714
   #ifndef BTN_EN1
715
-    #define BTN_EN1        64
715
+    #define BTN_EN1                           64
716 716
   #endif
717 717
   #ifndef BTN_EN2
718
-    #define BTN_EN2        59
718
+    #define BTN_EN2                           59
719 719
   #endif
720 720
   #ifndef BTN_ENC
721
-    #define BTN_ENC        63
721
+    #define BTN_ENC                           63
722 722
   #endif
723 723
 #endif

+ 13
- 13
Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h Parādīt failu

@@ -32,31 +32,31 @@
32 32
 //
33 33
 
34 34
 // Power outputs EFBF or EFBE
35
-#define MOSFET_D_PIN 7
35
+#define MOSFET_D_PIN                           7
36 36
 
37
-#define FIL_RUNOUT_PIN 2
37
+#define FIL_RUNOUT_PIN                         2
38 38
 #if NUM_RUNOUT_SENSORS > 1
39
-  #define FIL_RUNOUT2_PIN  15 // Creality CR-X can use dual runout sensors
39
+  #define FIL_RUNOUT2_PIN                     15  // Creality CR-X can use dual runout sensors
40 40
 #endif
41 41
 
42
-#define SD_DETECT_PIN      49  // Always define onboard SD detect
42
+#define SD_DETECT_PIN                         49  // Always define onboard SD detect
43 43
 
44
-#define PS_ON_PIN          40 // Used by CR2020 Industrial series
44
+#define PS_ON_PIN                             40  // Used by CR2020 Industrial series
45 45
 
46 46
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN)
47
-  #define CASE_LIGHT_PIN   65
47
+  #define CASE_LIGHT_PIN                      65
48 48
 #endif
49 49
 
50 50
 #include "pins_RAMPS.h"
51 51
 
52 52
 #ifndef BEEPER_PIN
53
-  #define BEEPER_PIN       37  // Always define beeper pin so Play Tone works with ExtUI
53
+  #define BEEPER_PIN                          37  // Always define beeper pin so Play Tone works with ExtUI
54 54
 #endif
55 55
 
56
-#define EXP1_PIN           65   // A11 - Used by CR2020 Industrial series for case
57
-#define EXP2_PIN           66   // A12
58
-#define EXP3_PIN           11   // SERVO0_PIN
59
-#define EXP4_PIN           12   // PS_ON_PIN
56
+#define EXP1_PIN                              65  // A11 - Used by CR2020 Industrial series for case
57
+#define EXP2_PIN                              66  // A12
58
+#define EXP3_PIN                              11  // SERVO0_PIN
59
+#define EXP4_PIN                              12  // PS_ON_PIN
60 60
 
61
-#define SUICIDE_PIN        12 // Used by CR2020 Industrial series
62
-#define SUICIDE_PIN_INVERTING true // Used by CR2020 Industrial series
61
+#define SUICIDE_PIN                           12  // Used by CR2020 Industrial series
62
+#define SUICIDE_PIN_INVERTING true                // Used by CR2020 Industrial series

+ 5
- 5
Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h Parādīt failu

@@ -27,12 +27,12 @@
27 27
 
28 28
 #define BOARD_INFO_NAME "Dagoma3D F5 RAMPS"
29 29
 
30
-#define X_STOP_PIN          2
31
-#define Y_STOP_PIN          3
32
-#define Z_STOP_PIN         15
33
-#define FIL_RUNOUT_PIN     39
30
+#define X_STOP_PIN                            2
31
+#define Y_STOP_PIN                            3
32
+#define Z_STOP_PIN                           15
33
+#define FIL_RUNOUT_PIN                       39
34 34
 
35
-#define ORIG_E0_AUTO_FAN_PIN 7
35
+#define ORIG_E0_AUTO_FAN_PIN                  7
36 36
 
37 37
 //
38 38
 // Import RAMPS 1.4 pins

+ 37
- 37
Marlin/src/pins/ramps/pins_RAMPS_OLD.h Parādīt failu

@@ -37,80 +37,80 @@
37 37
 //
38 38
 // Limit Switches
39 39
 //
40
-#define X_MIN_PIN           3
41
-#define X_MAX_PIN           2
42
-#define Y_MIN_PIN          16
43
-#define Y_MAX_PIN          17
44
-#define Z_MIN_PIN          18
45
-#define Z_MAX_PIN          19
40
+#define X_MIN_PIN                              3
41
+#define X_MAX_PIN                              2
42
+#define Y_MIN_PIN                             16
43
+#define Y_MAX_PIN                             17
44
+#define Z_MIN_PIN                             18
45
+#define Z_MAX_PIN                             19
46 46
 
47 47
 //
48 48
 // Z Probe (when not Z_MIN_PIN)
49 49
 //
50 50
 #ifndef Z_MIN_PROBE_PIN
51
-  #define Z_MIN_PROBE_PIN  19
51
+  #define Z_MIN_PROBE_PIN                     19
52 52
 #endif
53 53
 
54 54
 //
55 55
 // Steppers
56 56
 //
57
-#define X_STEP_PIN         26
58
-#define X_DIR_PIN          28
59
-#define X_ENABLE_PIN       24
57
+#define X_STEP_PIN                            26
58
+#define X_DIR_PIN                             28
59
+#define X_ENABLE_PIN                          24
60 60
 
61
-#define Y_STEP_PIN         38
62
-#define Y_DIR_PIN          40
63
-#define Y_ENABLE_PIN       36
61
+#define Y_STEP_PIN                            38
62
+#define Y_DIR_PIN                             40
63
+#define Y_ENABLE_PIN                          36
64 64
 
65
-#define Z_STEP_PIN         44
66
-#define Z_DIR_PIN          46
67
-#define Z_ENABLE_PIN       42
65
+#define Z_STEP_PIN                            44
66
+#define Z_DIR_PIN                             46
67
+#define Z_ENABLE_PIN                          42
68 68
 
69
-#define E0_STEP_PIN        32
70
-#define E0_DIR_PIN         34
71
-#define E0_ENABLE_PIN      30
69
+#define E0_STEP_PIN                           32
70
+#define E0_DIR_PIN                            34
71
+#define E0_ENABLE_PIN                         30
72 72
 
73 73
 //
74 74
 // Temperature Sensors
75 75
 //
76
-#define TEMP_0_PIN          2   // Analog Input
77
-#define TEMP_BED_PIN        1   // Analog Input
76
+#define TEMP_0_PIN                             2  // Analog Input
77
+#define TEMP_BED_PIN                           1  // Analog Input
78 78
 
79 79
 // SPI for Max6675 or Max31855 Thermocouple
80 80
 #if DISABLED(SDSUPPORT)
81
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
81
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
82 82
 #else
83
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
83
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
84 84
 #endif
85 85
 
86 86
 //
87 87
 // Heaters / Fans
88 88
 //
89 89
 #if ENABLED(RAMPS_V_1_0)
90
-  #define HEATER_0_PIN     12
91
-  #define HEATER_BED_PIN   -1
90
+  #define HEATER_0_PIN                        12
91
+  #define HEATER_BED_PIN                      -1
92 92
   #ifndef FAN_PIN
93
-    #define FAN_PIN        11
93
+    #define FAN_PIN                           11
94 94
   #endif
95
-#else // RAMPS_V_1_1 or RAMPS_V_1_2
96
-  #define HEATER_0_PIN     10
97
-  #define HEATER_BED_PIN    8
95
+#else                                             // RAMPS_V_1_1 or RAMPS_V_1_2
96
+  #define HEATER_0_PIN                        10
97
+  #define HEATER_BED_PIN                       8
98 98
   #ifndef FAN_PIN
99
-    #define FAN_PIN         9
99
+    #define FAN_PIN                            9
100 100
   #endif
101 101
 #endif
102 102
 
103 103
 //
104 104
 // Misc. Functions
105 105
 //
106
-#define SDPOWER_PIN        48
107
-#define SDSS               53
108
-#define LED_PIN            13
109
-#define CASE_LIGHT_PIN     45   // Hardware PWM
106
+#define SDPOWER_PIN                           48
107
+#define SDSS                                  53
108
+#define LED_PIN                               13
109
+#define CASE_LIGHT_PIN                        45  // Hardware PWM
110 110
 
111 111
 //
112 112
 // M3/M4/M5 - Spindle/Laser Control
113 113
 //
114
-#define SPINDLE_LASER_ENA_PIN    41   // Pullup or pulldown!
115
-#define SPINDLE_LASER_PWM_PIN    45   // Hardware PWM
116
-#define SPINDLE_DIR_PIN          43
114
+#define SPINDLE_LASER_ENA_PIN                 41  // Pullup or pulldown!
115
+#define SPINDLE_LASER_PWM_PIN                 45  // Hardware PWM
116
+#define SPINDLE_DIR_PIN                       43

+ 11
- 11
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h Parādīt failu

@@ -44,8 +44,8 @@
44 44
 
45 45
 #define BOARD_INFO_NAME "RAMPS 1.4 Plus"
46 46
 
47
-#define RAMPS_D8_PIN  10
48
-#define RAMPS_D10_PIN  8
47
+#define RAMPS_D8_PIN                          10
48
+#define RAMPS_D10_PIN                          8
49 49
 
50 50
 #include "pins_RAMPS.h"
51 51
 
@@ -60,13 +60,13 @@
60 60
 #undef E1_DIR_PIN
61 61
 #undef E1_ENABLE_PIN
62 62
 
63
-#define E0_STEP_PIN        36
64
-#define E0_DIR_PIN         34
65
-#define E0_ENABLE_PIN      30
63
+#define E0_STEP_PIN                           36
64
+#define E0_DIR_PIN                            34
65
+#define E0_ENABLE_PIN                         30
66 66
 
67
-#define E1_STEP_PIN        26
68
-#define E1_DIR_PIN         28
69
-#define E1_ENABLE_PIN      24
67
+#define E1_STEP_PIN                           26
68
+#define E1_DIR_PIN                            28
69
+#define E1_ENABLE_PIN                         24
70 70
 
71 71
 #undef X_CS_PIN
72 72
 #undef Y_CS_PIN
@@ -77,10 +77,10 @@
77 77
 #if ENABLED(ULTRA_LCD, REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
78 78
   #if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
79 79
     #undef LCD_PINS_RS
80
-    #define LCD_PINS_RS     42   // 3DYMY boards pin 16 -> 42
80
+    #define LCD_PINS_RS                       42  // 3DYMY boards pin 16 -> 42
81 81
     #undef LCD_PINS_ENABLE
82
-    #define LCD_PINS_ENABLE 44   // 3DYMY boards pin 17 -> 44
82
+    #define LCD_PINS_ENABLE                   44  // 3DYMY boards pin 17 -> 44
83 83
   #endif
84 84
   #undef LCD_PINS_D7
85
-  #define LCD_PINS_D7       53   // 3DYMY boards pin 29 -> 53
85
+  #define LCD_PINS_D7                         53  // 3DYMY boards pin 29 -> 53
86 86
 #endif

+ 30
- 30
Marlin/src/pins/ramps/pins_RIGIDBOARD.h Parādīt failu

@@ -33,15 +33,15 @@
33 33
 // Z Probe (when not Z_MIN_PIN)
34 34
 //
35 35
 #ifndef Z_MIN_PROBE_PIN
36
-  #define Z_MIN_PROBE_PIN  19    // Z-MAX pin J14 End Stops
36
+  #define Z_MIN_PROBE_PIN                     19  // Z-MAX pin J14 End Stops
37 37
 #endif
38 38
 
39 39
 //
40 40
 // MOSFET changes
41 41
 //
42
-#define RAMPS_D9_PIN        8   // FAN (by default)
43
-#define RAMPS_D10_PIN       9   // EXTRUDER 1
44
-#define MOSFET_D_PIN       12   // EXTRUDER 2 or FAN
42
+#define RAMPS_D9_PIN                           8  // FAN (by default)
43
+#define RAMPS_D10_PIN                          9  // EXTRUDER 1
44
+#define MOSFET_D_PIN                          12  // EXTRUDER 2 or FAN
45 45
 
46 46
 #include "pins_RAMPS.h"
47 47
 
@@ -52,18 +52,18 @@
52 52
 #undef E0_STEP_PIN
53 53
 #undef E0_DIR_PIN
54 54
 #undef E0_ENABLE_PIN
55
-#define E0_STEP_PIN        36
56
-#define E0_DIR_PIN         34
57
-#define E0_ENABLE_PIN      30
55
+#define E0_STEP_PIN                           36
56
+#define E0_DIR_PIN                            34
57
+#define E0_ENABLE_PIN                         30
58 58
 
59 59
 #undef E1_STEP_PIN
60 60
 #undef E1_DIR_PIN
61 61
 #undef E1_ENABLE_PIN
62
-#define E1_STEP_PIN        26
63
-#define E1_DIR_PIN         28
64
-#define E1_ENABLE_PIN      24
62
+#define E1_STEP_PIN                           26
63
+#define E1_DIR_PIN                            28
64
+#define E1_ENABLE_PIN                         24
65 65
 
66
-#define STEPPER_RESET_PIN  41   // Stepper drivers have a reset on RigidBot
66
+#define STEPPER_RESET_PIN                     41  // Stepper drivers have a reset on RigidBot
67 67
 
68 68
 //
69 69
 // Temperature Sensors
@@ -71,33 +71,33 @@
71 71
 #undef TEMP_0_PIN
72 72
 #undef TEMP_1_PIN
73 73
 #undef TEMP_BED_PIN
74
-#define TEMP_0_PIN         14   // Analog Input
75
-#define TEMP_1_PIN         13   // Analog Input
76
-#define TEMP_BED_PIN       15   // Analog Input
74
+#define TEMP_0_PIN                            14  // Analog Input
75
+#define TEMP_1_PIN                            13  // Analog Input
76
+#define TEMP_BED_PIN                          15  // Analog Input
77 77
 
78 78
 // SPI for Max6675 or Max31855 Thermocouple
79 79
 #undef MAX6675_SS_PIN
80 80
 #if DISABLED(SDSUPPORT)
81
-  #define MAX6675_SS_PIN   53   // Don't use pin 53 if there is even the remote possibility of using Display/SD card
81
+  #define MAX6675_SS_PIN                      53  // Don't use pin 53 if there is even the remote possibility of using Display/SD card
82 82
 #else
83
-  #define MAX6675_SS_PIN   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
83
+  #define MAX6675_SS_PIN                      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
84 84
 #endif
85 85
 
86 86
 //
87 87
 // Heaters / Fans
88 88
 //
89 89
 #undef HEATER_BED_PIN
90
-#define HEATER_BED_PIN     10
90
+#define HEATER_BED_PIN                        10
91 91
 
92 92
 #ifndef FAN_PIN
93
-  #define FAN_PIN           8   // Same as RAMPS_13_EEF
93
+  #define FAN_PIN                              8  // Same as RAMPS_13_EEF
94 94
 #endif
95 95
 
96 96
 //
97 97
 // Misc. Functions
98 98
 //
99 99
 #undef PS_ON_PIN
100
-#define PS_ON_PIN          -1
100
+#define PS_ON_PIN                             -1
101 101
 
102 102
 //
103 103
 // LCD / Controller
@@ -106,33 +106,33 @@
106 106
 #if ENABLED(RIGIDBOT_PANEL)
107 107
 
108 108
   #undef BEEPER_PIN
109
-  #define BEEPER_PIN -1
109
+  #define BEEPER_PIN                          -1
110 110
 
111 111
   // Direction buttons
112
-  #define BTN_UP           37
113
-  #define BTN_DWN          35
114
-  #define BTN_LFT          33
115
-  #define BTN_RT           32
112
+  #define BTN_UP                              37
113
+  #define BTN_DWN                             35
114
+  #define BTN_LFT                             33
115
+  #define BTN_RT                              32
116 116
 
117 117
   // 'R' button
118 118
   #undef BTN_ENC
119
-  #define BTN_ENC 31
119
+  #define BTN_ENC                             31
120 120
 
121 121
   // Disable encoder
122 122
   #undef BTN_EN1
123
-  #define BTN_EN1 -1
123
+  #define BTN_EN1                             -1
124 124
   #undef BTN_EN2
125
-  #define BTN_EN2 -1
125
+  #define BTN_EN2                             -1
126 126
 
127 127
   #undef SD_DETECT_PIN
128
-  #define SD_DETECT_PIN 22
128
+  #define SD_DETECT_PIN                       22
129 129
 
130 130
 #elif ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
131 131
 
132 132
   #undef SD_DETECT_PIN
133
-  #define SD_DETECT_PIN 22
133
+  #define SD_DETECT_PIN                       22
134 134
 
135 135
   #undef KILL_PIN
136
-  #define KILL_PIN 32
136
+  #define KILL_PIN                            32
137 137
 
138 138
 #endif

+ 6
- 6
Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h Parādīt failu

@@ -40,12 +40,12 @@
40 40
 #define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
41 41
 
42 42
 #define DAC_STEPPER_SENSE    0.05   // sense resistors on rigidboard stepper chips are .05 value
43
-#define DAC_STEPPER_ADDRESS  0
44
-#define DAC_STEPPER_MAX   4096   // was 5000 but max allowable value is actually 4096
45
-#define DAC_STEPPER_VREF     1   // internal Vref, gain 2x = 4.096V
46
-#define DAC_STEPPER_GAIN     1   // value of 1 here sets gain of 2
47
-#define DAC_DISABLE_PIN     42   // set low to enable DAC
48
-#define DAC_OR_ADDRESS    0x01
43
+#define DAC_STEPPER_ADDRESS                   0
44
+#define DAC_STEPPER_MAX                     4096  // was 5000 but max allowable value is actually 4096
45
+#define DAC_STEPPER_VREF                      1   // internal Vref, gain 2x = 4.096V
46
+#define DAC_STEPPER_GAIN                      1   // value of 1 here sets gain of 2
47
+#define DAC_DISABLE_PIN                      42   // set low to enable DAC
48
+#define DAC_OR_ADDRESS 0x01
49 49
 
50 50
 #ifndef DAC_MOTOR_CURRENT_DEFAULT
51 51
   #define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis

+ 9
- 9
Marlin/src/pins/ramps/pins_RL200.h Parādīt failu

@@ -37,16 +37,16 @@
37 37
   #error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200."
38 38
 #endif
39 39
 
40
-#define E0_STEP_PIN        26   // (RUMBA E1 pins)
41
-#define E0_DIR_PIN         25
42
-#define E0_ENABLE_PIN      27
40
+#define E0_STEP_PIN                          26   // (RUMBA E1 pins)
41
+#define E0_DIR_PIN                           25
42
+#define E0_ENABLE_PIN                        27
43 43
 
44
-#define E1_STEP_PIN        29   // (RUMBA E2 pins)
45
-#define E1_DIR_PIN         28
46
-#define E1_ENABLE_PIN      39
44
+#define E1_STEP_PIN                          29   // (RUMBA E2 pins)
45
+#define E1_DIR_PIN                           28
46
+#define E1_ENABLE_PIN                        39
47 47
 
48
-#define Z2_STEP_PIN        23   // (RUMBA E0 pins)
49
-#define Z2_DIR_PIN         22
50
-#define Z2_ENABLE_PIN      24
48
+#define Z2_STEP_PIN                          23   // (RUMBA E0 pins)
49
+#define Z2_DIR_PIN                           22
50
+#define Z2_ENABLE_PIN                        24
51 51
 
52 52
 #include "pins_RUMBA.h"

+ 79
- 79
Marlin/src/pins/ramps/pins_RUMBA.h Parādīt failu

@@ -41,56 +41,56 @@
41 41
 //
42 42
 // Servos
43 43
 //
44
-#define SERVO0_PIN          5
44
+#define SERVO0_PIN                             5
45 45
 
46 46
 //
47 47
 // Limit Switches
48 48
 //
49
-#define X_MIN_PIN          37
50
-#define X_MAX_PIN          36
51
-#define Y_MIN_PIN          35
52
-#define Y_MAX_PIN          34
53
-#define Z_MIN_PIN          33
54
-#define Z_MAX_PIN          32
49
+#define X_MIN_PIN                             37
50
+#define X_MAX_PIN                             36
51
+#define Y_MIN_PIN                             35
52
+#define Y_MAX_PIN                             34
53
+#define Z_MIN_PIN                             33
54
+#define Z_MAX_PIN                             32
55 55
 
56 56
 //
57 57
 // Z Probe (when not Z_MIN_PIN)
58 58
 //
59 59
 #ifndef Z_MIN_PROBE_PIN
60
-  #define Z_MIN_PROBE_PIN  32
60
+  #define Z_MIN_PROBE_PIN                     32
61 61
 #endif
62 62
 
63 63
 //
64 64
 // Steppers
65 65
 //
66
-#define X_STEP_PIN         17
67
-#define X_DIR_PIN          16
68
-#define X_ENABLE_PIN       48
66
+#define X_STEP_PIN                            17
67
+#define X_DIR_PIN                             16
68
+#define X_ENABLE_PIN                          48
69 69
 
70
-#define Y_STEP_PIN         54
71
-#define Y_DIR_PIN          47
72
-#define Y_ENABLE_PIN       55
70
+#define Y_STEP_PIN                            54
71
+#define Y_DIR_PIN                             47
72
+#define Y_ENABLE_PIN                          55
73 73
 
74
-#define Z_STEP_PIN         57
75
-#define Z_DIR_PIN          56
76
-#define Z_ENABLE_PIN       62
74
+#define Z_STEP_PIN                            57
75
+#define Z_DIR_PIN                             56
76
+#define Z_ENABLE_PIN                          62
77 77
 
78 78
 #ifndef E0_STEP_PIN
79
-  #define E0_STEP_PIN      23
80
-  #define E0_DIR_PIN       22
81
-  #define E0_ENABLE_PIN    24
79
+  #define E0_STEP_PIN                         23
80
+  #define E0_DIR_PIN                          22
81
+  #define E0_ENABLE_PIN                       24
82 82
 #endif
83 83
 
84 84
 #ifndef E1_STEP_PIN
85
-  #define E1_STEP_PIN      26
86
-  #define E1_DIR_PIN       25
87
-  #define E1_ENABLE_PIN    27
85
+  #define E1_STEP_PIN                         26
86
+  #define E1_DIR_PIN                          25
87
+  #define E1_ENABLE_PIN                       27
88 88
 #endif
89 89
 
90 90
 #if E1_STEP_PIN != 29
91
-  #define E2_STEP_PIN      29
92
-  #define E2_DIR_PIN       28
93
-  #define E2_ENABLE_PIN    39
91
+  #define E2_STEP_PIN                         29
92
+  #define E2_DIR_PIN                          28
93
+  #define E2_ENABLE_PIN                       39
94 94
 #endif
95 95
 
96 96
 //
@@ -98,134 +98,134 @@
98 98
 //
99 99
 #ifndef TEMP_0_PIN
100 100
   #if TEMP_SENSOR_0 == -1
101
-    #define TEMP_0_PIN      6   // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
101
+    #define TEMP_0_PIN                         6  // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
102 102
   #else
103
-    #define TEMP_0_PIN     15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
103
+    #define TEMP_0_PIN                        15  // Analog Input (default connector for thermistor *T0* on rumba board is used)
104 104
   #endif
105 105
 #endif
106 106
 
107 107
 #ifndef TEMP_1_PIN
108 108
   #if TEMP_SENSOR_1 == -1
109
-    #define TEMP_1_PIN      5   // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
109
+    #define TEMP_1_PIN                         5  // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
110 110
   #else
111
-    #define TEMP_1_PIN     14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
111
+    #define TEMP_1_PIN                        14  // Analog Input (default connector for thermistor *T1* on rumba board is used)
112 112
   #endif
113 113
 #endif
114 114
 
115 115
 #if TEMP_SENSOR_2 == -1
116
-  #define TEMP_2_PIN        7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
116
+  #define TEMP_2_PIN                           7  // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
117 117
 #else
118
-  #define TEMP_2_PIN       13   // Analog Input (default connector for thermistor *T2* on rumba board is used)
118
+  #define TEMP_2_PIN                          13  // Analog Input (default connector for thermistor *T2* on rumba board is used)
119 119
 #endif
120 120
 
121 121
 // Optional for extruder 4 or chamber:
122
-//#define TEMP_X_PIN         12   // Analog Input (default connector for thermistor *T3* on rumba board is used)
122
+//#define TEMP_X_PIN                          12  // Analog Input (default connector for thermistor *T3* on rumba board is used)
123 123
 
124 124
 #ifndef TEMP_CHAMBER_PIN
125
-  //#define TEMP_CHAMBER_PIN 12   // Analog Input (default connector for thermistor *T3* on rumba board is used)
125
+  //#define TEMP_CHAMBER_PIN                  12  // Analog Input (default connector for thermistor *T3* on rumba board is used)
126 126
 #endif
127 127
 
128 128
 #if TEMP_SENSOR_BED == -1
129
-  #define TEMP_BED_PIN      7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
129
+  #define TEMP_BED_PIN                         7  // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
130 130
 #else
131
-  #define TEMP_BED_PIN     11   // Analog Input (default connector for thermistor *THB* on rumba board is used)
131
+  #define TEMP_BED_PIN                        11  // Analog Input (default connector for thermistor *THB* on rumba board is used)
132 132
 #endif
133 133
 
134 134
 //
135 135
 // Heaters / Fans
136 136
 //
137
-#define HEATER_0_PIN        2
138
-#define HEATER_1_PIN        3
139
-#define HEATER_2_PIN        6
140
-#define HEATER_3_PIN        8
141
-#define HEATER_BED_PIN      9
137
+#define HEATER_0_PIN                           2
138
+#define HEATER_1_PIN                           3
139
+#define HEATER_2_PIN                           6
140
+#define HEATER_3_PIN                           8
141
+#define HEATER_BED_PIN                         9
142 142
 
143 143
 #ifndef FAN_PIN
144
-  #define FAN_PIN           7
144
+  #define FAN_PIN                              7
145 145
 #endif
146 146
 #ifndef FAN1_PIN
147
-  #define FAN1_PIN          8
147
+  #define FAN1_PIN                             8
148 148
 #endif
149 149
 
150 150
 //
151 151
 // Misc. Functions
152 152
 //
153
-#define LED_PIN            13
154
-#define PS_ON_PIN          45
155
-#define KILL_PIN           46
156
-#define CASE_LIGHT_PIN     45
153
+#define LED_PIN                               13
154
+#define PS_ON_PIN                             45
155
+#define KILL_PIN                              46
156
+#define CASE_LIGHT_PIN                        45
157 157
 
158 158
 //
159 159
 // M3/M4/M5 - Spindle/Laser Control
160 160
 //
161 161
 #ifndef SPINDLE_LASER_PWM_PIN
162
-  #define SPINDLE_LASER_PWM_PIN 4   // Hardware PWM. Pin 4 interrupts OC0* and OC1* always in use?
162
+  #define SPINDLE_LASER_PWM_PIN                4  // Hardware PWM. Pin 4 interrupts OC0* and OC1* always in use?
163 163
 #endif
164 164
 #ifndef SPINDLE_LASER_ENA_PIN
165
-  #define SPINDLE_LASER_ENA_PIN 14   // Pullup!
165
+  #define SPINDLE_LASER_ENA_PIN               14  // Pullup!
166 166
 #endif
167 167
 #ifndef SPINDLE_DIR_PIN
168
-  #define SPINDLE_DIR_PIN  15
168
+  #define SPINDLE_DIR_PIN                     15
169 169
 #endif
170 170
 
171 171
 //
172 172
 // LCD / Controller
173 173
 //
174 174
 #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
175
-  #define LCD_PINS_DC      38   // Set as output on init
176
-  #define LCD_PINS_RS      41   // Pull low for 1s to init
175
+  #define LCD_PINS_DC                         38  // Set as output on init
176
+  #define LCD_PINS_RS                         41  // Pull low for 1s to init
177 177
   // DOGM SPI LCD Support
178
-  #define DOGLCD_CS        19
179
-  #define DOGLCD_MOSI      42
180
-  #define DOGLCD_SCK       18
181
-  #define DOGLCD_A0        LCD_PINS_DC
178
+  #define DOGLCD_CS                           19
179
+  #define DOGLCD_MOSI                         42
180
+  #define DOGLCD_SCK                          18
181
+  #define DOGLCD_A0                  LCD_PINS_DC
182 182
 #elif ENABLED(FYSETC_MINI_12864)
183
-  #define DOGLCD_CS        42
184
-  #define DOGLCD_A0        19
185
-  #define DOGLCD_MOSI      51
186
-  #define DOGLCD_SCK       52
183
+  #define DOGLCD_CS                           42
184
+  #define DOGLCD_A0                           19
185
+  #define DOGLCD_MOSI                         51
186
+  #define DOGLCD_SCK                          52
187 187
 
188
-  //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
189
-                              //   results in LCD soft SPI mode 3, SD soft SPI mode 0
188
+  //#define FORCE_SOFT_SPI                        // Use this if default of hardware SPI causes display problems
189
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
190 190
 
191
-  #define LCD_RESET_PIN  18   // Must be high or open for LCD to operate normally.
191
+  #define LCD_RESET_PIN                       18  // Must be high or open for LCD to operate normally.
192 192
 
193 193
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
194 194
     #ifndef RGB_LED_R_PIN
195
-      #define RGB_LED_R_PIN 41
195
+      #define RGB_LED_R_PIN                   41
196 196
     #endif
197 197
     #ifndef RGB_LED_G_PIN
198
-      #define RGB_LED_G_PIN 38
198
+      #define RGB_LED_G_PIN                   38
199 199
     #endif
200 200
     #ifndef RGB_LED_B_PIN
201
-      #define RGB_LED_B_PIN 40
201
+      #define RGB_LED_B_PIN                   40
202 202
     #endif
203 203
   #elif ENABLED(FYSETC_MINI_12864_2_1)
204
-    #define NEOPIXEL_PIN   25
204
+    #define NEOPIXEL_PIN                      25
205 205
   #endif
206 206
 
207 207
 #else
208
-  #define LCD_PINS_RS      19
209
-  #define LCD_PINS_ENABLE  42
210
-  #define LCD_PINS_D4      18
211
-  #define LCD_PINS_D5      38
212
-  #define LCD_PINS_D6      41
208
+  #define LCD_PINS_RS                         19
209
+  #define LCD_PINS_ENABLE                     42
210
+  #define LCD_PINS_D4                         18
211
+  #define LCD_PINS_D5                         38
212
+  #define LCD_PINS_D6                         41
213 213
 #endif
214 214
 
215
-#define LCD_PINS_D7        40
215
+#define LCD_PINS_D7                           40
216 216
 
217 217
 //
218 218
 // Beeper, SD Card, Encoder
219 219
 //
220
-#define BEEPER_PIN         44
220
+#define BEEPER_PIN                            44
221 221
 
222 222
 #if ENABLED(SDSUPPORT)
223
-  #define SDSS             53
224
-  #define SD_DETECT_PIN    49
223
+  #define SDSS                                53
224
+  #define SD_DETECT_PIN                       49
225 225
 #endif
226 226
 
227 227
 #if ENABLED(NEWPANEL)
228
-  #define BTN_EN1          11
229
-  #define BTN_EN2          12
230
-  #define BTN_ENC          43
228
+  #define BTN_EN1                             11
229
+  #define BTN_EN2                             12
230
+  #define BTN_ENC                             43
231 231
 #endif

+ 7
- 7
Marlin/src/pins/ramps/pins_TANGO.h Parādīt failu

@@ -27,24 +27,24 @@
27 27
 
28 28
 #define BOARD_INFO_NAME "Tango"
29 29
 
30
-#define FAN_PIN             8
31
-#define FAN1_PIN           -1
30
+#define FAN_PIN                               8
31
+#define FAN1_PIN                             -1
32 32
 
33
-#define ORIG_E0_AUTO_FAN_PIN 7
33
+#define ORIG_E0_AUTO_FAN_PIN                  7
34 34
 
35 35
 #ifndef TEMP_0_PIN
36 36
   #if TEMP_SENSOR_0 == -1
37
-    #define TEMP_0_PIN     10   // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
37
+    #define TEMP_0_PIN                       10   // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
38 38
   #else
39
-    #define TEMP_0_PIN     15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
39
+    #define TEMP_0_PIN                       15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
40 40
   #endif
41 41
 #endif
42 42
 
43 43
 #ifndef TEMP_1_PIN
44 44
   #if TEMP_SENSOR_1 == -1
45
-    #define TEMP_1_PIN      9   // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
45
+    #define TEMP_1_PIN                        9   // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
46 46
   #else
47
-    #define TEMP_1_PIN     14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
47
+    #define TEMP_1_PIN                       14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
48 48
   #endif
49 49
 #endif
50 50
 

+ 31
- 31
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h Parādīt failu

@@ -31,10 +31,10 @@
31 31
 // Servos
32 32
 //
33 33
 #if MB(TRIGORILLA_14_11)
34
-  #define SERVO0_PIN        5
35
-  #define SERVO1_PIN        4
36
-  #define SERVO2_PIN       11
37
-  #define SERVO3_PIN        6
34
+  #define SERVO0_PIN                           5
35
+  #define SERVO1_PIN                           4
36
+  #define SERVO2_PIN                          11
37
+  #define SERVO3_PIN                           6
38 38
 #endif
39 39
 
40 40
 //
@@ -42,48 +42,48 @@
42 42
 //
43 43
 //#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
44 44
 #if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
45
-  #define X_MAX_PIN        43
46
-  #define Y_MIN_PIN        19
45
+  #define X_MAX_PIN                           43
46
+  #define Y_MIN_PIN                           19
47 47
 #endif
48 48
 
49 49
 // Labeled pins
50
-#define TRIGORILLA_HEATER_BED_PIN  8
51
-#define TRIGORILLA_HEATER_0_PIN   10
52
-#define TRIGORILLA_HEATER_1_PIN   45   // Anycubic Kossel: Unused
50
+#define TRIGORILLA_HEATER_BED_PIN              8
51
+#define TRIGORILLA_HEATER_0_PIN               10
52
+#define TRIGORILLA_HEATER_1_PIN               45  // Anycubic Kossel: Unused
53 53
 
54
-#define TRIGORILLA_FAN0_PIN        9   // Anycubic Kossel: Usually the part cooling fan
55
-#define TRIGORILLA_FAN1_PIN        7   // Anycubic Kossel: Unused
56
-#define TRIGORILLA_FAN2_PIN       44   // Anycubic Kossel: Hotend fan
54
+#define TRIGORILLA_FAN0_PIN                    9  // Anycubic Kossel: Usually the part cooling fan
55
+#define TRIGORILLA_FAN1_PIN                    7  // Anycubic Kossel: Unused
56
+#define TRIGORILLA_FAN2_PIN                   44  // Anycubic Kossel: Hotend fan
57 57
 
58 58
 // Remap MOSFET pins to common usages:
59 59
 
60
-#define RAMPS_D10_PIN    TRIGORILLA_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
60
+#define RAMPS_D10_PIN    TRIGORILLA_HEATER_0_PIN  // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
61 61
 
62
-#if HOTENDS > 1   // EEF and EEB
62
+#if HOTENDS > 1                                   // EEF and EEB
63 63
   #define RAMPS_D9_PIN   TRIGORILLA_HEATER_1_PIN
64 64
   #if !TEMP_SENSOR_BED
65 65
     // EEF
66
-    #define RAMPS_D8_PIN TRIGORILLA_FAN0_PIN
66
+    #define RAMPS_D8_PIN     TRIGORILLA_FAN0_PIN
67 67
   #else
68 68
     // EEB
69
-    #define RAMPS_D8_PIN TRIGORILLA_HEATER_BED_PIN
70
-    #define FAN_PIN      TRIGORILLA_FAN0_PIN    // Override pin 4 in pins_RAMPS.h
69
+    #define RAMPS_D8_PINTRIGORILLA_HEATER_BED_PIN
70
+    #define FAN_PIN          TRIGORILLA_FAN0_PIN  // Override pin 4 in pins_RAMPS.h
71 71
   #endif
72 72
 #elif TEMP_SENSOR_BED
73 73
   // EFB (Anycubic Kossel default)
74
-  #define RAMPS_D9_PIN   TRIGORILLA_FAN0_PIN
75
-  #define RAMPS_D8_PIN   TRIGORILLA_HEATER_BED_PIN
74
+  #define RAMPS_D9_PIN       TRIGORILLA_FAN0_PIN
75
+  #define RAMPS_D8_PINTRIGORILLA_HEATER_BED_PIN
76 76
 #else
77 77
   // EFF
78
-  #define RAMPS_D9_PIN   TRIGORILLA_FAN1_PIN
79
-  #define RAMPS_D8_PIN   TRIGORILLA_FAN0_PIN
78
+  #define RAMPS_D9_PIN       TRIGORILLA_FAN1_PIN
79
+  #define RAMPS_D8_PIN       TRIGORILLA_FAN0_PIN
80 80
 #endif
81 81
 
82
-#if HOTENDS > 1 || TEMP_SENSOR_BED      // EEF, EEB, EFB
83
-  #define FAN1_PIN       TRIGORILLA_FAN1_PIN
82
+#if HOTENDS > 1 || TEMP_SENSOR_BED                // EEF, EEB, EFB
83
+  #define FAN1_PIN           TRIGORILLA_FAN1_PIN
84 84
 #endif
85
-#define FAN2_PIN         TRIGORILLA_FAN2_PIN
86
-#define ORIG_E0_AUTO_FAN_PIN TRIGORILLA_FAN2_PIN  // Used in Anycubic Kossel example config
85
+#define FAN2_PIN             TRIGORILLA_FAN2_PIN
86
+#define ORIG_E0_AUTO_FAN_PINTRIGORILLA_FAN2_PIN   // Used in Anycubic Kossel example config
87 87
 
88 88
 #include "pins_RAMPS.h"
89 89
 
@@ -96,25 +96,25 @@
96 96
   // LCD Display output pins
97 97
   #if BOTH(NEWPANEL, PANEL_ONE)
98 98
     #undef LCD_PINS_D6
99
-    #define LCD_PINS_D6    57
99
+    #define LCD_PINS_D6                       57
100 100
   #endif
101 101
 
102 102
   // LCD Display input pins
103 103
   #if ENABLED(NEWPANEL)
104 104
     #if ANY(VIKI2, miniVIKI)
105 105
       #undef DOGLCD_A0
106
-      #define DOGLCD_A0    23
106
+      #define DOGLCD_A0                       23
107 107
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
108 108
       #undef BEEPER_PIN
109
-      #define BEEPER_PIN   33
109
+      #define BEEPER_PIN                      33
110 110
       #undef LCD_BACKLIGHT_PIN
111
-      #define LCD_BACKLIGHT_PIN 67
111
+      #define LCD_BACKLIGHT_PIN               67
112 112
     #endif
113 113
   #elif ENABLED(MINIPANEL)
114 114
     #undef BEEPER_PIN
115
-    #define BEEPER_PIN     33
115
+    #define BEEPER_PIN                        33
116 116
     #undef DOGLCD_A0
117
-    #define DOGLCD_A0      42
117
+    #define DOGLCD_A0                         42
118 118
   #endif
119 119
 
120 120
 #endif // HAS_SPI_LCD

+ 228
- 228
Marlin/src/pins/ramps/pins_TT_OSCAR.h Parādīt failu

@@ -34,70 +34,70 @@
34 34
 //
35 35
 // Servos
36 36
 //
37
-#define SERVO0_PIN         11
38
-#define SERVO1_PIN         12
39
-#define SERVO2_PIN          5
40
-#define SERVO3_PIN          4
37
+#define SERVO0_PIN                            11
38
+#define SERVO1_PIN                            12
39
+#define SERVO2_PIN                             5
40
+#define SERVO3_PIN                             4
41 41
 
42 42
 //
43 43
 // Limit Switches
44 44
 //
45
-#define X_MIN_PIN           3
46
-#define X_MAX_PIN           2
47
-#define Y_MIN_PIN          14
48
-#define Y_MAX_PIN          15
49
-#define Z_MIN_PIN          18
50
-#define Z_MAX_PIN          19
45
+#define X_MIN_PIN                              3
46
+#define X_MAX_PIN                              2
47
+#define Y_MIN_PIN                             14
48
+#define Y_MAX_PIN                             15
49
+#define Z_MIN_PIN                             18
50
+#define Z_MAX_PIN                             19
51 51
 
52 52
 //
53 53
 // Z Probe (when not Z_MIN_PIN)
54 54
 //
55 55
 #ifndef Z_MIN_PROBE_PIN
56
-  #define Z_MIN_PROBE_PIN  SERVO3_PIN
56
+  #define Z_MIN_PROBE_PIN             SERVO3_PIN
57 57
 #endif
58 58
 
59 59
 //
60 60
 // Steppers
61 61
 //
62
-#define X_STEP_PIN         54
63
-#define X_DIR_PIN          55
64
-#define X_ENABLE_PIN       38
65
-#define X_CS_PIN           57
66
-
67
-#define Y_STEP_PIN         60
68
-#define Y_DIR_PIN          61
69
-#define Y_ENABLE_PIN       56
70
-#define Y_CS_PIN           58
71
-
72
-#define Z_STEP_PIN         46
73
-#define Z_DIR_PIN          48
74
-#define Z_ENABLE_PIN       62
75
-#define Z_CS_PIN           53
76
-
77
-#define E0_STEP_PIN        26
78
-#define E0_DIR_PIN         28
79
-#define E0_ENABLE_PIN      24
80
-#define E0_CS_PIN          49
81
-
82
-#define E1_STEP_PIN        36
83
-#define E1_DIR_PIN         34
84
-#define E1_ENABLE_PIN      30
85
-#define E1_CS_PIN          E0_CS_PIN
86
-
87
-#define E2_STEP_PIN        63
88
-#define E2_DIR_PIN         22
89
-#define E2_ENABLE_PIN      59
90
-#define E2_CS_PIN          E0_CS_PIN
91
-
92
-#define E3_STEP_PIN        32
93
-#define E3_DIR_PIN         40
94
-#define E3_ENABLE_PIN      39
95
-#define E3_CS_PIN          E0_CS_PIN
96
-
97
-#define E4_STEP_PIN        43
98
-#define E4_DIR_PIN         42
99
-#define E4_ENABLE_PIN      47
100
-#define E4_CS_PIN          E0_CS_PIN
62
+#define X_STEP_PIN                            54
63
+#define X_DIR_PIN                             55
64
+#define X_ENABLE_PIN                          38
65
+#define X_CS_PIN                              57
66
+
67
+#define Y_STEP_PIN                            60
68
+#define Y_DIR_PIN                             61
69
+#define Y_ENABLE_PIN                          56
70
+#define Y_CS_PIN                              58
71
+
72
+#define Z_STEP_PIN                            46
73
+#define Z_DIR_PIN                             48
74
+#define Z_ENABLE_PIN                          62
75
+#define Z_CS_PIN                              53
76
+
77
+#define E0_STEP_PIN                           26
78
+#define E0_DIR_PIN                            28
79
+#define E0_ENABLE_PIN                         24
80
+#define E0_CS_PIN                             49
81
+
82
+#define E1_STEP_PIN                           36
83
+#define E1_DIR_PIN                            34
84
+#define E1_ENABLE_PIN                         30
85
+#define E1_CS_PIN                      E0_CS_PIN
86
+
87
+#define E2_STEP_PIN                           63
88
+#define E2_DIR_PIN                            22
89
+#define E2_ENABLE_PIN                         59
90
+#define E2_CS_PIN                      E0_CS_PIN
91
+
92
+#define E3_STEP_PIN                           32
93
+#define E3_DIR_PIN                            40
94
+#define E3_ENABLE_PIN                         39
95
+#define E3_CS_PIN                      E0_CS_PIN
96
+
97
+#define E4_STEP_PIN                           43
98
+#define E4_DIR_PIN                            42
99
+#define E4_ENABLE_PIN                         47
100
+#define E4_CS_PIN                      E0_CS_PIN
101 101
 
102 102
 #if HAS_TMC_UART
103 103
   /**
@@ -122,34 +122,34 @@
122 122
   // Software serial
123 123
   //
124 124
 
125
-  #define X_SERIAL_TX_PIN  -1   // 59
126
-  #define X_SERIAL_RX_PIN  -1   // 63
127
-  #define X2_SERIAL_TX_PIN -1
128
-  #define X2_SERIAL_RX_PIN -1
129
-
130
-  #define Y_SERIAL_TX_PIN  -1   // 64
131
-  #define Y_SERIAL_RX_PIN  -1   // 40
132
-  #define Y2_SERIAL_TX_PIN -1
133
-  #define Y2_SERIAL_RX_PIN -1
134
-
135
-  #define Z_SERIAL_TX_PIN  -1   // 44
136
-  #define Z_SERIAL_RX_PIN  -1   // 42
137
-  #define Z2_SERIAL_TX_PIN -1
138
-  #define Z2_SERIAL_RX_PIN -1
139
-
140
-  #define E0_SERIAL_TX_PIN -1   // 66
141
-  #define E0_SERIAL_RX_PIN -1   // 65
142
-  #define E1_SERIAL_TX_PIN -1
143
-  #define E1_SERIAL_RX_PIN -1
144
-  #define E2_SERIAL_TX_PIN -1
145
-  #define E2_SERIAL_RX_PIN -1
146
-  #define E3_SERIAL_TX_PIN -1
147
-  #define E3_SERIAL_RX_PIN -1
148
-  #define E4_SERIAL_TX_PIN -1
149
-  #define E4_SERIAL_RX_PIN -1
150
-  #define E5_SERIAL_RX_PIN -1
151
-  #define E6_SERIAL_RX_PIN -1
152
-  #define E7_SERIAL_RX_PIN -1
125
+  #define X_SERIAL_TX_PIN                     -1  // 59
126
+  #define X_SERIAL_RX_PIN                     -1  // 63
127
+  #define X2_SERIAL_TX_PIN                    -1
128
+  #define X2_SERIAL_RX_PIN                    -1
129
+
130
+  #define Y_SERIAL_TX_PIN                     -1  // 64
131
+  #define Y_SERIAL_RX_PIN                     -1  // 40
132
+  #define Y2_SERIAL_TX_PIN                    -1
133
+  #define Y2_SERIAL_RX_PIN                    -1
134
+
135
+  #define Z_SERIAL_TX_PIN                     -1  // 44
136
+  #define Z_SERIAL_RX_PIN                     -1  // 42
137
+  #define Z2_SERIAL_TX_PIN                    -1
138
+  #define Z2_SERIAL_RX_PIN                    -1
139
+
140
+  #define E0_SERIAL_TX_PIN                    -1  // 66
141
+  #define E0_SERIAL_RX_PIN                    -1  // 65
142
+  #define E1_SERIAL_TX_PIN                    -1
143
+  #define E1_SERIAL_RX_PIN                    -1
144
+  #define E2_SERIAL_TX_PIN                    -1
145
+  #define E2_SERIAL_RX_PIN                    -1
146
+  #define E3_SERIAL_TX_PIN                    -1
147
+  #define E3_SERIAL_RX_PIN                    -1
148
+  #define E4_SERIAL_TX_PIN                    -1
149
+  #define E4_SERIAL_RX_PIN                    -1
150
+  #define E5_SERIAL_RX_PIN                    -1
151
+  #define E6_SERIAL_RX_PIN                    -1
152
+  #define E7_SERIAL_RX_PIN                    -1
153 153
 #endif
154 154
 
155 155
 //
@@ -170,16 +170,16 @@
170 170
 //
171 171
 // Temperature Sensors
172 172
 //
173
-#define TEMP_0_PIN         13
174
-#define TEMP_1_PIN         15
175
-#define TEMP_2_PIN         10
176
-#define TEMP_3_PIN         11
177
-#define TEMP_BED_PIN       14
173
+#define TEMP_0_PIN                            13
174
+#define TEMP_1_PIN                            15
175
+#define TEMP_2_PIN                            10
176
+#define TEMP_3_PIN                            11
177
+#define TEMP_BED_PIN                          14
178 178
 
179 179
 #if TEMP_SENSOR_CHAMBER > 0
180
-  #define TEMP_CHAMBER_PIN 12
180
+  #define TEMP_CHAMBER_PIN                    12
181 181
 #else
182
-  #define TEMP_4_PIN       12
182
+  #define TEMP_4_PIN                          12
183 183
 #endif
184 184
 
185 185
 // SPI for Max6675 or Max31855 Thermocouple
@@ -192,50 +192,50 @@
192 192
 //
193 193
 // Heaters / Fans
194 194
 //
195
-#define HEATER_0_PIN       10
196
-#define HEATER_1_PIN        7
197
-#define HEATER_2_PIN       44
198
-#define HEATER_BED_PIN      8
195
+#define HEATER_0_PIN                          10
196
+#define HEATER_1_PIN                           7
197
+#define HEATER_2_PIN                          44
198
+#define HEATER_BED_PIN                         8
199 199
 
200
-#define FAN_PIN             9
200
+#define FAN_PIN                                9
201 201
 
202 202
 #if EXTRUDERS >= 5
203
-  #define HEATER_4_PIN      6
203
+  #define HEATER_4_PIN                         6
204 204
 #else
205
-  #define FAN1_PIN          6
205
+  #define FAN1_PIN                             6
206 206
 #endif
207 207
 
208 208
 #if EXTRUDERS >= 4
209
-  #define HEATER_3_PIN     45
209
+  #define HEATER_3_PIN                        45
210 210
 #else
211
-  #define FAN2_PIN         45
211
+  #define FAN2_PIN                            45
212 212
 #endif
213 213
 
214 214
 //
215 215
 // Misc. Functions
216 216
 //
217
-#define SDSS               53
218
-#define LED_PIN            13
217
+#define SDSS                                  53
218
+#define LED_PIN                               13
219 219
 
220 220
 //#ifndef FILWIDTH_PIN
221 221
 //  #define FILWIDTH_PIN      5   // Analog Input
222 222
 //#endif
223 223
 
224 224
 // DIO 4 (Servos plug) for the runout sensor.
225
-//#define FIL_RUNOUT_PIN   SERVO3_PIN
225
+//#define FIL_RUNOUT_PIN              SERVO3_PIN
226 226
 
227 227
 #ifndef PS_ON_PIN
228
-  #define PS_ON_PIN        12
228
+  #define PS_ON_PIN                           12
229 229
 #endif
230 230
 
231 231
 //
232 232
 // Case Light
233 233
 //
234 234
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
235
-  #if !NUM_SERVOS               // Prefer the servo connector
236
-    #define CASE_LIGHT_PIN  6   // Hardware PWM
237
-  #elif HAS_FREE_AUX2_PINS      // Try to use AUX 2
238
-    #define CASE_LIGHT_PIN 44   // Hardware PWM
235
+  #if !NUM_SERVOS                                 // Prefer the servo connector
236
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
237
+  #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
238
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
239 239
   #endif
240 240
 #endif
241 241
 
@@ -243,14 +243,14 @@
243 243
 // M3/M4/M5 - Spindle/Laser Control
244 244
 //
245 245
 #if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
246
-  #if !NUM_SERVOS                         // Prefer the servo connector
247
-    #define SPINDLE_LASER_ENABLE_PIN  4   // Pullup or pulldown!
248
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
249
-    #define SPINDLE_DIR_PIN           5
250
-  #elif HAS_FREE_AUX2_PINS                // Try to use AUX 2
251
-    #define SPINDLE_LASER_ENABLE_PIN 40   // Pullup or pulldown!
252
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
253
-    #define SPINDLE_DIR_PIN          65
246
+  #if !NUM_SERVOS                                 // Prefer the servo connector
247
+    #define SPINDLE_LASER_ENABLE_PIN           4  // Pullup or pulldown!
248
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
249
+    #define SPINDLE_DIR_PIN                    5
250
+  #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
251
+    #define SPINDLE_LASER_ENABLE_PIN          40  // Pullup or pulldown!
252
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
253
+    #define SPINDLE_DIR_PIN                   65
254 254
   #endif
255 255
 #endif
256 256
 
@@ -278,63 +278,63 @@
278 278
   //
279 279
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
280 280
 
281
-    #define LCD_PINS_RS    49   // CS chip select /SS chip slave select
282
-    #define LCD_PINS_ENABLE 51  // SID (MOSI)
283
-    #define LCD_PINS_D4    52   // SCK (CLK) clock
281
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
282
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
283
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
284 284
 
285 285
   #elif BOTH(NEWPANEL, PANEL_ONE)
286 286
 
287
-    #define LCD_PINS_RS    40
288
-    #define LCD_PINS_ENABLE 42
289
-    #define LCD_PINS_D4    65
290
-    #define LCD_PINS_D5    66
291
-    #define LCD_PINS_D6    44
292
-    #define LCD_PINS_D7    64
287
+    #define LCD_PINS_RS                       40
288
+    #define LCD_PINS_ENABLE                   42
289
+    #define LCD_PINS_D4                       65
290
+    #define LCD_PINS_D5                       66
291
+    #define LCD_PINS_D6                       44
292
+    #define LCD_PINS_D7                       64
293 293
 
294 294
   #elif ENABLED(ZONESTAR_LCD)
295 295
 
296
-    #define LCD_PINS_RS    64
297
-    #define LCD_PINS_ENABLE 44
298
-    #define LCD_PINS_D4    63
299
-    #define LCD_PINS_D5    40
300
-    #define LCD_PINS_D6    42
301
-    #define LCD_PINS_D7    65
302
-    #define ADC_KEYPAD_PIN 12
296
+    #define LCD_PINS_RS                       64
297
+    #define LCD_PINS_ENABLE                   44
298
+    #define LCD_PINS_D4                       63
299
+    #define LCD_PINS_D5                       40
300
+    #define LCD_PINS_D6                       42
301
+    #define LCD_PINS_D7                       65
302
+    #define ADC_KEYPAD_PIN                    12
303 303
 
304 304
   #else
305 305
 
306 306
     #if ENABLED(CR10_STOCKDISPLAY)
307 307
 
308
-      #define LCD_PINS_RS  27
309
-      #define LCD_PINS_ENABLE 29
310
-      #define LCD_PINS_D4  25
308
+      #define LCD_PINS_RS                     27
309
+      #define LCD_PINS_ENABLE                 29
310
+      #define LCD_PINS_D4                     25
311 311
 
312 312
       #if DISABLED(NEWPANEL)
313
-        #define BEEPER_PIN 37
313
+        #define BEEPER_PIN                    37
314 314
       #endif
315 315
 
316 316
     #else
317 317
 
318 318
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
319
-        #define LCD_PINS_DC 25   // Set as output on init
320
-        #define LCD_PINS_RS 27   // Pull low for 1s to init
319
+        #define LCD_PINS_DC                   25  // Set as output on init
320
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
321 321
         // DOGM SPI LCD Support
322
-        #define DOGLCD_CS  16
323
-        #define DOGLCD_MOSI 17
324
-        #define DOGLCD_SCK 23
325
-        #define DOGLCD_A0  LCD_PINS_DC
322
+        #define DOGLCD_CS                     16
323
+        #define DOGLCD_MOSI                   17
324
+        #define DOGLCD_SCK                    23
325
+        #define DOGLCD_A0            LCD_PINS_DC
326 326
       #else
327
-        #define LCD_PINS_RS 16
328
-        #define LCD_PINS_ENABLE 17
329
-        #define LCD_PINS_D4 23
330
-        #define LCD_PINS_D5 25
331
-        #define LCD_PINS_D6 27
327
+        #define LCD_PINS_RS                   16
328
+        #define LCD_PINS_ENABLE               17
329
+        #define LCD_PINS_D4                   23
330
+        #define LCD_PINS_D5                   25
331
+        #define LCD_PINS_D6                   27
332 332
       #endif
333 333
 
334
-      #define LCD_PINS_D7  29
334
+      #define LCD_PINS_D7                     29
335 335
 
336 336
       #if DISABLED(NEWPANEL)
337
-        #define BEEPER_PIN 33
337
+        #define BEEPER_PIN                    33
338 338
       #endif
339 339
 
340 340
     #endif
@@ -342,10 +342,10 @@
342 342
     #if DISABLED(NEWPANEL)
343 343
       // Buttons attached to a shift register
344 344
       // Not wired yet
345
-      //#define SHIFT_CLK    38
346
-      //#define SHIFT_LD     42
347
-      //#define SHIFT_OUT    40
348
-      //#define SHIFT_EN     17
345
+      //#define SHIFT_CLK                     38
346
+      //#define SHIFT_LD                      42
347
+      //#define SHIFT_OUT                     40
348
+      //#define SHIFT_EN                      17
349 349
     #endif
350 350
 
351 351
   #endif
@@ -357,155 +357,155 @@
357 357
 
358 358
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
359 359
 
360
-      #define BEEPER_PIN   37
360
+      #define BEEPER_PIN                      37
361 361
 
362 362
       #if ENABLED(CR10_STOCKDISPLAY)
363
-        #define BTN_EN1    17
364
-        #define BTN_EN2    23
363
+        #define BTN_EN1                       17
364
+        #define BTN_EN2                       23
365 365
       #else
366
-        #define BTN_EN1    31
367
-        #define BTN_EN2    33
366
+        #define BTN_EN1                       31
367
+        #define BTN_EN2                       33
368 368
       #endif
369 369
 
370
-      #define BTN_ENC      35
371
-      #define SD_DETECT_PIN 49
372
-      //#define KILL_PIN     41
370
+      #define BTN_ENC                         35
371
+      #define SD_DETECT_PIN                   49
372
+      //#define KILL_PIN                      41
373 373
 
374 374
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
375
-        #define LCD_BACKLIGHT_PIN 39
375
+        #define LCD_BACKLIGHT_PIN             39
376 376
       #endif
377 377
 
378 378
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
379 379
 
380
-      #define BTN_EN1      64
381
-      #define BTN_EN2      59
382
-      #define BTN_ENC      63
383
-      #define SD_DETECT_PIN 42
380
+      #define BTN_EN1                         64
381
+      #define BTN_EN2                         59
382
+      #define BTN_ENC                         63
383
+      #define SD_DETECT_PIN                   42
384 384
 
385 385
     #elif ENABLED(LCD_I2C_PANELOLU2)
386 386
 
387
-      #define BTN_EN1      47
388
-      #define BTN_EN2      43
389
-      #define BTN_ENC      32
390
-      #define LCD_SDSS     53
391
-      //#define KILL_PIN     41
387
+      #define BTN_EN1                         47
388
+      #define BTN_EN2                         43
389
+      #define BTN_ENC                         32
390
+      #define LCD_SDSS                        53
391
+      //#define KILL_PIN                      41
392 392
 
393 393
     #elif ENABLED(LCD_I2C_VIKI)
394 394
 
395
-      #define BTN_EN1      22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
396
-      #define BTN_EN2       7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
397
-      #define BTN_ENC      -1
395
+      #define BTN_EN1                         22  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
396
+      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
397
+      #define BTN_ENC                         -1
398 398
 
399
-      #define LCD_SDSS     53
400
-      #define SD_DETECT_PIN 49
399
+      #define LCD_SDSS                        53
400
+      #define SD_DETECT_PIN                   49
401 401
 
402 402
     #elif EITHER(VIKI2, miniVIKI)
403 403
 
404
-      #define DOGLCD_CS    45
405
-      #define DOGLCD_A0    44
404
+      #define DOGLCD_CS                       45
405
+      #define DOGLCD_A0                       44
406 406
       #define LCD_SCREEN_ROT_180
407 407
 
408
-      #define BEEPER_PIN   33
409
-      #define STAT_LED_RED_PIN  32
410
-      #define STAT_LED_BLUE_PIN 35
408
+      #define BEEPER_PIN                      33
409
+      #define STAT_LED_RED_PIN                32
410
+      #define STAT_LED_BLUE_PIN               35
411 411
 
412
-      #define BTN_EN1      22
413
-      #define BTN_EN2       7
414
-      #define BTN_ENC      39
412
+      #define BTN_EN1                         22
413
+      #define BTN_EN2                          7
414
+      #define BTN_ENC                         39
415 415
 
416
-      #define SDSS         53
417
-      #define SD_DETECT_PIN -1   // Pin 49 for display SD interface, 72 for easy adapter board
418
-      //#define KILL_PIN     31
416
+      #define SDSS                            53
417
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
418
+      //#define KILL_PIN                      31
419 419
 
420 420
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
421 421
 
422
-      #define DOGLCD_CS    29
423
-      #define DOGLCD_A0    27
422
+      #define DOGLCD_CS                       29
423
+      #define DOGLCD_A0                       27
424 424
 
425
-      #define BEEPER_PIN   23
426
-      #define LCD_BACKLIGHT_PIN 33
425
+      #define BEEPER_PIN                      23
426
+      #define LCD_BACKLIGHT_PIN               33
427 427
 
428
-      #define BTN_EN1      35
429
-      #define BTN_EN2      37
430
-      #define BTN_ENC      31
428
+      #define BTN_EN1                         35
429
+      #define BTN_EN2                         37
430
+      #define BTN_ENC                         31
431 431
 
432
-      #define LCD_SDSS     53
433
-      #define SD_DETECT_PIN 49
434
-      //#define KILL_PIN     41
432
+      #define LCD_SDSS                        53
433
+      #define SD_DETECT_PIN                   49
434
+      //#define KILL_PIN                      41
435 435
 
436 436
     #elif ENABLED(MKS_MINI_12864)
437 437
 
438
-      #define DOGLCD_A0    27
439
-      #define DOGLCD_CS    25
438
+      #define DOGLCD_A0                       27
439
+      #define DOGLCD_CS                       25
440 440
 
441 441
       // GLCD features
442
-      //#define LCD_CONTRAST_INIT 190
442
+      //#define LCD_CONTRAST_INIT            190
443 443
       // Uncomment screen orientation
444 444
       //#define LCD_SCREEN_ROT_90
445 445
       //#define LCD_SCREEN_ROT_180
446 446
       //#define LCD_SCREEN_ROT_270
447 447
 
448
-      #define BEEPER_PIN   37
448
+      #define BEEPER_PIN                      37
449 449
 
450
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
450
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
451 451
 
452
-      #define BTN_EN1      31
453
-      #define BTN_EN2      33
454
-      #define BTN_ENC      35
455
-      //#define SDSS         53
456
-      #define SD_DETECT_PIN 49
457
-      //#define KILL_PIN     64
452
+      #define BTN_EN1                         31
453
+      #define BTN_EN2                         33
454
+      #define BTN_ENC                         35
455
+      //#define SDSS                          53
456
+      #define SD_DETECT_PIN                   49
457
+      //#define KILL_PIN                      64
458 458
 
459 459
     #elif ENABLED(MINIPANEL)
460 460
 
461
-      #define BEEPER_PIN   42
461
+      #define BEEPER_PIN                      42
462 462
       // not connected to a pin
463
-      #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
463
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
464 464
 
465
-      #define DOGLCD_A0    44
466
-      #define DOGLCD_CS    66
465
+      #define DOGLCD_A0                       44
466
+      #define DOGLCD_CS                       66
467 467
 
468 468
       // GLCD features
469
-      //#define LCD_CONTRAST_INIT 190
469
+      //#define LCD_CONTRAST_INIT            190
470 470
       // Uncomment screen orientation
471 471
       //#define LCD_SCREEN_ROT_90
472 472
       //#define LCD_SCREEN_ROT_180
473 473
       //#define LCD_SCREEN_ROT_270
474 474
 
475
-      #define BTN_EN1      40
476
-      #define BTN_EN2      63
477
-      #define BTN_ENC      59
475
+      #define BTN_EN1                         40
476
+      #define BTN_EN2                         63
477
+      #define BTN_ENC                         59
478 478
 
479
-      #define SDSS         53
480
-      #define SD_DETECT_PIN 49
481
-      //#define KILL_PIN     64
479
+      #define SDSS                            53
480
+      #define SD_DETECT_PIN                   49
481
+      //#define KILL_PIN                      64
482 482
 
483 483
     #else
484 484
 
485 485
       // Beeper on AUX-4
486
-      #define BEEPER_PIN   33
486
+      #define BEEPER_PIN                      33
487 487
 
488 488
       // Buttons are directly attached to AUX-2
489 489
       #if ENABLED(REPRAPWORLD_KEYPAD)
490
-        #define SHIFT_OUT  40
491
-        #define SHIFT_CLK  44
492
-        #define SHIFT_LD   42
493
-        #define BTN_EN1    64
494
-        #define BTN_EN2    59
495
-        #define BTN_ENC    63
490
+        #define SHIFT_OUT                     40
491
+        #define SHIFT_CLK                     44
492
+        #define SHIFT_LD                      42
493
+        #define BTN_EN1                       64
494
+        #define BTN_EN2                       59
495
+        #define BTN_ENC                       63
496 496
       #elif ENABLED(PANEL_ONE)
497
-        #define BTN_EN1    59   // AUX2 PIN 3
498
-        #define BTN_EN2    63   // AUX2 PIN 4
499
-        #define BTN_ENC    49   // AUX3 PIN 7
497
+        #define BTN_EN1                       59  // AUX2 PIN 3
498
+        #define BTN_EN2                       63  // AUX2 PIN 4
499
+        #define BTN_ENC                       49  // AUX3 PIN 7
500 500
       #else
501
-        #define BTN_EN1    37
502
-        #define BTN_EN2    35
503
-        #define BTN_ENC    31
501
+        #define BTN_EN1                       37
502
+        #define BTN_EN2                       35
503
+        #define BTN_ENC                       31
504 504
       #endif
505 505
 
506 506
       #if ENABLED(G3D_PANEL)
507
-        #define SD_DETECT_PIN 49
508
-        //#define KILL_PIN     41
507
+        #define SD_DETECT_PIN                 49
508
+        //#define KILL_PIN                    41
509 509
       #endif
510 510
 
511 511
     #endif

+ 50
- 50
Marlin/src/pins/ramps/pins_ULTIMAIN_2.h Parādīt failu

@@ -44,97 +44,97 @@
44 44
 //
45 45
 // Limit Switches
46 46
 //
47
-#define X_STOP_PIN         22
48
-#define Y_STOP_PIN         26
49
-#define Z_STOP_PIN         29
47
+#define X_STOP_PIN                            22
48
+#define Y_STOP_PIN                            26
49
+#define Z_STOP_PIN                            29
50 50
 
51 51
 //
52 52
 // Steppers
53 53
 //
54
-#define X_STEP_PIN         25
55
-#define X_DIR_PIN          23
56
-#define X_ENABLE_PIN       27
54
+#define X_STEP_PIN                            25
55
+#define X_DIR_PIN                             23
56
+#define X_ENABLE_PIN                          27
57 57
 
58
-#define Y_STEP_PIN         32
59
-#define Y_DIR_PIN          33
60
-#define Y_ENABLE_PIN       31
58
+#define Y_STEP_PIN                            32
59
+#define Y_DIR_PIN                             33
60
+#define Y_ENABLE_PIN                          31
61 61
 
62
-#define Z_STEP_PIN         35
63
-#define Z_DIR_PIN          36
64
-#define Z_ENABLE_PIN       34
62
+#define Z_STEP_PIN                            35
63
+#define Z_DIR_PIN                             36
64
+#define Z_ENABLE_PIN                          34
65 65
 
66
-#define E0_STEP_PIN        42
67
-#define E0_DIR_PIN         43
68
-#define E0_ENABLE_PIN      37
66
+#define E0_STEP_PIN                           42
67
+#define E0_DIR_PIN                            43
68
+#define E0_ENABLE_PIN                         37
69 69
 
70
-#define E1_STEP_PIN        49
71
-#define E1_DIR_PIN         47
72
-#define E1_ENABLE_PIN      48
70
+#define E1_STEP_PIN                           49
71
+#define E1_DIR_PIN                            47
72
+#define E1_ENABLE_PIN                         48
73 73
 
74
-#define MOTOR_CURRENT_PWM_XY_PIN 44
75
-#define MOTOR_CURRENT_PWM_Z_PIN 45
76
-#define MOTOR_CURRENT_PWM_E_PIN 46
74
+#define MOTOR_CURRENT_PWM_XY_PIN              44
75
+#define MOTOR_CURRENT_PWM_Z_PIN               45
76
+#define MOTOR_CURRENT_PWM_E_PIN               46
77 77
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
78 78
 #ifndef MOTOR_CURRENT_PWM_RANGE
79
-  #define MOTOR_CURRENT_PWM_RANGE 2000
79
+  #define MOTOR_CURRENT_PWM_RANGE            2000
80 80
 #endif
81 81
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
82 82
 
83 83
 //
84 84
 // Temperature Sensors
85 85
 //
86
-#define TEMP_0_PIN          8   // Analog Input
87
-#define TEMP_1_PIN          9   // Analog Input
88
-#define TEMP_BED_PIN       10   // Analog Input
86
+#define TEMP_0_PIN                             8  // Analog Input
87
+#define TEMP_1_PIN                             9  // Analog Input
88
+#define TEMP_BED_PIN                          10  // Analog Input
89 89
 
90 90
 //
91 91
 // Heaters / Fans
92 92
 //
93
-#define HEATER_0_PIN        2
94
-#define HEATER_1_PIN        3
95
-#define HEATER_BED_PIN      4
93
+#define HEATER_0_PIN                           2
94
+#define HEATER_1_PIN                           3
95
+#define HEATER_BED_PIN                         4
96 96
 
97 97
 #ifndef FAN_PIN
98
-  #define FAN_PIN           7
98
+  #define FAN_PIN                              7
99 99
 #endif
100 100
 
101
-#define ORIG_E0_AUTO_FAN_PIN 77
101
+#define ORIG_E0_AUTO_FAN_PIN                  77
102 102
 
103 103
 //
104 104
 // Misc. Functions
105 105
 //
106
-#define SDSS               53
107
-#define SD_DETECT_PIN      39
108
-#define LED_PIN             8
109
-#define SAFETY_TRIGGERED_PIN     28   // PIN to detect the safety circuit has triggered
110
-#define MAIN_VOLTAGE_MEASURE_PIN 14   // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
106
+#define SDSS                                  53
107
+#define SD_DETECT_PIN                         39
108
+#define LED_PIN                                8
109
+#define SAFETY_TRIGGERED_PIN                  28  // PIN to detect the safety circuit has triggered
110
+#define MAIN_VOLTAGE_MEASURE_PIN              14  // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
111 111
 
112 112
 //
113 113
 // LCD / Controller
114 114
 //
115
-#define BEEPER_PIN         18
115
+#define BEEPER_PIN                            18
116 116
 
117
-#define LCD_PINS_RS        20
118
-#define LCD_PINS_ENABLE    15
119
-#define LCD_PINS_D4        14
120
-#define LCD_PINS_D5        21
121
-#define LCD_PINS_D6         5
122
-#define LCD_PINS_D7         6
117
+#define LCD_PINS_RS                           20
118
+#define LCD_PINS_ENABLE                       15
119
+#define LCD_PINS_D4                           14
120
+#define LCD_PINS_D5                           21
121
+#define LCD_PINS_D6                            5
122
+#define LCD_PINS_D7                            6
123 123
 
124 124
 // Buttons are directly attached
125
-#define BTN_EN1            40
126
-#define BTN_EN2            41
127
-#define BTN_ENC            19
125
+#define BTN_EN1                               40
126
+#define BTN_EN2                               41
127
+#define BTN_ENC                               19
128 128
 
129 129
 //
130 130
 // M3/M4/M5 - Spindle/Laser Control
131 131
 //
132
-#if HAS_CUTTER   // use the LED_PIN for spindle speed control or case light
132
+#if HAS_CUTTER                                    // use the LED_PIN for spindle speed control or case light
133 133
   #undef LED_PIN
134
-  #define SPINDLE_DIR_PIN          16
135
-  #define SPINDLE_LASER_ENA_PIN    17   // Pullup!
136
-  #define SPINDLE_LASER_PWM_PIN     8   // Hardware PWM
134
+  #define SPINDLE_DIR_PIN                     16
135
+  #define SPINDLE_LASER_ENA_PIN               17  // Pullup!
136
+  #define SPINDLE_LASER_PWM_PIN                8  // Hardware PWM
137 137
 #else
138 138
   #undef LED_PIN
139
-  #define CASE_LIGHT_PIN            8
139
+  #define CASE_LIGHT_PIN                       8
140 140
 #endif

+ 61
- 61
Marlin/src/pins/ramps/pins_ULTIMAKER.h Parādīt failu

@@ -44,114 +44,114 @@
44 44
 //
45 45
 // Servos
46 46
 //
47
-#define SERVO0_PIN         11
47
+#define SERVO0_PIN                            11
48 48
 
49 49
 //
50 50
 // Limit Switches
51 51
 //
52
-#define X_MIN_PIN          22
53
-#define X_MAX_PIN          24
54
-#define Y_MIN_PIN          26
55
-#define Y_MAX_PIN          28
56
-#define Z_MIN_PIN          30
57
-#define Z_MAX_PIN          32
52
+#define X_MIN_PIN                             22
53
+#define X_MAX_PIN                             24
54
+#define Y_MIN_PIN                             26
55
+#define Y_MAX_PIN                             28
56
+#define Z_MIN_PIN                             30
57
+#define Z_MAX_PIN                             32
58 58
 
59 59
 //
60 60
 // Z Probe (when not Z_MIN_PIN)
61 61
 //
62 62
 #ifndef Z_MIN_PROBE_PIN
63
-  #define Z_MIN_PROBE_PIN  32
63
+  #define Z_MIN_PROBE_PIN                     32
64 64
 #endif
65 65
 
66 66
 //
67 67
 // Steppers
68 68
 //
69
-#define X_STEP_PIN         25
70
-#define X_DIR_PIN          23
71
-#define X_ENABLE_PIN       27
69
+#define X_STEP_PIN                            25
70
+#define X_DIR_PIN                             23
71
+#define X_ENABLE_PIN                          27
72 72
 
73
-#define Y_STEP_PIN         31
74
-#define Y_DIR_PIN          33
75
-#define Y_ENABLE_PIN       29
73
+#define Y_STEP_PIN                            31
74
+#define Y_DIR_PIN                             33
75
+#define Y_ENABLE_PIN                          29
76 76
 
77
-#define Z_STEP_PIN         37
78
-#define Z_DIR_PIN          39
79
-#define Z_ENABLE_PIN       35
77
+#define Z_STEP_PIN                            37
78
+#define Z_DIR_PIN                             39
79
+#define Z_ENABLE_PIN                          35
80 80
 
81
-#define E0_STEP_PIN        43
82
-#define E0_DIR_PIN         45
83
-#define E0_ENABLE_PIN      41
81
+#define E0_STEP_PIN                           43
82
+#define E0_DIR_PIN                            45
83
+#define E0_ENABLE_PIN                         41
84 84
 
85
-#define E1_STEP_PIN        49
86
-#define E1_DIR_PIN         47
87
-#define E1_ENABLE_PIN      48
85
+#define E1_STEP_PIN                           49
86
+#define E1_DIR_PIN                            47
87
+#define E1_ENABLE_PIN                         48
88 88
 
89 89
 //
90 90
 // Temperature Sensors
91 91
 //
92
-#define TEMP_0_PIN          8   // Analog Input
93
-#define TEMP_1_PIN          9   // Analog Input
94
-#define TEMP_BED_PIN       10   // Analog Input
92
+#define TEMP_0_PIN                             8  // Analog Input
93
+#define TEMP_1_PIN                             9  // Analog Input
94
+#define TEMP_BED_PIN                          10  // Analog Input
95 95
 
96 96
 //
97 97
 // Heaters / Fans
98 98
 //
99
-#define HEATER_0_PIN        2
100
-#define HEATER_1_PIN        3
101
-#define HEATER_BED_PIN      4
99
+#define HEATER_0_PIN                           2
100
+#define HEATER_1_PIN                           3
101
+#define HEATER_BED_PIN                         4
102 102
 
103 103
 #ifndef FAN_PIN
104
-  #define FAN_PIN           7
104
+  #define FAN_PIN                              7
105 105
 #endif
106 106
 
107 107
 //
108 108
 // Misc. Functions
109 109
 //
110
-#define SDSS               53
111
-#define LED_PIN            13
112
-#define PS_ON_PIN          12
113
-#define SUICIDE_PIN        54   // PIN that has to be turned on right after start, to keep power flowing.
114
-#define CASE_LIGHT_PIN      8
110
+#define SDSS                                  53
111
+#define LED_PIN                               13
112
+#define PS_ON_PIN                             12
113
+#define SUICIDE_PIN                           54  // PIN that has to be turned on right after start, to keep power flowing.
114
+#define CASE_LIGHT_PIN                         8
115 115
 
116 116
 //
117 117
 // LCD / Controller
118 118
 //
119 119
 #if HAS_SPI_LCD
120 120
 
121
-  #define BEEPER_PIN 18
121
+  #define BEEPER_PIN                          18
122 122
 
123 123
   #if ENABLED(NEWPANEL)
124 124
 
125
-    #define LCD_PINS_RS    20
126
-    #define LCD_PINS_ENABLE 17
127
-    #define LCD_PINS_D4    16
128
-    #define LCD_PINS_D5    21
129
-    #define LCD_PINS_D6     5
130
-    #define LCD_PINS_D7     6
125
+    #define LCD_PINS_RS                       20
126
+    #define LCD_PINS_ENABLE                   17
127
+    #define LCD_PINS_D4                       16
128
+    #define LCD_PINS_D5                       21
129
+    #define LCD_PINS_D6                        5
130
+    #define LCD_PINS_D7                        6
131 131
 
132 132
     // Buttons directly attached
133
-    #define BTN_EN1 40
134
-    #define BTN_EN2 42
135
-    #define BTN_ENC 19
133
+    #define BTN_EN1                           40
134
+    #define BTN_EN2                           42
135
+    #define BTN_ENC                           19
136 136
 
137
-    #define SD_DETECT_PIN 38
137
+    #define SD_DETECT_PIN                     38
138 138
 
139
-  #else // !NEWPANEL - Old style panel with shift register
139
+  #else                                           // !NEWPANEL - Old style panel with shift register
140 140
 
141 141
     // Buttons attached to a shift register
142
-    #define SHIFT_CLK 38
143
-    #define SHIFT_LD 42
144
-    #define SHIFT_OUT 40
145
-    #define SHIFT_EN 17
142
+    #define SHIFT_CLK                         38
143
+    #define SHIFT_LD                          42
144
+    #define SHIFT_OUT                         40
145
+    #define SHIFT_EN                          17
146 146
 
147
-    #define LCD_PINS_RS 16
148
-    #define LCD_PINS_ENABLE 5
149
-    #define LCD_PINS_D4 6
150
-    #define LCD_PINS_D5 21
151
-    #define LCD_PINS_D6 20
152
-    #define LCD_PINS_D7 19
147
+    #define LCD_PINS_RS                       16
148
+    #define LCD_PINS_ENABLE                    5
149
+    #define LCD_PINS_D4                        6
150
+    #define LCD_PINS_D5                       21
151
+    #define LCD_PINS_D6                       20
152
+    #define LCD_PINS_D7                       19
153 153
 
154
-    #define SD_DETECT_PIN -1
154
+    #define SD_DETECT_PIN                     -1
155 155
 
156 156
   #endif // !NEWPANEL
157 157
 
@@ -160,6 +160,6 @@
160 160
 //
161 161
 // M3/M4/M5 - Spindle/Laser Control
162 162
 //
163
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
164
-#define SPINDLE_LASER_ENA_PIN    10   // Pullup!
165
-#define SPINDLE_DIR_PIN          11   // use the EXP3 PWM header
163
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
164
+#define SPINDLE_LASER_ENA_PIN                 10  // Pullup!
165
+#define SPINDLE_DIR_PIN                       11  // use the EXP3 PWM header

+ 86
- 86
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h Parādīt failu

@@ -80,134 +80,134 @@
80 80
 // Limit Switches
81 81
 //
82 82
 #if ENABLED(BOARD_REV_1_1_TO_1_3)
83
-  #define X_MIN_PIN        15   // SW1
84
-  #define X_MAX_PIN        14   // SW2
85
-  #define Y_MIN_PIN        17   // SW3
86
-  #define Y_MAX_PIN        16   // SW4
87
-  #define Z_MIN_PIN        19   // SW5
88
-  #define Z_MAX_PIN        18   // SW6
83
+  #define X_MIN_PIN                           15  // SW1
84
+  #define X_MAX_PIN                           14  // SW2
85
+  #define Y_MIN_PIN                           17  // SW3
86
+  #define Y_MAX_PIN                           16  // SW4
87
+  #define Z_MIN_PIN                           19  // SW5
88
+  #define Z_MAX_PIN                           18  // SW6
89 89
 #endif
90 90
 
91 91
 #if ENABLED(BOARD_REV_1_0)
92 92
   #if HAS_CUTTER
93
-    #define X_STOP_PIN     13   // SW1  (didn't change) - also has a useable hardware PWM
94
-    #define Y_STOP_PIN     12   // SW2
95
-    #define Z_STOP_PIN     11   // SW3
93
+    #define X_STOP_PIN                        13  // SW1  (didn't change) - also has a useable hardware PWM
94
+    #define Y_STOP_PIN                        12  // SW2
95
+    #define Z_STOP_PIN                        11  // SW3
96 96
   #else
97
-    #define X_MIN_PIN      13   // SW1
98
-    #define X_MAX_PIN      12   // SW2
99
-    #define Y_MIN_PIN      11   // SW3
100
-    #define Y_MAX_PIN      10   // SW4
101
-    #define Z_MIN_PIN       9   // SW5
102
-    #define Z_MAX_PIN       8   // SW6
97
+    #define X_MIN_PIN                         13  // SW1
98
+    #define X_MAX_PIN                         12  // SW2
99
+    #define Y_MIN_PIN                         11  // SW3
100
+    #define Y_MAX_PIN                         10  // SW4
101
+    #define Z_MIN_PIN                          9  // SW5
102
+    #define Z_MAX_PIN                          8  // SW6
103 103
   #endif
104 104
 #endif
105 105
 
106 106
 #if ENABLED(BOARD_REV_1_5)
107
-  #define X_MIN_PIN        22
108
-  #define X_MAX_PIN        24
109
-  #define Y_MIN_PIN        26
110
-  #define Y_MAX_PIN        28
111
-  #define Z_MIN_PIN        30
112
-  #define Z_MAX_PIN        32
107
+  #define X_MIN_PIN                           22
108
+  #define X_MAX_PIN                           24
109
+  #define Y_MIN_PIN                           26
110
+  #define Y_MAX_PIN                           28
111
+  #define Z_MIN_PIN                           30
112
+  #define Z_MAX_PIN                           32
113 113
 #endif
114 114
 
115 115
 //
116 116
 // Z Probe (when not Z_MIN_PIN)
117 117
 //
118 118
 #if !defined(Z_MIN_PROBE_PIN) && !(HAS_CUTTER && ENABLED(BOARD_REV_1_0))
119
-  #define Z_MIN_PROBE_PIN  Z_MAX_PIN
119
+  #define Z_MIN_PROBE_PIN              Z_MAX_PIN
120 120
 #endif
121 121
 
122 122
 //
123 123
 // Steppers
124 124
 //
125
-#define X_STEP_PIN         25
126
-#define X_DIR_PIN          23
127
-#define X_ENABLE_PIN       27
125
+#define X_STEP_PIN                            25
126
+#define X_DIR_PIN                             23
127
+#define X_ENABLE_PIN                          27
128 128
 
129
-#define Y_STEP_PIN         31
130
-#define Y_DIR_PIN          33
131
-#define Y_ENABLE_PIN       29
129
+#define Y_STEP_PIN                            31
130
+#define Y_DIR_PIN                             33
131
+#define Y_ENABLE_PIN                          29
132 132
 
133
-#define Z_STEP_PIN         37
134
-#define Z_DIR_PIN          39
135
-#define Z_ENABLE_PIN       35
133
+#define Z_STEP_PIN                            37
134
+#define Z_DIR_PIN                             39
135
+#define Z_ENABLE_PIN                          35
136 136
 
137 137
 #if HAS_CUTTER && ENABLED(BOARD_REV_1_1_TO_1_3) && EXTRUDERS == 1
138 138
   // Move E0 to the spare and get Spindle/Laser signals from E0
139
-  #define E0_STEP_PIN      49
140
-  #define E0_DIR_PIN       47
141
-  #define E0_ENABLE_PIN    48
139
+  #define E0_STEP_PIN                         49
140
+  #define E0_DIR_PIN                          47
141
+  #define E0_ENABLE_PIN                       48
142 142
 #else
143
-  #define E0_STEP_PIN      43
144
-  #define E0_DIR_PIN       45
145
-  #define E0_ENABLE_PIN    41
143
+  #define E0_STEP_PIN                         43
144
+  #define E0_DIR_PIN                          45
145
+  #define E0_ENABLE_PIN                       41
146 146
 
147
-  #define E1_STEP_PIN      49
148
-  #define E1_DIR_PIN       47
149
-  #define E1_ENABLE_PIN    48
147
+  #define E1_STEP_PIN                         49
148
+  #define E1_DIR_PIN                          47
149
+  #define E1_ENABLE_PIN                       48
150 150
 #endif
151 151
 
152 152
 //
153 153
 // Temperature Sensors
154 154
 //
155
-#define TEMP_0_PIN          8   // Analog Input
156
-#define TEMP_1_PIN          1   // Analog Input
155
+#define TEMP_0_PIN                             8  // Analog Input
156
+#define TEMP_1_PIN                             1  // Analog Input
157 157
 
158 158
 //
159 159
 // Heaters / Fans
160 160
 //
161
-#define HEATER_0_PIN        2
162
-//#define HEATER_1_PIN        3   // used for case light   Rev A said "1"
163
-#define HEATER_BED_PIN      4
161
+#define HEATER_0_PIN                           2
162
+//#define HEATER_1_PIN                         3  // used for case light   Rev A said "1"
163
+#define HEATER_BED_PIN                         4
164 164
 
165 165
 //
166 166
 // LCD / Controller
167 167
 //
168 168
 #if ANY(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
169 169
 
170
-  #define LCD_PINS_RS      24
171
-  #define LCD_PINS_ENABLE  22
172
-  #define LCD_PINS_D4      36
173
-  #define LCD_PINS_D5      34
174
-  #define LCD_PINS_D6      32
175
-  #define LCD_PINS_D7      30
170
+  #define LCD_PINS_RS                         24
171
+  #define LCD_PINS_ENABLE                     22
172
+  #define LCD_PINS_D4                         36
173
+  #define LCD_PINS_D5                         34
174
+  #define LCD_PINS_D6                         32
175
+  #define LCD_PINS_D7                         30
176 176
 
177 177
 #elif ENABLED(BOARD_REV_1_5, ULTRA_LCD)
178 178
 
179
-  #define BEEPER_PIN       18
179
+  #define BEEPER_PIN                          18
180 180
 
181 181
   #if ENABLED(NEWPANEL)
182 182
 
183
-    #define LCD_PINS_RS    20
184
-    #define LCD_PINS_ENABLE 17
185
-    #define LCD_PINS_D4    16
186
-    #define LCD_PINS_D5    21
187
-    #define LCD_PINS_D6     5
188
-    #define LCD_PINS_D7     6
183
+    #define LCD_PINS_RS                       20
184
+    #define LCD_PINS_ENABLE                   17
185
+    #define LCD_PINS_D4                       16
186
+    #define LCD_PINS_D5                       21
187
+    #define LCD_PINS_D6                        5
188
+    #define LCD_PINS_D7                        6
189 189
 
190 190
     // Buttons directly attached
191
-    #define BTN_EN1        40
192
-    #define BTN_EN2        42
193
-    #define BTN_ENC        19
191
+    #define BTN_EN1                           40
192
+    #define BTN_EN2                           42
193
+    #define BTN_ENC                           19
194 194
 
195
-    #define SD_DETECT_PIN  38
195
+    #define SD_DETECT_PIN                     38
196 196
 
197
-  #else // !NEWPANEL - Old style panel with shift register
197
+  #else                                           // !NEWPANEL - Old style panel with shift register
198 198
 
199 199
     // Buttons attached to a shift register
200
-    #define SHIFT_CLK      38
201
-    #define SHIFT_LD       42
202
-    #define SHIFT_OUT      40
203
-    #define SHIFT_EN       17
204
-
205
-    #define LCD_PINS_RS    16
206
-    #define LCD_PINS_ENABLE 5
207
-    #define LCD_PINS_D4     6
208
-    #define LCD_PINS_D5    21
209
-    #define LCD_PINS_D6    20
210
-    #define LCD_PINS_D7    19
200
+    #define SHIFT_CLK                         38
201
+    #define SHIFT_LD                          42
202
+    #define SHIFT_OUT                         40
203
+    #define SHIFT_EN                          17
204
+
205
+    #define LCD_PINS_RS                       16
206
+    #define LCD_PINS_ENABLE                    5
207
+    #define LCD_PINS_D4                        6
208
+    #define LCD_PINS_D5                       21
209
+    #define LCD_PINS_D6                       20
210
+    #define LCD_PINS_D7                       19
211 211
 
212 212
   #endif // !NEWPANEL
213 213
 
@@ -217,17 +217,17 @@
217 217
 // case light  - see spindle section for more info on available hardware PWMs
218 218
 //
219 219
 #if !PIN_EXISTS(CASE_LIGHT) && ENABLED(BOARD_REV_1_5)
220
-  #define CASE_LIGHT_PIN        7   // use PWM -  MUST BE HARDWARE PWM
220
+  #define CASE_LIGHT_PIN                       7  // use PWM -  MUST BE HARDWARE PWM
221 221
 #endif
222 222
 
223 223
 //
224 224
 // M3/M4/M5 - Spindle/Laser Control
225 225
 //
226 226
 #if HAS_CUTTER
227
-  #if EITHER(BOARD_REV_1_0, BOARD_REV_1_5) // Use the last three SW positions
228
-    #define SPINDLE_DIR_PIN          10   // 1.0: SW4  1.5: EXP3-6 ("10")
229
-    #define SPINDLE_LASER_PWM_PIN     9   // 1.0: SW5  1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
230
-    #define SPINDLE_LASER_ENA_PIN     8   // 1.0: SW6  1.5: EXP3-8 ( "8") .. Pin should have a pullup!
227
+  #if EITHER(BOARD_REV_1_0, BOARD_REV_1_5)        // Use the last three SW positions
228
+    #define SPINDLE_DIR_PIN                   10  // 1.0: SW4  1.5: EXP3-6 ("10")
229
+    #define SPINDLE_LASER_PWM_PIN              9  // 1.0: SW5  1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
230
+    #define SPINDLE_LASER_ENA_PIN              8  // 1.0: SW6  1.5: EXP3-8 ( "8") .. Pin should have a pullup!
231 231
   #elif ENABLED(BOARD_REV_1_1_TO_1_3)
232 232
     /**
233 233
      * Only four hardware PWMs physically connected to anything on these boards:
@@ -241,14 +241,14 @@
241 241
      * They have an LED and resistor pullup to +24V which could damage 3.3V-5V ICs.
242 242
      */
243 243
     #if EXTRUDERS == 1
244
-      #define SPINDLE_DIR_PIN          43
245
-      #define SPINDLE_LASER_PWM_PIN    45   // Hardware PWM
246
-      #define SPINDLE_LASER_ENA_PIN    41   // Pullup!
247
-    #elif TEMP_SENSOR_BED == 0  // Can't use E0 so see if HEATER_BED_PIN is available
244
+      #define SPINDLE_DIR_PIN                 43
245
+      #define SPINDLE_LASER_PWM_PIN           45  // Hardware PWM
246
+      #define SPINDLE_LASER_ENA_PIN           41  // Pullup!
247
+    #elif TEMP_SENSOR_BED == 0                    // Can't use E0 so see if HEATER_BED_PIN is available
248 248
       #undef HEATER_BED_PIN
249
-      #define SPINDLE_DIR_PIN          38   // Probably pin 4 on 10 pin connector closest to the E0 socket
250
-      #define SPINDLE_LASER_PWM_PIN     4   // Hardware PWM - Special precautions usually needed.
251
-      #define SPINDLE_LASER_ENA_PIN    40   // Pullup! (Probably pin 6 on the 10-pin
249
+      #define SPINDLE_DIR_PIN                 38  // Probably pin 4 on 10 pin connector closest to the E0 socket
250
+      #define SPINDLE_LASER_PWM_PIN            4  // Hardware PWM - Special precautions usually needed.
251
+      #define SPINDLE_LASER_ENA_PIN           40  // Pullup! (Probably pin 6 on the 10-pin
252 252
                                             // connector closest to the E0 socket)
253 253
     #endif
254 254
   #endif

+ 5
- 5
Marlin/src/pins/ramps/pins_VORON.h Parādīt failu

@@ -28,7 +28,7 @@
28 28
 
29 29
 #define BOARD_INFO_NAME "VORON Design v2"
30 30
 
31
-#define RAMPS_D8_PIN       11
31
+#define RAMPS_D8_PIN                         11
32 32
 
33 33
 #include "pins_RAMPS.h"
34 34
 
@@ -36,10 +36,10 @@
36 36
 // Heaters / Fans
37 37
 //
38 38
 #undef FAN_PIN
39
-#define FAN_PIN             5   // Using the pin for the controller fan since controller fan is always on.
40
-#define CONTROLLER_FAN_PIN  8
41
-#define ORIG_E0_AUTO_FAN_PIN 6  // Servo pin 6 for E3D Fan
42
-#define ORIG_E1_AUTO_FAN_PIN 6  // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
39
+#define FAN_PIN                               5   // Using the pin for the controller fan since controller fan is always on.
40
+#define CONTROLLER_FAN_PIN                    8
41
+#define ORIG_E0_AUTO_FAN_PIN                  6   // Servo pin 6 for E3D Fan
42
+#define ORIG_E1_AUTO_FAN_PIN                  6   // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
43 43
 
44 44
 //
45 45
 // LCDs and Controllers

+ 23
- 23
Marlin/src/pins/ramps/pins_ZRIB_V20.h Parādīt failu

@@ -28,24 +28,24 @@
28 28
 
29 29
 #include "pins_MKS_GEN_13.h"
30 30
 
31
-#define ZRIB_V20_D6_PIN      6   // Fan
32
-#define ZRIB_V20_D9_PIN      9   // Fan2
33
-#define ZRIB_V20_A10_PIN    10
34
-#define ZRIB_V20_D16_PIN    16
35
-#define ZRIB_V20_D17_PIN    17
36
-#define ZRIB_V20_D23_PIN    23
37
-#define ZRIB_V20_D25_PIN    25
38
-#define ZRIB_V20_D27_PIN    27
39
-#define ZRIB_V20_D29_PIN    29
40
-#define ZRIB_V20_D37_PIN    37
31
+#define ZRIB_V20_D6_PIN                        6  // Fan
32
+#define ZRIB_V20_D9_PIN                        9  // Fan2
33
+#define ZRIB_V20_A10_PIN                      10
34
+#define ZRIB_V20_D16_PIN                      16
35
+#define ZRIB_V20_D17_PIN                      17
36
+#define ZRIB_V20_D23_PIN                      23
37
+#define ZRIB_V20_D25_PIN                      25
38
+#define ZRIB_V20_D27_PIN                      27
39
+#define ZRIB_V20_D29_PIN                      29
40
+#define ZRIB_V20_D37_PIN                      37
41 41
 
42
-#define ORIG_E0_AUTO_FAN_PIN ZRIB_V20_D6_PIN
43
-#define ORIG_E1_AUTO_FAN_PIN ZRIB_V20_D6_PIN
44
-#define ORIG_E2_AUTO_FAN_PIN ZRIB_V20_D6_PIN
45
-#define ORIG_E3_AUTO_FAN_PIN ZRIB_V20_D6_PIN
42
+#define ORIG_E0_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
43
+#define ORIG_E1_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
44
+#define ORIG_E2_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
45
+#define ORIG_E3_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
46 46
 
47 47
 #ifndef FILWIDTH_PIN
48
-  #define FILWIDTH_PIN      11   // Analog Input
48
+  #define FILWIDTH_PIN                        11  // Analog Input
49 49
 #endif
50 50
 
51 51
 #if ENABLED(ZONESTAR_LCD)
@@ -58,12 +58,12 @@
58 58
   #undef ADC_KEYPAD_PIN
59 59
   #undef BEEPER_PIN
60 60
 
61
-  #define LCD_PINS_RS     ZRIB_V20_D16_PIN
62
-  #define LCD_PINS_ENABLE ZRIB_V20_D17_PIN
63
-  #define LCD_PINS_D4     ZRIB_V20_D23_PIN
64
-  #define LCD_PINS_D5     ZRIB_V20_D25_PIN
65
-  #define LCD_PINS_D6     ZRIB_V20_D27_PIN
66
-  #define LCD_PINS_D7     ZRIB_V20_D29_PIN
67
-  #define ADC_KEYPAD_PIN  ZRIB_V20_A10_PIN
68
-  #define BEEPER_PIN      ZRIB_V20_D37_PIN
61
+  #define LCD_PINS_RS           ZRIB_V20_D16_PIN
62
+  #define LCD_PINS_ENABLE       ZRIB_V20_D17_PIN
63
+  #define LCD_PINS_D4           ZRIB_V20_D23_PIN
64
+  #define LCD_PINS_D5           ZRIB_V20_D25_PIN
65
+  #define LCD_PINS_D6           ZRIB_V20_D27_PIN
66
+  #define LCD_PINS_D7           ZRIB_V20_D29_PIN
67
+  #define ADC_KEYPAD_PIN        ZRIB_V20_A10_PIN
68
+  #define BEEPER_PIN            ZRIB_V20_D37_PIN
69 69
 #endif

+ 94
- 94
Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h Parādīt failu

@@ -37,129 +37,129 @@
37 37
 // Servos
38 38
 //
39 39
 #ifndef SERVO0_PIN
40
-  #define SERVO0_PIN       11
40
+  #define SERVO0_PIN                          11
41 41
 #endif
42 42
 #ifndef SERVO3_PIN
43
-  #define SERVO3_PIN        4
43
+  #define SERVO3_PIN                           4
44 44
 #endif
45 45
 
46 46
 //
47 47
 // Limit Switches
48 48
 //
49
-#define X_MIN_PIN           3
49
+#define X_MIN_PIN                              3
50 50
 #ifndef X_MAX_PIN
51
-  #define X_MAX_PIN         2
51
+  #define X_MAX_PIN                            2
52 52
 #endif
53
-#define Y_MIN_PIN          14
54
-#define Y_MAX_PIN          15
55
-#define Z_MIN_PIN          18
56
-#define Z_MAX_PIN          19
53
+#define Y_MIN_PIN                             14
54
+#define Y_MAX_PIN                             15
55
+#define Z_MIN_PIN                             18
56
+#define Z_MAX_PIN                             19
57 57
 
58 58
 //
59 59
 // Z Probe (when not Z_MIN_PIN)
60 60
 //
61 61
 #ifndef Z_MIN_PROBE_PIN
62
-  #define Z_MIN_PROBE_PIN  32
62
+  #define Z_MIN_PROBE_PIN                     32
63 63
 #endif
64 64
 
65 65
 //
66 66
 // Steppers
67 67
 //
68
-#define X_STEP_PIN         54
69
-#define X_DIR_PIN          55
70
-#define X_ENABLE_PIN       38
68
+#define X_STEP_PIN                            54
69
+#define X_DIR_PIN                             55
70
+#define X_ENABLE_PIN                          38
71 71
 #ifndef X_CS_PIN
72
-  #define X_CS_PIN         -1
72
+  #define X_CS_PIN                            -1
73 73
 #endif
74 74
 
75
-#define Y_STEP_PIN         60
76
-#define Y_DIR_PIN          61
77
-#define Y_ENABLE_PIN       56
75
+#define Y_STEP_PIN                            60
76
+#define Y_DIR_PIN                             61
77
+#define Y_ENABLE_PIN                          56
78 78
 #ifndef Y_CS_PIN
79
-  #define Y_CS_PIN         -1
79
+  #define Y_CS_PIN                            -1
80 80
 #endif
81 81
 
82
-#define Z_STEP_PIN         46
83
-#define Z_DIR_PIN          48
84
-#define Z_ENABLE_PIN       62
82
+#define Z_STEP_PIN                            46
83
+#define Z_DIR_PIN                             48
84
+#define Z_ENABLE_PIN                          62
85 85
 #ifndef Z_CS_PIN
86
-  #define Z_CS_PIN         -1
86
+  #define Z_CS_PIN                            -1
87 87
 #endif
88 88
 
89
-#define E0_STEP_PIN        26
90
-#define E0_DIR_PIN         28
91
-#define E0_ENABLE_PIN      24
89
+#define E0_STEP_PIN                           26
90
+#define E0_DIR_PIN                            28
91
+#define E0_ENABLE_PIN                         24
92 92
 #ifndef E0_CS_PIN
93
-  #define E0_CS_PIN        -1
93
+  #define E0_CS_PIN                           -1
94 94
 #endif
95 95
 
96
-#define E1_STEP_PIN        36
97
-#define E1_DIR_PIN         34
98
-#define E1_ENABLE_PIN      30
96
+#define E1_STEP_PIN                           36
97
+#define E1_DIR_PIN                            34
98
+#define E1_ENABLE_PIN                         30
99 99
 #ifndef E1_CS_PIN
100
-  #define E1_CS_PIN        -1
100
+  #define E1_CS_PIN                           -1
101 101
 #endif
102 102
 
103 103
 // Red
104
-#define E2_STEP_PIN        42
105
-#define E2_DIR_PIN         40
106
-#define E2_ENABLE_PIN      65
104
+#define E2_STEP_PIN                           42
105
+#define E2_DIR_PIN                            40
106
+#define E2_ENABLE_PIN                         65
107 107
 #ifndef E2_CS_PIN
108
-  #define E2_CS_PIN        -1
108
+  #define E2_CS_PIN                           -1
109 109
 #endif
110 110
 
111 111
 // Black
112
-#define E3_STEP_PIN        44
113
-#define E3_DIR_PIN         64
114
-#define E3_ENABLE_PIN      66
112
+#define E3_STEP_PIN                           44
113
+#define E3_DIR_PIN                            64
114
+#define E3_ENABLE_PIN                         66
115 115
 #ifndef E3_CS_PIN
116
-  #define E3_CS_PIN        -1
116
+  #define E3_CS_PIN                           -1
117 117
 #endif
118 118
 
119 119
 //
120 120
 // Temperature Sensors
121 121
 //
122
-#define TEMP_0_PIN         13   // Analog Input
123
-#define TEMP_1_PIN         15   // Analog Input
124
-#define TEMP_2_PIN          5   // Analog Input (BLACK)
125
-#define TEMP_3_PIN          9   // Analog Input (RED)
126
-#define TEMP_BED_PIN       14   // Analog Input
122
+#define TEMP_0_PIN                            13  // Analog Input
123
+#define TEMP_1_PIN                            15  // Analog Input
124
+#define TEMP_2_PIN                             5  // Analog Input (BLACK)
125
+#define TEMP_3_PIN                             9  // Analog Input (RED)
126
+#define TEMP_BED_PIN                          14  // Analog Input
127 127
 
128 128
 //
129 129
 // Heaters / Fans
130 130
 //
131
-#define HEATER_0_PIN       10
132
-#define HEATER_1_PIN        7
133
-#define HEATER_2_PIN        6
134
-#define HEATER_3_PIN        5
135
-#define HEATER_BED_PIN      8
131
+#define HEATER_0_PIN                          10
132
+#define HEATER_1_PIN                           7
133
+#define HEATER_2_PIN                           6
134
+#define HEATER_3_PIN                           5
135
+#define HEATER_BED_PIN                         8
136 136
 
137
-#define FAN_PIN             9
137
+#define FAN_PIN                                9
138 138
 
139 139
 //
140 140
 // Misc. Functions
141 141
 //
142
-#define SDSS               53
143
-#define LED_PIN            13
142
+#define SDSS                                  53
143
+#define LED_PIN                               13
144 144
 
145 145
 #ifndef FILWIDTH_PIN
146
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
146
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
147 147
 #endif
148 148
 
149 149
 // Оn the servos connector
150 150
 #ifndef FIL_RUNOUT_PIN
151
-  #define FIL_RUNOUT_PIN    4
151
+  #define FIL_RUNOUT_PIN                       4
152 152
 #endif
153 153
 
154 154
 #ifndef PS_ON_PIN
155
-  #define PS_ON_PIN        12
155
+  #define PS_ON_PIN                           12
156 156
 #endif
157 157
 
158 158
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
159
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
160
-    #define CASE_LIGHT_PIN    6   // Hardware PWM
159
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
160
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
161 161
   #elif HAS_FREE_AUX2_PINS
162
-    #define CASE_LIGHT_PIN   44   // Hardware PWM
162
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
163 163
   #endif
164 164
 #endif
165 165
 
@@ -167,14 +167,14 @@
167 167
 // M3/M4/M5 - Spindle/Laser Control
168 168
 //
169 169
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
170
-  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
171
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
172
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
173
-    #define SPINDLE_DIR_PIN           5
170
+  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0     // Prefer the servo connector
171
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
172
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
173
+    #define SPINDLE_DIR_PIN                    5
174 174
   #elif HAS_FREE_AUX2_PINS
175
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
176
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
177
-    #define SPINDLE_DIR_PIN          65
175
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
176
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
177
+    #define SPINDLE_DIR_PIN                   65
178 178
   #endif
179 179
 #endif
180 180
 
@@ -183,13 +183,13 @@
183 183
 //
184 184
 #if ENABLED(TMC_USE_SW_SPI)
185 185
   #ifndef TMC_SW_MOSI
186
-    #define TMC_SW_MOSI    66
186
+    #define TMC_SW_MOSI                       66
187 187
   #endif
188 188
   #ifndef TMC_SW_MISO
189
-    #define TMC_SW_MISO    44
189
+    #define TMC_SW_MISO                       44
190 190
   #endif
191 191
   #ifndef TMC_SW_SCK
192
-    #define TMC_SW_SCK     64
192
+    #define TMC_SW_SCK                        64
193 193
   #endif
194 194
 #endif
195 195
 
@@ -217,90 +217,90 @@
217 217
   //
218 218
 
219 219
   #ifndef X_SERIAL_TX_PIN
220
-    #define X_SERIAL_TX_PIN  40
220
+    #define X_SERIAL_TX_PIN                   40
221 221
   #endif
222 222
   #ifndef X_SERIAL_RX_PIN
223
-    #define X_SERIAL_RX_PIN  63
223
+    #define X_SERIAL_RX_PIN                   63
224 224
   #endif
225 225
   #ifndef X2_SERIAL_TX_PIN
226
-    #define X2_SERIAL_TX_PIN -1
226
+    #define X2_SERIAL_TX_PIN                  -1
227 227
   #endif
228 228
   #ifndef X2_SERIAL_RX_PIN
229
-    #define X2_SERIAL_RX_PIN -1
229
+    #define X2_SERIAL_RX_PIN                  -1
230 230
   #endif
231 231
 
232 232
   #ifndef Y_SERIAL_TX_PIN
233
-    #define Y_SERIAL_TX_PIN  59
233
+    #define Y_SERIAL_TX_PIN                   59
234 234
   #endif
235 235
   #ifndef Y_SERIAL_RX_PIN
236
-    #define Y_SERIAL_RX_PIN  64
236
+    #define Y_SERIAL_RX_PIN                   64
237 237
   #endif
238 238
   #ifndef Y2_SERIAL_TX_PIN
239
-    #define Y2_SERIAL_TX_PIN -1
239
+    #define Y2_SERIAL_TX_PIN                  -1
240 240
   #endif
241 241
   #ifndef Y2_SERIAL_RX_PIN
242
-    #define Y2_SERIAL_RX_PIN -1
242
+    #define Y2_SERIAL_RX_PIN                  -1
243 243
   #endif
244 244
 
245 245
   #ifndef Z_SERIAL_TX_PIN
246
-    #define Z_SERIAL_TX_PIN  42
246
+    #define Z_SERIAL_TX_PIN                   42
247 247
   #endif
248 248
   #ifndef Z_SERIAL_RX_PIN
249
-    #define Z_SERIAL_RX_PIN  65
249
+    #define Z_SERIAL_RX_PIN                   65
250 250
   #endif
251 251
   #ifndef Z2_SERIAL_TX_PIN
252
-    #define Z2_SERIAL_TX_PIN -1
252
+    #define Z2_SERIAL_TX_PIN                  -1
253 253
   #endif
254 254
   #ifndef Z2_SERIAL_RX_PIN
255
-    #define Z2_SERIAL_RX_PIN -1
255
+    #define Z2_SERIAL_RX_PIN                  -1
256 256
   #endif
257 257
 
258 258
   #ifndef E0_SERIAL_TX_PIN
259
-    #define E0_SERIAL_TX_PIN 44
259
+    #define E0_SERIAL_TX_PIN                  44
260 260
   #endif
261 261
   #ifndef E0_SERIAL_RX_PIN
262
-    #define E0_SERIAL_RX_PIN 66
262
+    #define E0_SERIAL_RX_PIN                  66
263 263
   #endif
264 264
   #ifndef E1_SERIAL_TX_PIN
265
-    #define E1_SERIAL_TX_PIN -1
265
+    #define E1_SERIAL_TX_PIN                  -1
266 266
   #endif
267 267
   #ifndef E1_SERIAL_RX_PIN
268
-    #define E1_SERIAL_RX_PIN -1
268
+    #define E1_SERIAL_RX_PIN                  -1
269 269
   #endif
270 270
   #ifndef E2_SERIAL_TX_PIN
271
-    #define E2_SERIAL_TX_PIN -1
271
+    #define E2_SERIAL_TX_PIN                  -1
272 272
   #endif
273 273
   #ifndef E2_SERIAL_RX_PIN
274
-    #define E2_SERIAL_RX_PIN -1
274
+    #define E2_SERIAL_RX_PIN                  -1
275 275
   #endif
276 276
   #ifndef E3_SERIAL_TX_PIN
277
-    #define E3_SERIAL_TX_PIN -1
277
+    #define E3_SERIAL_TX_PIN                  -1
278 278
   #endif
279 279
   #ifndef E3_SERIAL_RX_PIN
280
-    #define E3_SERIAL_RX_PIN -1
280
+    #define E3_SERIAL_RX_PIN                  -1
281 281
   #endif
282 282
   #ifndef E4_SERIAL_TX_PIN
283
-    #define E4_SERIAL_TX_PIN -1
283
+    #define E4_SERIAL_TX_PIN                  -1
284 284
   #endif
285 285
   #ifndef E4_SERIAL_RX_PIN
286
-    #define E4_SERIAL_RX_PIN -1
286
+    #define E4_SERIAL_RX_PIN                  -1
287 287
   #endif
288 288
   #ifndef E5_SERIAL_TX_PIN
289
-    #define E5_SERIAL_TX_PIN -1
289
+    #define E5_SERIAL_TX_PIN                  -1
290 290
   #endif
291 291
   #ifndef E5_SERIAL_RX_PIN
292
-    #define E5_SERIAL_RX_PIN -1
292
+    #define E5_SERIAL_RX_PIN                  -1
293 293
   #endif
294 294
   #ifndef E6_SERIAL_TX_PIN
295
-    #define E6_SERIAL_TX_PIN -1
295
+    #define E6_SERIAL_TX_PIN                  -1
296 296
   #endif
297 297
   #ifndef E6_SERIAL_RX_PIN
298
-    #define E6_SERIAL_RX_PIN -1
298
+    #define E6_SERIAL_RX_PIN                  -1
299 299
   #endif
300 300
   #ifndef E7_SERIAL_TX_PIN
301
-    #define E7_SERIAL_TX_PIN -1
301
+    #define E7_SERIAL_TX_PIN                  -1
302 302
   #endif
303 303
   #ifndef E7_SERIAL_RX_PIN
304
-    #define E7_SERIAL_RX_PIN -1
304
+    #define E7_SERIAL_RX_PIN                  -1
305 305
   #endif
306 306
 #endif

+ 31
- 31
Marlin/src/pins/sam/pins_ADSK.h Parādīt failu

@@ -81,55 +81,55 @@ A stepper for E0 extruder
81 81
 //
82 82
 // Servos
83 83
 //
84
-#define SERVO0_PIN         61   // Analog pin 7, Digital pin 61
84
+#define SERVO0_PIN                            61  // Analog pin 7, Digital pin 61
85 85
 
86 86
 //
87 87
 // Limit Switches
88 88
 //
89
-#define X_MIN_PIN           9
90
-#define Y_MIN_PIN          10
91
-#define Z_MIN_PIN          11
89
+#define X_MIN_PIN                              9
90
+#define Y_MIN_PIN                             10
91
+#define Z_MIN_PIN                             11
92 92
 
93
-#define Z_MIN_PROBE_PIN    62   // Analog pin 8, Digital pin 62
93
+#define Z_MIN_PROBE_PIN                       62  // Analog pin 8, Digital pin 62
94 94
 
95 95
 //
96 96
 // Steppers
97 97
 //
98
-#define X_STEP_PIN          2
99
-#define X_DIR_PIN           5
100
-#define X_ENABLE_PIN        8
98
+#define X_STEP_PIN                             2
99
+#define X_DIR_PIN                              5
100
+#define X_ENABLE_PIN                           8
101 101
 
102
-#define Y_STEP_PIN          3
103
-#define Y_DIR_PIN           6
104
-#define Y_ENABLE_PIN        8
102
+#define Y_STEP_PIN                             3
103
+#define Y_DIR_PIN                              6
104
+#define Y_ENABLE_PIN                           8
105 105
 
106
-#define Z_STEP_PIN          4
107
-#define Z_DIR_PIN           7
108
-#define Z_ENABLE_PIN        8
106
+#define Z_STEP_PIN                             4
107
+#define Z_DIR_PIN                              7
108
+#define Z_ENABLE_PIN                           8
109 109
 
110
-#define E0_STEP_PIN        12
111
-#define E0_DIR_PIN         13
112
-#define E0_ENABLE_PIN       8
110
+#define E0_STEP_PIN                           12
111
+#define E0_DIR_PIN                            13
112
+#define E0_ENABLE_PIN                          8
113 113
 
114 114
 //
115 115
 // Heaters / Fans
116 116
 //
117
-#define HEATER_0_PIN       55   // "Hold":   Analog pin 1, Digital pin 55
118
-#define HEATER_BED_PIN     57   // "CoolEn": Analog pin 3, Digital pin 57
119
-#define FAN_PIN            54   // "Abort":  Analog pin 0, Digital pin 54
117
+#define HEATER_0_PIN                          55  // "Hold":   Analog pin 1, Digital pin 55
118
+#define HEATER_BED_PIN                        57  // "CoolEn": Analog pin 3, Digital pin 57
119
+#define FAN_PIN                               54  // "Abort":  Analog pin 0, Digital pin 54
120 120
 #undef E0_AUTO_FAN_PIN
121
-#define E0_AUTO_FAN_PIN    56   // "Resume": Analog pin 2, Digital pin 56
121
+#define E0_AUTO_FAN_PIN                       56  // "Resume": Analog pin 2, Digital pin 56
122 122
 
123 123
 //
124 124
 // Temperature Sensors
125 125
 //
126
-#define TEMP_0_PIN          4   // "SDA":    Analog pin 4, Digital pin 58
127
-#define TEMP_BED_PIN        5   // "SCL":    Analog pin 5, Digital pin 59
126
+#define TEMP_0_PIN                             4  // "SDA":    Analog pin 4, Digital pin 58
127
+#define TEMP_BED_PIN                           5  // "SCL":    Analog pin 5, Digital pin 59
128 128
 
129 129
 //
130 130
 // Misc. Functions
131 131
 //
132
-#define SDSS               52
132
+#define SDSS                                  52
133 133
 
134 134
 #if ENABLED(ZONESTAR_LCD)
135 135
 
@@ -160,13 +160,13 @@ A stepper for E0 extruder
160 160
   //
161 161
   // LCD / Controller
162 162
   //
163
-  #define LCD_PINS_ENABLE  14
164
-  #define LCD_PINS_RS      15
165
-  #define LCD_PINS_D4      16
166
-  #define LCD_PINS_D5      17
167
-  #define LCD_PINS_D6      18
168
-  #define LCD_PINS_D7      19
169
-  #define ADC_KEYPAD_PIN    6   //60 // Analog pin 6, Digital pin 60
163
+  #define LCD_PINS_ENABLE                     14
164
+  #define LCD_PINS_RS                         15
165
+  #define LCD_PINS_D4                         16
166
+  #define LCD_PINS_D5                         17
167
+  #define LCD_PINS_D6                         18
168
+  #define LCD_PINS_D7                         19
169
+  #define ADC_KEYPAD_PIN                       6  //60 // Analog pin 6, Digital pin 60
170 170
 
171 171
   /**
172 172
    * The below defines will scale all the values to work properly on both

+ 68
- 68
Marlin/src/pins/sam/pins_ALLIGATOR_R2.h Parādīt failu

@@ -35,126 +35,126 @@
35 35
 //
36 36
 // Servos
37 37
 //
38
-#define SERVO0_PIN         36
39
-#define SERVO1_PIN         40
40
-#define SERVO2_PIN         41
41
-#define SERVO3_PIN         -1
38
+#define SERVO0_PIN                            36
39
+#define SERVO1_PIN                            40
40
+#define SERVO2_PIN                            41
41
+#define SERVO3_PIN                            -1
42 42
 
43 43
 //
44 44
 // Limit Switches
45 45
 //
46
-#define X_MIN_PIN          33   // PC1
47
-#define X_MAX_PIN          34   // PC2
48
-#define Y_MIN_PIN          35   // PC3
49
-#define Y_MAX_PIN          37   // PC5
50
-#define Z_MIN_PIN          38   // PC6
51
-#define Z_MAX_PIN          39   // PC7
46
+#define X_MIN_PIN                             33  // PC1
47
+#define X_MAX_PIN                             34  // PC2
48
+#define Y_MIN_PIN                             35  // PC3
49
+#define Y_MAX_PIN                             37  // PC5
50
+#define Z_MIN_PIN                             38  // PC6
51
+#define Z_MAX_PIN                             39  // PC7
52 52
 
53 53
 //
54 54
 // Steppers
55 55
 //
56
-#define X_STEP_PIN         96   // PB24
57
-#define X_DIR_PIN           2   // PB25
58
-#define X_ENABLE_PIN       24   // PA15, motor RESET pin
56
+#define X_STEP_PIN                            96  // PB24
57
+#define X_DIR_PIN                              2  // PB25
58
+#define X_ENABLE_PIN                          24  // PA15, motor RESET pin
59 59
 
60
-#define Y_STEP_PIN         94   // PB22
61
-#define Y_DIR_PIN          95   // PB23
62
-#define Y_ENABLE_PIN       24   // PA15, motor RESET pin
60
+#define Y_STEP_PIN                            94  // PB22
61
+#define Y_DIR_PIN                             95  // PB23
62
+#define Y_ENABLE_PIN                          24  // PA15, motor RESET pin
63 63
 
64
-#define Z_STEP_PIN         98   // PC27
65
-#define Z_DIR_PIN           3   // PC28
66
-#define Z_ENABLE_PIN       24   // PA15, motor RESET pin
64
+#define Z_STEP_PIN                            98  // PC27
65
+#define Z_DIR_PIN                              3  // PC28
66
+#define Z_ENABLE_PIN                          24  // PA15, motor RESET pin
67 67
 
68
-#define E0_STEP_PIN         5   // PC25
69
-#define E0_DIR_PIN          4   // PC26
70
-#define E0_ENABLE_PIN      24   // PA15, motor RESET pin
68
+#define E0_STEP_PIN                            5  // PC25
69
+#define E0_DIR_PIN                             4  // PC26
70
+#define E0_ENABLE_PIN                         24  // PA15, motor RESET pin
71 71
 
72
-#define E1_STEP_PIN        28   // PD3 on piggy
73
-#define E1_DIR_PIN         27   // PD2 on piggy
74
-#define E1_ENABLE_PIN      24   // PA15, motor RESET pin
72
+#define E1_STEP_PIN                           28  // PD3 on piggy
73
+#define E1_DIR_PIN                            27  // PD2 on piggy
74
+#define E1_ENABLE_PIN                         24  // PA15, motor RESET pin
75 75
 
76
-#define E2_STEP_PIN        11   // PD7 on piggy
77
-#define E2_DIR_PIN         29   // PD6 on piggy
78
-#define E2_ENABLE_PIN      24   // PA15, motor RESET pin
76
+#define E2_STEP_PIN                           11  // PD7 on piggy
77
+#define E2_DIR_PIN                            29  // PD6 on piggy
78
+#define E2_ENABLE_PIN                         24  // PA15, motor RESET pin
79 79
 
80
-#define E3_STEP_PIN        30   // PD9 on piggy
81
-#define E3_DIR_PIN         12   // PD8 on piggy
82
-#define E3_ENABLE_PIN      24   // PA15, motor RESET pin
80
+#define E3_STEP_PIN                           30  // PD9 on piggy
81
+#define E3_DIR_PIN                            12  // PD8 on piggy
82
+#define E3_ENABLE_PIN                         24  // PA15, motor RESET pin
83 83
 
84 84
 // Microstepping pins - Mapping not from fastio.h (?)
85
-#define X_MS1_PIN          99   // PC10
86
-#define Y_MS1_PIN          10   // PC29
87
-#define Z_MS1_PIN          44   // PC19
88
-#define E0_MS1_PIN         45   // PC18
85
+#define X_MS1_PIN                             99  // PC10
86
+#define Y_MS1_PIN                             10  // PC29
87
+#define Z_MS1_PIN                             44  // PC19
88
+#define E0_MS1_PIN                            45  // PC18
89 89
 
90
-//#define MOTOR_FAULT_PIN  22   // PB26 , motor X-Y-Z-E0 motor FAULT
90
+//#define MOTOR_FAULT_PIN                     22  // PB26 , motor X-Y-Z-E0 motor FAULT
91 91
 
92 92
 //
93 93
 // Temperature Sensors
94 94
 //
95
-#define TEMP_0_PIN          1   // Analog Input (PA24)
96
-#define TEMP_1_PIN          2   // Analog Input (PA23 on piggy)
97
-#define TEMP_2_PIN          3   // Analog Input (PA22 on piggy)
98
-#define TEMP_3_PIN          4   // Analog Input (PA6 on piggy)
99
-#define TEMP_BED_PIN        0   // Analog Input (PA16)
95
+#define TEMP_0_PIN                             1  // Analog Input (PA24)
96
+#define TEMP_1_PIN                             2  // Analog Input (PA23 on piggy)
97
+#define TEMP_2_PIN                             3  // Analog Input (PA22 on piggy)
98
+#define TEMP_3_PIN                             4  // Analog Input (PA6 on piggy)
99
+#define TEMP_BED_PIN                           0  // Analog Input (PA16)
100 100
 
101 101
 //
102 102
 // Heaters / Fans
103 103
 //
104 104
 // Note that on the Due pin A0 on the board is channel 2 on the ARM chip
105
-#define HEATER_0_PIN       68   // PA1
106
-#define HEATER_1_PIN        8   // PC22 on piggy
107
-#define HEATER_2_PIN        9   // PC21 on piggy
108
-#define HEATER_3_PIN       97   // PC20 on piggy
109
-#define HEATER_BED_PIN     69   // PA0
105
+#define HEATER_0_PIN                          68  // PA1
106
+#define HEATER_1_PIN                           8  // PC22 on piggy
107
+#define HEATER_2_PIN                           9  // PC21 on piggy
108
+#define HEATER_3_PIN                          97  // PC20 on piggy
109
+#define HEATER_BED_PIN                        69  // PA0
110 110
 
111 111
 #ifndef FAN_PIN
112
-  #define FAN_PIN          92   // PA5
112
+  #define FAN_PIN                             92  // PA5
113 113
 #endif
114
-#define FAN1_PIN           31   // PA7
114
+#define FAN1_PIN                              31  // PA7
115 115
 
116 116
 //
117 117
 // Misc. Functions
118 118
 //
119
-#define SDSS               77   // PA28
120
-#define SD_DETECT_PIN      87   // PA29
121
-#define LED_RED_PIN        40   // PC8
122
-#define LED_GREEN_PIN      41   // PC9
119
+#define SDSS                                  77  // PA28
120
+#define SD_DETECT_PIN                         87  // PA29
121
+#define LED_RED_PIN                           40  // PC8
122
+#define LED_GREEN_PIN                         41  // PC9
123 123
 
124
-#define EXP_VOLTAGE_LEVEL_PIN 65
124
+#define EXP_VOLTAGE_LEVEL_PIN                 65
125 125
 
126
-#define SPI_CHAN_DAC        1
126
+#define SPI_CHAN_DAC                           1
127 127
 
128
-#define DAC0_SYNC          53   // PB14
129
-#define DAC1_SYNC           6   // PC24
128
+#define DAC0_SYNC                             53  // PB14
129
+#define DAC1_SYNC                              6  // PC24
130 130
 
131 131
 // 64K SPI EEPROM
132 132
 #define SPI_EEPROM
133
-#define SPI_CHAN_EEPROM1    2
134
-#define SPI_EEPROM1_CS     25   // PD0
133
+#define SPI_CHAN_EEPROM1                       2
134
+#define SPI_EEPROM1_CS                        25  // PD0
135 135
 
136 136
 // 2K SPI EEPROM
137
-#define SPI_EEPROM2_CS     26   // PD1
137
+#define SPI_EEPROM2_CS                        26  // PD1
138 138
 
139 139
 // FLASH SPI
140 140
 // 32Mb
141
-#define SPI_FLASH_CS       23   // PA14
141
+#define SPI_FLASH_CS                          23  // PA14
142 142
 
143 143
 //
144 144
 // LCD / Controller
145 145
 //
146 146
 #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
147 147
 
148
-  #define LCD_PINS_RS      18
149
-  #define LCD_PINS_ENABLE  15
150
-  #define LCD_PINS_D4      19
151
-  #define BEEPER_PIN       64
148
+  #define LCD_PINS_RS                         18
149
+  #define LCD_PINS_ENABLE                     15
150
+  #define LCD_PINS_D4                         19
151
+  #define BEEPER_PIN                          64
152 152
 
153
-  #define BTN_EN1          14
154
-  #define BTN_EN2          16
155
-  #define BTN_ENC          17
153
+  #define BTN_EN1                             14
154
+  #define BTN_EN2                             16
155
+  #define BTN_ENC                             17
156 156
 
157 157
   #undef UI_VOLTAGE_LEVEL
158
-  #define UI_VOLTAGE_LEVEL 1
158
+  #define UI_VOLTAGE_LEVEL                     1
159 159
 
160 160
 #endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER

+ 78
- 80
Marlin/src/pins/sam/pins_ARCHIM1.h Parādīt failu

@@ -46,7 +46,7 @@
46 46
 //
47 47
 // Timers
48 48
 //
49
-#define STEP_TIMER_NUM 3
49
+#define STEP_TIMER_NUM                         3
50 50
 #define HAL_STEP_TIMER_ISR()  void TC3_Handler()
51 51
 
52 52
 //
@@ -56,147 +56,145 @@
56 56
 //
57 57
 // Servos
58 58
 //
59
-#define SERVO0_PIN         20   // D20 PB12 (Header J20 20)
60
-#define SERVO1_PIN         21   // D21 PB13 (Header J20 19)
61
-
59
+#define SERVO0_PIN                            20  // D20 PB12 (Header J20 20)
60
+#define SERVO1_PIN                            21  // D21 PB13 (Header J20 19)
62 61
 
63 62
 //
64 63
 // Limit Switches
65 64
 //
66
-#define X_MIN_PIN          14   // PD4 MIN ES1
67
-#define X_MAX_PIN          32   // PD10 MAX ES1
68
-#define Y_MIN_PIN          29   // PD6 MIN ES2
69
-#define Y_MAX_PIN          15   // PD5 MAX ES2
70
-#define Z_MIN_PIN          31   // PA7 MIN ES3
71
-#define Z_MAX_PIN          30   // PD9 MAX ES3
65
+#define X_MIN_PIN                             14  // PD4 MIN ES1
66
+#define X_MAX_PIN                             32  // PD10 MAX ES1
67
+#define Y_MIN_PIN                             29  // PD6 MIN ES2
68
+#define Y_MAX_PIN                             15  // PD5 MAX ES2
69
+#define Z_MIN_PIN                             31  // PA7 MIN ES3
70
+#define Z_MAX_PIN                             30  // PD9 MAX ES3
72 71
 
73 72
 //
74 73
 // Z Probe (when not Z_MIN_PIN)
75 74
 //
76 75
 #ifndef Z_MIN_PROBE_PIN
77
-  #define Z_MIN_PROBE_PIN  32
76
+  #define Z_MIN_PROBE_PIN                     32
78 77
 #endif
79 78
 
80 79
 #ifndef FIL_RUNOUT_PIN
81
-  #define FIL_RUNOUT_PIN   66   // D66 PB15 (Header J20 15)
80
+  #define FIL_RUNOUT_PIN                      66  // D66 PB15 (Header J20 15)
82 81
 #endif
83 82
 #ifndef FIL_RUNOUT2_PIN
84
-  #define FIL_RUNOUT2_PIN  67   // D67 PB16 (Header J20 16)
83
+  #define FIL_RUNOUT2_PIN                     67  // D67 PB16 (Header J20 16)
85 84
 #endif
86 85
 
87
-
88 86
 //
89 87
 // Steppers
90 88
 //
91
-#define X_STEP_PIN         40   // PC8 STEP1 *
92
-#define X_DIR_PIN          59   // PA4 DIR1 *
93
-#define X_ENABLE_PIN       41   // PC9 EN1
89
+#define X_STEP_PIN                            40  // PC8 STEP1 *
90
+#define X_DIR_PIN                             59  // PA4 DIR1 *
91
+#define X_ENABLE_PIN                          41  // PC9 EN1
94 92
 
95
-#define Y_STEP_PIN         49   // PC14 STEP2 *
96
-#define Y_DIR_PIN          47   // PC16 DIR2 *
97
-#define Y_ENABLE_PIN       48   // PC15 EN2 *
93
+#define Y_STEP_PIN                            49  // PC14 STEP2 *
94
+#define Y_DIR_PIN                             47  // PC16 DIR2 *
95
+#define Y_ENABLE_PIN                          48  // PC15 EN2 *
98 96
 
99
-#define Z_STEP_PIN         36   // PC4 STEP Z *
100
-#define Z_DIR_PIN         107   // PB10 DIR Z *
101
-#define Z_ENABLE_PIN       96   // PC10 EN Z -AddOns *
97
+#define Z_STEP_PIN                            36  // PC4 STEP Z *
98
+#define Z_DIR_PIN                            107  // PB10 DIR Z *
99
+#define Z_ENABLE_PIN                          96  // PC10 EN Z -AddOns *
102 100
 
103
-#define E0_STEP_PIN        78   // PB23 STEP3 *
104
-#define E0_DIR_PIN         22   // PB26 DIR3 *
105
-#define E0_ENABLE_PIN      97   // PB24 EN3 -Addons *
101
+#define E0_STEP_PIN                           78  // PB23 STEP3 *
102
+#define E0_DIR_PIN                            22  // PB26 DIR3 *
103
+#define E0_ENABLE_PIN                         97  // PB24 EN3 -Addons *
106 104
 
107
-#define E1_STEP_PIN        26   // PD1 STEP4 *
108
-#define E1_DIR_PIN         27   // PD2 DIR4 *
109
-#define E1_ENABLE_PIN      28   // PD3 EN4 *
105
+#define E1_STEP_PIN                           26  // PD1 STEP4 *
106
+#define E1_DIR_PIN                            27  // PD2 DIR4 *
107
+#define E1_ENABLE_PIN                         28  // PD3 EN4 *
110 108
 
111 109
 // Microstepping mode pins *
112
-#define X_MS1_PIN          39   // PC7 MOD0E1 - As listed in schematic
113
-#define X_MS2_PIN          38   // PC6 MOD1E1
114
-#define X_MS3_PIN          37   // PC5 MOD2E1
110
+#define X_MS1_PIN                             39  // PC7 MOD0E1 - As listed in schematic
111
+#define X_MS2_PIN                             38  // PC6 MOD1E1
112
+#define X_MS3_PIN                             37  // PC5 MOD2E1
115 113
 
116
-#define Y_MS1_PIN          50   // PC13 MODE0E2
117
-#define Y_MS2_PIN          51   // PC12 MODE1E2
118
-#define Y_MS3_PIN          92   // PC11 MODE2E2 - AddOns
114
+#define Y_MS1_PIN                             50  // PC13 MODE0E2
115
+#define Y_MS2_PIN                             51  // PC12 MODE1E2
116
+#define Y_MS3_PIN                             92  // PC11 MODE2E2 - AddOns
119 117
 
120
-#define Z_MS1_PIN          44   // PC19 MOD0E Z
121
-#define Z_MS2_PIN          45   // PC18 MOD1E Z
122
-#define Z_MS3_PIN          46   // PC17 MOD2E Z
118
+#define Z_MS1_PIN                             44  // PC19 MOD0E Z
119
+#define Z_MS2_PIN                             45  // PC18 MOD1E Z
120
+#define Z_MS3_PIN                             46  // PC17 MOD2E Z
123 121
 
124
-#define E0_MS1_PIN        105   // PB22 MOD0E3 - AddOns
125
-#define E0_MS2_PIN        106   // PC27 MOD1E3 - AddOns
126
-#define E0_MS3_PIN        104   // PC20 MOD2E3 - AddOns
122
+#define E0_MS1_PIN                           105  // PB22 MOD0E3 - AddOns
123
+#define E0_MS2_PIN                           106  // PC27 MOD1E3 - AddOns
124
+#define E0_MS3_PIN                           104  // PC20 MOD2E3 - AddOns
127 125
 
128
-#define E1_MS1_PIN         25   // PD0 MOD0E4
129
-#define E1_MS2_PIN         18   // PA11 MOD1E4
130
-#define E1_MS3_PIN         19   // PA10 MOD2E4
126
+#define E1_MS1_PIN                            25  // PD0 MOD0E4
127
+#define E1_MS2_PIN                            18  // PA11 MOD1E4
128
+#define E1_MS3_PIN                            19  // PA10 MOD2E4
131 129
 
132 130
 // Motor current PWM pins *
133
-#define MOTOR_CURRENT_PWM_X_PIN   58   // PA6   X-REF TIOB2
134
-#define MOTOR_CURRENT_PWM_Y_PIN   12   // PD8   Y-REF TIOB8
135
-#define MOTOR_CURRENT_PWM_Z_PIN   10   // PC29  Z-REF TIOB7
136
-#define MOTOR_CURRENT_PWM_E0_PIN   3   // PC28 E1-REF TIOA7
137
-#define MOTOR_CURRENT_PWM_E1_PIN  11   // PD7  E2-REF TIOA8
131
+#define MOTOR_CURRENT_PWM_X_PIN               58  // PA6   X-REF TIOB2
132
+#define MOTOR_CURRENT_PWM_Y_PIN               12  // PD8   Y-REF TIOB8
133
+#define MOTOR_CURRENT_PWM_Z_PIN               10  // PC29  Z-REF TIOB7
134
+#define MOTOR_CURRENT_PWM_E0_PIN               3  // PC28 E1-REF TIOA7
135
+#define MOTOR_CURRENT_PWM_E1_PIN              11  // PD7  E2-REF TIOA8
138 136
 
139
-#define MOTOR_CURRENT_PWM_RANGE 2750   // (3.3 Volts * 100000 Ohms) / (100000 Ohms + 20000 Ohms) = 2.75 Volts (max vref)
137
+#define MOTOR_CURRENT_PWM_RANGE              2750 // (3.3 Volts * 100000 Ohms) / (100000 Ohms + 20000 Ohms) = 2.75 Volts (max vref)
140 138
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1000, 1000, 1000 } //, 1000, 1000}   // X Y Z E0 E1, 1000 = 1000mAh
141 139
 
142 140
 //
143 141
 // Temperature Sensors
144 142
 //
145
-#define TEMP_0_PIN         10   // D10 PB19 THERM AN1 *
146
-#define TEMP_1_PIN          9   // D9 PB18 THERM AN2 *
147
-#define TEMP_2_PIN          8   // D8 PB17 THERM AN4 *
148
-#define TEMP_BED_PIN       11   // D11 PB20 THERM AN3 *
143
+#define TEMP_0_PIN                            10  // D10 PB19 THERM AN1 *
144
+#define TEMP_1_PIN                             9  // D9 PB18 THERM AN2 *
145
+#define TEMP_2_PIN                             8  // D8 PB17 THERM AN4 *
146
+#define TEMP_BED_PIN                          11  // D11 PB20 THERM AN3 *
149 147
 
150 148
 //
151 149
 // Heaters / Fans
152 150
 //
153
-#define HEATER_0_PIN        6   // D6 PC24 FET_PWM3
154
-#define HEATER_1_PIN        7   // D7 PC23 FET_PWM4
155
-#define HEATER_2_PIN        8   // D8 PC22 FET_PWM5
156
-#define HEATER_BED_PIN      9   // D9 PC21 BED_PWM
151
+#define HEATER_0_PIN                           6  // D6 PC24 FET_PWM3
152
+#define HEATER_1_PIN                           7  // D7 PC23 FET_PWM4
153
+#define HEATER_2_PIN                           8  // D8 PC22 FET_PWM5
154
+#define HEATER_BED_PIN                         9  // D9 PC21 BED_PWM
157 155
 
158 156
 #ifndef FAN_PIN
159
-  #define FAN_PIN           4   // D4 PC26 FET_PWM1
157
+  #define FAN_PIN                              4  // D4 PC26 FET_PWM1
160 158
 #endif
161
-#define FAN1_PIN            5   // D5 PC25 FET_PWM2
159
+#define FAN1_PIN                               5  // D5 PC25 FET_PWM2
162 160
 
163 161
 //
164 162
 // Misc. Functions
165 163
 //
166 164
 
167 165
 // Internal MicroSD card reader on the PCB
168
-#define INT_SCK_PIN        42   // D42 PA19/MCCK
169
-#define INT_MISO_PIN       43   // D43 PA20/MCCDA
170
-#define INT_MOSI_PIN       73   // D73 PA21/MCDA0
171
-#define INT_SDSS           55   // D55 PA24/MCDA3
166
+#define INT_SCK_PIN                           42  // D42 PA19/MCCK
167
+#define INT_MISO_PIN                          43  // D43 PA20/MCCDA
168
+#define INT_MOSI_PIN                          73  // D73 PA21/MCDA0
169
+#define INT_SDSS                              55  // D55 PA24/MCDA3
172 170
 
173 171
 // External SD card reader on SC2
174
-#define SCK_PIN            76   // D76 PA27
175
-#define MISO_PIN           74   // D74 PA25
176
-#define MOSI_PIN           75   // D75 PA26
177
-#define SDSS               87   // D87 PA29
172
+#define SCK_PIN                               76  // D76 PA27
173
+#define MISO_PIN                              74  // D74 PA25
174
+#define MOSI_PIN                              75  // D75 PA26
175
+#define SDSS                                  87  // D87 PA29
178 176
 
179 177
 // 2MB SPI Flash
180
-#define SPI_FLASH_SS       52   // D52 PB21
178
+#define SPI_FLASH_SS                          52  // D52 PB21
181 179
 
182 180
 //
183 181
 // LCD / Controller
184 182
 //
185 183
 #if HAS_SPI_LCD
186
-  #define BEEPER_PIN       23   // D24 PA15_CTS1
187
-  #define LCD_PINS_RS      17   // D17 PA12_RXD1
188
-  #define LCD_PINS_ENABLE  24   // D23 PA14_RTS1
189
-  #define LCD_PINS_D4      69   // D69 PA0_CANTX0
190
-  #define LCD_PINS_D5      54   // D54 PA16_SCK1
191
-  #define LCD_PINS_D6      68   // D68 PA1_CANRX0
192
-  #define LCD_PINS_D7      34   // D34 PC2_PWML0
184
+  #define BEEPER_PIN                          23  // D24 PA15_CTS1
185
+  #define LCD_PINS_RS                         17  // D17 PA12_RXD1
186
+  #define LCD_PINS_ENABLE                     24  // D23 PA14_RTS1
187
+  #define LCD_PINS_D4                         69  // D69 PA0_CANTX0
188
+  #define LCD_PINS_D5                         54  // D54 PA16_SCK1
189
+  #define LCD_PINS_D6                         68  // D68 PA1_CANRX0
190
+  #define LCD_PINS_D7                         34  // D34 PC2_PWML0
193 191
 
194
-  #define SD_DETECT_PIN     2   // D2  PB25_TIOA0
192
+  #define SD_DETECT_PIN                        2  // D2  PB25_TIOA0
195 193
 
196 194
   #if ENABLED(NEWPANEL)
197 195
     // Buttons on AUX-2
198
-    #define BTN_EN1        60   // D60 PA3_TIOB1
199
-    #define BTN_EN2        13   // D13 PB27_TIOB0
200
-    #define BTN_ENC        16   // D16 PA13_TXD1
196
+    #define BTN_EN1                           60  // D60 PA3_TIOB1
197
+    #define BTN_EN2                           13  // D13 PB27_TIOB0
198
+    #define BTN_ENC                           16  // D16 PA13_TXD1
201 199
   #endif // NEWPANEL
202 200
 #endif // HAS_SPI_LCD

+ 93
- 93
Marlin/src/pins/sam/pins_ARCHIM2.h Parādīt failu

@@ -52,8 +52,8 @@
52 52
 //
53 53
 // Servos
54 54
 //
55
-#define SERVO0_PIN         20   // D20 PB12 (Header J20 20)
56
-#define SERVO1_PIN         21   // D21 PB13 (Header J20 19)
55
+#define SERVO0_PIN                            20  // D20 PB12 (Header J20 20)
56
+#define SERVO1_PIN                            21  // D21 PB13 (Header J20 19)
57 57
 
58 58
 //
59 59
 // Limit Switches
@@ -65,83 +65,83 @@
65 65
   // Otherwise use a physical endstop based configuration.
66 66
 
67 67
   // TMC2130 Diag Pins
68
-  #define X_DIAG_PIN       59   // PA4
69
-  #define Y_DIAG_PIN       48   // PC15
70
-  #define Z_DIAG_PIN       36   // PC4
71
-  #define E0_DIAG_PIN      78   // PB23
72
-  #define E1_DIAG_PIN      25   // PD0
68
+  #define X_DIAG_PIN                          59  // PA4
69
+  #define Y_DIAG_PIN                          48  // PC15
70
+  #define Z_DIAG_PIN                          36  // PC4
71
+  #define E0_DIAG_PIN                         78  // PB23
72
+  #define E1_DIAG_PIN                         25  // PD0
73 73
 
74 74
   #if X_HOME_DIR < 0
75
-    #define X_MIN_PIN      X_DIAG_PIN
76
-    #define X_MAX_PIN      32
75
+    #define X_MIN_PIN                 X_DIAG_PIN
76
+    #define X_MAX_PIN                         32
77 77
   #else
78
-    #define X_MIN_PIN      14
79
-    #define X_MAX_PIN      X_DIAG_PIN
78
+    #define X_MIN_PIN                         14
79
+    #define X_MAX_PIN                 X_DIAG_PIN
80 80
   #endif
81 81
 
82 82
   #if Y_HOME_DIR < 0
83
-    #define Y_MIN_PIN      Y_DIAG_PIN
84
-    #define Y_MAX_PIN      15
83
+    #define Y_MIN_PIN                 Y_DIAG_PIN
84
+    #define Y_MAX_PIN                         15
85 85
   #else
86
-    #define Y_MIN_PIN      29
87
-    #define Y_MAX_PIN      Y_DIAG_PIN
86
+    #define Y_MIN_PIN                         29
87
+    #define Y_MAX_PIN                 Y_DIAG_PIN
88 88
   #endif
89 89
 
90 90
 #else
91 91
 
92
-  #define X_MIN_PIN        14   // PD4 MIN ES1
93
-  #define X_MAX_PIN        32   // PD10 MAX ES1
94
-  #define Y_MIN_PIN        29   // PD6 MIN ES2
95
-  #define Y_MAX_PIN        15   // PD5 MAX ES2
92
+  #define X_MIN_PIN                           14  // PD4 MIN ES1
93
+  #define X_MAX_PIN                           32  // PD10 MAX ES1
94
+  #define Y_MIN_PIN                           29  // PD6 MIN ES2
95
+  #define Y_MAX_PIN                           15  // PD5 MAX ES2
96 96
 
97 97
 #endif
98 98
 
99
-#define Z_MIN_PIN          31   // PA7 MIN ES3
100
-#define Z_MAX_PIN          30   // PD9 MAX ES3
99
+#define Z_MIN_PIN                             31  // PA7 MIN ES3
100
+#define Z_MAX_PIN                             30  // PD9 MAX ES3
101 101
 
102 102
 //
103 103
 // Z Probe (when not Z_MIN_PIN)
104 104
 //
105 105
 #ifndef Z_MIN_PROBE_PIN
106
-  #define Z_MIN_PROBE_PIN  32
106
+  #define Z_MIN_PROBE_PIN                     32
107 107
 #endif
108 108
 
109 109
 //
110 110
 // Steppers
111 111
 //
112
-#define X_STEP_PIN         38   // PC6 X-STEP *
113
-#define X_DIR_PIN          37   // PC5 X-DIR *
114
-#define X_ENABLE_PIN       41   // PC9 EN1
112
+#define X_STEP_PIN                            38  // PC6 X-STEP *
113
+#define X_DIR_PIN                             37  // PC5 X-DIR *
114
+#define X_ENABLE_PIN                          41  // PC9 EN1
115 115
 #ifndef X_CS_PIN
116
-  #define X_CS_PIN         39   // PC7 X_nCS
116
+  #define X_CS_PIN                            39  // PC7 X_nCS
117 117
 #endif
118 118
 
119
-#define Y_STEP_PIN         51   // PC12 Y-STEP *
120
-#define Y_DIR_PIN          92   // PC11 Y-DIR -AddOns *
121
-#define Y_ENABLE_PIN       49   // PC14 Y-EN *
119
+#define Y_STEP_PIN                            51  // PC12 Y-STEP *
120
+#define Y_DIR_PIN                             92  // PC11 Y-DIR -AddOns *
121
+#define Y_ENABLE_PIN                          49  // PC14 Y-EN *
122 122
 #ifndef Y_CS_PIN
123
-  #define Y_CS_PIN         50   // PC13 Y_nCS
123
+  #define Y_CS_PIN                            50  // PC13 Y_nCS
124 124
 #endif
125 125
 
126
-#define Z_STEP_PIN         46   // PC17 Z-STEP *
127
-#define Z_DIR_PIN          47   // PC16 Z-DIR *
128
-#define Z_ENABLE_PIN       44   // PC19 Z-END *
126
+#define Z_STEP_PIN                            46  // PC17 Z-STEP *
127
+#define Z_DIR_PIN                             47  // PC16 Z-DIR *
128
+#define Z_ENABLE_PIN                          44  // PC19 Z-END *
129 129
 #ifndef Z_CS_PIN
130
-  #define Z_CS_PIN         45   // PC18 Z_nCS
130
+  #define Z_CS_PIN                            45  // PC18 Z_nCS
131 131
 #endif
132 132
 
133
-#define E0_STEP_PIN       107   // PB10 E1-STEP -AddOns *
134
-#define E0_DIR_PIN         96   // PC10 E1-DIR -AddOns *
135
-#define E0_ENABLE_PIN     105   // PB22 E1-EN -AddOns *
133
+#define E0_STEP_PIN                          107  // PB10 E1-STEP -AddOns *
134
+#define E0_DIR_PIN                            96  // PC10 E1-DIR -AddOns *
135
+#define E0_ENABLE_PIN                        105  // PB22 E1-EN -AddOns *
136 136
 #ifndef E0_CS_PIN
137
-  #define E0_CS_PIN       104   // PC20 E1_nCS -AddOns *
137
+  #define E0_CS_PIN                          104  // PC20 E1_nCS -AddOns *
138 138
 #endif
139 139
 
140
-#define E1_STEP_PIN        22   // PB26 E2_STEP *
141
-#define E1_DIR_PIN         97   // PB24 E2_DIR -AddOns *
142
-#define E1_ENABLE_PIN      18   // PA11 E2-EN
140
+#define E1_STEP_PIN                           22  // PB26 E2_STEP *
141
+#define E1_DIR_PIN                            97  // PB24 E2_DIR -AddOns *
142
+#define E1_ENABLE_PIN                         18  // PA11 E2-EN
143 143
 #ifndef E1_CS_PIN
144
-  #define E1_CS_PIN        19   // PA10 E2_nCS
144
+  #define E1_CS_PIN                           19  // PA10 E2_nCS
145 145
 #endif
146 146
 
147 147
 //
@@ -150,106 +150,106 @@
150 150
 //
151 151
 #if ENABLED(TMC_USE_SW_SPI)
152 152
   #ifndef TMC_SW_MOSI
153
-    #define TMC_SW_MOSI    28   // PD3
153
+    #define TMC_SW_MOSI                       28  // PD3
154 154
   #endif
155 155
   #ifndef TMC_SW_MISO
156
-    #define TMC_SW_MISO    26   // PD1
156
+    #define TMC_SW_MISO                       26  // PD1
157 157
   #endif
158 158
   #ifndef TMC_SW_SCK
159
-    #define TMC_SW_SCK     27   // PD2
159
+    #define TMC_SW_SCK                        27  // PD2
160 160
   #endif
161 161
 #endif
162 162
 
163 163
 //
164 164
 // Temperature Sensors
165 165
 //
166
-#define TEMP_0_PIN         10   // D10 PB19 THERM AN1 *
167
-#define TEMP_1_PIN          9   // D9 PB18 THERM AN2 *
168
-#define TEMP_2_PIN          8   // D8 PB17 THERM AN4 *
169
-#define TEMP_BED_PIN       11   // D11 PB20 THERM AN3 *
166
+#define TEMP_0_PIN                            10  // D10 PB19 THERM AN1 *
167
+#define TEMP_1_PIN                             9  // D9 PB18 THERM AN2 *
168
+#define TEMP_2_PIN                             8  // D8 PB17 THERM AN4 *
169
+#define TEMP_BED_PIN                          11  // D11 PB20 THERM AN3 *
170 170
 
171 171
 //
172 172
 // Heaters / Fans
173 173
 //
174
-#define HEATER_0_PIN        6   // D6 PC24 FET_PWM3
175
-#define HEATER_1_PIN        7   // D7 PC23 FET_PWM4
176
-#define HEATER_2_PIN        8   // D8 PC22 FET_PWM5
177
-#define HEATER_BED_PIN      9   // D9 PC21 BED_PWM
174
+#define HEATER_0_PIN                           6  // D6 PC24 FET_PWM3
175
+#define HEATER_1_PIN                           7  // D7 PC23 FET_PWM4
176
+#define HEATER_2_PIN                           8  // D8 PC22 FET_PWM5
177
+#define HEATER_BED_PIN                         9  // D9 PC21 BED_PWM
178 178
 
179 179
 #ifndef FAN_PIN
180
-  #define FAN_PIN           4   // D4 PC26 FET_PWM1
180
+  #define FAN_PIN                              4  // D4 PC26 FET_PWM1
181 181
 #endif
182
-#define FAN1_PIN            5   // D5 PC25 FET_PWM2
182
+#define FAN1_PIN                               5  // D5 PC25 FET_PWM2
183 183
 
184 184
 //
185 185
 // Misc. Functions
186 186
 //
187 187
 
188 188
 // Internal MicroSD card reader on the PCB
189
-#define INT_SCK_PIN        42   // D42 PA19/MCCK
190
-#define INT_MISO_PIN       43   // D43 PA20/MCCDA
191
-#define INT_MOSI_PIN       73   // D73 PA21/MCDA0
192
-#define INT_SDSS           55   // D55 PA24/MCDA3
189
+#define INT_SCK_PIN                           42  // D42 PA19/MCCK
190
+#define INT_MISO_PIN                          43  // D43 PA20/MCCDA
191
+#define INT_MOSI_PIN                          73  // D73 PA21/MCDA0
192
+#define INT_SDSS                              55  // D55 PA24/MCDA3
193 193
 
194 194
 // External SD card reader on SC2
195
-#define SCK_PIN            76   // D76 PA27
196
-#define MISO_PIN           74   // D74 PA25
197
-#define MOSI_PIN           75   // D75 PA26
198
-#define SDSS               87   // D87 PA29
195
+#define SCK_PIN                               76  // D76 PA27
196
+#define MISO_PIN                              74  // D74 PA25
197
+#define MOSI_PIN                              75  // D75 PA26
198
+#define SDSS                                  87  // D87 PA29
199 199
 
200 200
 // Unused Digital GPIO J20 Pins
201
-#define GPIO_PB1_J20_5     94   // D94 PB1 (Header J20 5)
202
-#define GPIO_PB0_J20_6     95   // D95 PB0 (Header J20 6)
203
-#define GPIO_PB3_J20_7    103   // D103 PB3 (Header J20 7)
204
-#define GPIO_PB2_J20_8     93   // D93 PB2 (Header J20 8)
205
-#define GPIO_PB6_J20_9     99   // D99 PB6 (Header J20 9)
206
-#define GPIO_PB5_J20_10   101   // D101 PB5 (Header J20 10)
207
-#define GPIO_PB8_J20_11   100   // D100 PB8 (Header J20 11)
208
-#define GPIO_PB4_J20_12   102   // D102 PB4 (Header J20 12)
209
-#define GPIO_PB9_J20_13   108   // D108 PB9 (Header J20 13)
210
-#define GPIO_PB7_J20_14    98   // D98 PB7 (Header J20 14)
211
-#define GPIO_PB15_J20_15   66   // D66 PB15 (Header J20 15)
212
-#define GPIO_PB16_J20_16   67   // D67 PB16 (Header J20 16)
213
-#define GPIO_PB14_J20_17   53   // D53 PB14 (Header J20 17)
214
-#define GPIO_PA18_J20_21   71   // D71 PA17 (Header J20 21)
215
-#define GPIO_PA17_J20_22   70   // D70 PA17 (Header J20 22)
201
+#define GPIO_PB1_J20_5                        94  // D94 PB1 (Header J20 5)
202
+#define GPIO_PB0_J20_6                        95  // D95 PB0 (Header J20 6)
203
+#define GPIO_PB3_J20_7                       103  // D103 PB3 (Header J20 7)
204
+#define GPIO_PB2_J20_8                        93  // D93 PB2 (Header J20 8)
205
+#define GPIO_PB6_J20_9                        99  // D99 PB6 (Header J20 9)
206
+#define GPIO_PB5_J20_10                      101  // D101 PB5 (Header J20 10)
207
+#define GPIO_PB8_J20_11                      100  // D100 PB8 (Header J20 11)
208
+#define GPIO_PB4_J20_12                      102  // D102 PB4 (Header J20 12)
209
+#define GPIO_PB9_J20_13                      108  // D108 PB9 (Header J20 13)
210
+#define GPIO_PB7_J20_14                       98  // D98 PB7 (Header J20 14)
211
+#define GPIO_PB15_J20_15                      66  // D66 PB15 (Header J20 15)
212
+#define GPIO_PB16_J20_16                      67  // D67 PB16 (Header J20 16)
213
+#define GPIO_PB14_J20_17                      53  // D53 PB14 (Header J20 17)
214
+#define GPIO_PA18_J20_21                      71  // D71 PA17 (Header J20 21)
215
+#define GPIO_PA17_J20_22                      70  // D70 PA17 (Header J20 22)
216 216
 
217 217
 // Case Light
218 218
 
219
-#define CASE_LIGHT_PIN     GPIO_PB1_J20_5
219
+#define CASE_LIGHT_PIN            GPIO_PB1_J20_5
220 220
 
221 221
 // 2MB SPI Flash
222
-#define SPI_FLASH_SS       52   // D52 PB21
222
+#define SPI_FLASH_SS                          52  // D52 PB21
223 223
 
224 224
 //
225 225
 // Filament Runout Sensor
226 226
 //
227 227
 
228 228
 #ifndef FIL_RUNOUT_PIN
229
-  #define FIL_RUNOUT_PIN GPIO_PB15_J20_15
229
+  #define FIL_RUNOUT_PIN        GPIO_PB15_J20_15
230 230
 #endif
231 231
 #ifndef FIL_RUNOUT2_PIN
232
-  #define FIL_RUNOUT2_PIN GPIO_PB16_J20_16
232
+  #define FIL_RUNOUT2_PIN       GPIO_PB16_J20_16
233 233
 #endif
234 234
 
235 235
 //
236 236
 // LCD / Controller
237 237
 //
238 238
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
239
-  #define BEEPER_PIN       23   // D24 PA15_CTS1
240
-  #define LCD_PINS_RS      17   // D17 PA12_RXD1
241
-  #define LCD_PINS_ENABLE  24   // D23 PA14_RTS1
242
-  #define LCD_PINS_D4      69   // D69 PA0_CANTX0
243
-  #define LCD_PINS_D5      54   // D54 PA16_SCK1
244
-  #define LCD_PINS_D6      68   // D68 PA1_CANRX0
245
-  #define LCD_PINS_D7      34   // D34 PC2_PWML0
239
+  #define BEEPER_PIN                          23  // D24 PA15_CTS1
240
+  #define LCD_PINS_RS                         17  // D17 PA12_RXD1
241
+  #define LCD_PINS_ENABLE                     24  // D23 PA14_RTS1
242
+  #define LCD_PINS_D4                         69  // D69 PA0_CANTX0
243
+  #define LCD_PINS_D5                         54  // D54 PA16_SCK1
244
+  #define LCD_PINS_D6                         68  // D68 PA1_CANRX0
245
+  #define LCD_PINS_D7                         34  // D34 PC2_PWML0
246 246
 
247
-  #define SD_DETECT_PIN     2   // D2  PB25_TIOA0
247
+  #define SD_DETECT_PIN                        2  // D2  PB25_TIOA0
248 248
 
249 249
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
250 250
     // Buttons on AUX-2
251
-    #define BTN_EN1        60   // D60 PA3_TIOB1
252
-    #define BTN_EN2        13   // D13 PB27_TIOB0
253
-    #define BTN_ENC        16   // D16 PA13_TXD1 // the click
251
+    #define BTN_EN1                           60  // D60 PA3_TIOB1
252
+    #define BTN_EN2                           13  // D13 PB27_TIOB0
253
+    #define BTN_ENC                           16  // D16 PA13_TXD1 // the click
254 254
   #endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
255 255
 #endif // HAS_SPI_LCD

+ 46
- 46
Marlin/src/pins/sam/pins_CNCONTROLS_15D.h Parādīt failu

@@ -33,91 +33,91 @@
33 33
 //
34 34
 // Servos
35 35
 //
36
-#define SERVO0_PIN          6
36
+#define SERVO0_PIN                             6
37 37
 
38 38
 //
39 39
 // Limit Switches
40 40
 //
41
-#define X_STOP_PIN         34
42
-#define Y_STOP_PIN         39
43
-#define Z_STOP_PIN         62
41
+#define X_STOP_PIN                            34
42
+#define Y_STOP_PIN                            39
43
+#define Z_STOP_PIN                            62
44 44
 
45 45
 #ifndef Z_MIN_PROBE_PIN
46
-  #define Z_MIN_PROBE_PIN  49
46
+  #define Z_MIN_PROBE_PIN                     49
47 47
 #endif
48 48
 
49 49
 //
50 50
 // Steppers
51 51
 //
52
-#define X_STEP_PIN         14
53
-#define X_DIR_PIN          25
54
-#define X_ENABLE_PIN       26
52
+#define X_STEP_PIN                            14
53
+#define X_DIR_PIN                             25
54
+#define X_ENABLE_PIN                          26
55 55
 
56
-#define Y_STEP_PIN         11
57
-#define Y_DIR_PIN          12
58
-#define Y_ENABLE_PIN       15
56
+#define Y_STEP_PIN                            11
57
+#define Y_DIR_PIN                             12
58
+#define Y_ENABLE_PIN                          15
59 59
 
60
-#define Z_STEP_PIN         24
61
-#define Z_DIR_PIN          27
62
-#define Z_ENABLE_PIN       28
60
+#define Z_STEP_PIN                            24
61
+#define Z_DIR_PIN                             27
62
+#define Z_ENABLE_PIN                          28
63 63
 
64
-#define E0_STEP_PIN        64
65
-#define E0_DIR_PIN         65
66
-#define E0_ENABLE_PIN      63
64
+#define E0_STEP_PIN                           64
65
+#define E0_DIR_PIN                            65
66
+#define E0_ENABLE_PIN                         63
67 67
 
68
-#define E1_STEP_PIN         8
69
-#define E1_DIR_PIN          7
70
-#define E1_ENABLE_PIN      29
68
+#define E1_STEP_PIN                            8
69
+#define E1_DIR_PIN                             7
70
+#define E1_ENABLE_PIN                         29
71 71
 
72 72
 //
73 73
 // Temperature Sensors
74 74
 // Analog Inputs
75 75
 //
76
-#define TEMP_0_PIN          1
77
-#define TEMP_1_PIN          2
78
-#define TEMP_BED_PIN        4
76
+#define TEMP_0_PIN                             1
77
+#define TEMP_1_PIN                             2
78
+#define TEMP_BED_PIN                           4
79 79
 
80 80
 #ifndef TEMP_CHAMBER_PIN
81
-  #define TEMP_CHAMBER_PIN  5
81
+  #define TEMP_CHAMBER_PIN                     5
82 82
 #endif
83 83
 
84 84
 //
85 85
 // Heaters
86 86
 //
87
-#define HEATER_0_PIN        3
88
-#define HEATER_1_PIN        4
89
-#define HEATER_BED_PIN     32
90
-#define HEATER_CHAMBER_PIN 33
87
+#define HEATER_0_PIN                           3
88
+#define HEATER_1_PIN                           4
89
+#define HEATER_BED_PIN                        32
90
+#define HEATER_CHAMBER_PIN                    33
91 91
 
92 92
 //
93 93
 // Fans
94 94
 //
95
-//#define FAN0_PIN              8
96
-#define ORIG_E0_AUTO_FAN_PIN 30
97
-#define ORIG_E1_AUTO_FAN_PIN 30
98
-#define ORIG_E2_AUTO_FAN_PIN 30
99
-#define ORIG_E3_AUTO_FAN_PIN 30
100
-#define ORIG_CHAMBER_AUTO_FAN_PIN 10
95
+//#define FAN0_PIN                             8
96
+#define ORIG_E0_AUTO_FAN_PIN                  30
97
+#define ORIG_E1_AUTO_FAN_PIN                  30
98
+#define ORIG_E2_AUTO_FAN_PIN                  30
99
+#define ORIG_E3_AUTO_FAN_PIN                  30
100
+#define ORIG_CHAMBER_AUTO_FAN_PIN             10
101 101
 
102 102
 //
103 103
 // SD card
104 104
 //
105
-#define SCK_PIN            76
106
-#define MISO_PIN           74
107
-#define MOSI_PIN           75
108
-#define SDSS               53
109
-#define SD_DETECT_PIN      40
105
+#define SCK_PIN                               76
106
+#define MISO_PIN                              74
107
+#define MOSI_PIN                              75
108
+#define SDSS                                  53
109
+#define SD_DETECT_PIN                         40
110 110
 
111 111
 // Common I/O
112 112
 
113
-//#define PWM_1_PIN           6 // probe
114
-//#define PWM_2_PIN          13
115
-//#define SPARE_IO           17
116
-#define BEEPER_PIN         13
117
-#define STAT_LED_BLUE_PIN  -1
118
-#define STAT_LED_RED_PIN   31
113
+//#define PWM_1_PIN                            6  // probe
114
+//#define PWM_2_PIN                           13
115
+//#define SPARE_IO                            17
116
+#define BEEPER_PIN                            13
117
+#define STAT_LED_BLUE_PIN                     -1
118
+#define STAT_LED_RED_PIN                      31
119 119
 
120 120
 // G425 CALIBRATION_GCODE default pin
121 121
 #ifndef CALIBRATION_PIN
122
-  #define CALIBRATION_PIN  66
122
+  #define CALIBRATION_PIN                     66
123 123
 #endif

+ 74
- 74
Marlin/src/pins/sam/pins_DUE3DOM.h Parādīt failu

@@ -34,138 +34,138 @@
34 34
 //
35 35
 // Servos
36 36
 //
37
-#define SERVO0_PIN          5
38
-#define SERVO1_PIN          6
39
-#define SERVO2_PIN         13
40
-#define SERVO3_PIN         -1
37
+#define SERVO0_PIN                             5
38
+#define SERVO1_PIN                             6
39
+#define SERVO2_PIN                            13
40
+#define SERVO3_PIN                            -1
41 41
 
42 42
 //
43 43
 // Limit Switches
44 44
 //
45
-#define X_MIN_PIN          38
46
-#define X_MAX_PIN          36
47
-#define Y_MIN_PIN          34
48
-#define Y_MAX_PIN          32
49
-#define Z_MIN_PIN          30
50
-#define Z_MAX_PIN          28
45
+#define X_MIN_PIN                             38
46
+#define X_MAX_PIN                             36
47
+#define Y_MIN_PIN                             34
48
+#define Y_MAX_PIN                             32
49
+#define Z_MIN_PIN                             30
50
+#define Z_MAX_PIN                             28
51 51
 
52 52
 //
53 53
 // Steppers
54 54
 //
55
-#define X_STEP_PIN          2
56
-#define X_DIR_PIN           3
57
-#define X_ENABLE_PIN       22
55
+#define X_STEP_PIN                             2
56
+#define X_DIR_PIN                              3
57
+#define X_ENABLE_PIN                          22
58 58
 
59
-#define Y_STEP_PIN         17
60
-#define Y_DIR_PIN          16
61
-#define Y_ENABLE_PIN       26
59
+#define Y_STEP_PIN                            17
60
+#define Y_DIR_PIN                             16
61
+#define Y_ENABLE_PIN                          26
62 62
 
63
-#define Z_STEP_PIN         61   // Z1 STP
64
-#define Z_DIR_PIN          60   // Z1 DIR
65
-#define Z_ENABLE_PIN       15   // Z1 ENA
63
+#define Z_STEP_PIN                            61  // Z1 STP
64
+#define Z_DIR_PIN                             60  // Z1 DIR
65
+#define Z_ENABLE_PIN                          15  // Z1 ENA
66 66
 
67
-#define E0_STEP_PIN        64   // Z2 STP
68
-#define E0_DIR_PIN         63   // Z2 DIR
69
-#define E0_ENABLE_PIN      62   // Z2 ENA
67
+#define E0_STEP_PIN                           64  // Z2 STP
68
+#define E0_DIR_PIN                            63  // Z2 DIR
69
+#define E0_ENABLE_PIN                         62  // Z2 ENA
70 70
 
71
-#define E1_STEP_PIN        51   // E1 STP
72
-#define E1_DIR_PIN         53   // E1 DIR
73
-#define E1_ENABLE_PIN      65   // E1 ENA
71
+#define E1_STEP_PIN                           51  // E1 STP
72
+#define E1_DIR_PIN                            53  // E1 DIR
73
+#define E1_ENABLE_PIN                         65  // E1 ENA
74 74
 
75
-#define E2_STEP_PIN        24   // E2 STP
76
-#define E2_DIR_PIN         23   // E2 DIR
77
-#define E2_ENABLE_PIN      49   // E2 ENA
75
+#define E2_STEP_PIN                           24  // E2 STP
76
+#define E2_DIR_PIN                            23  // E2 DIR
77
+#define E2_ENABLE_PIN                         49  // E2 ENA
78 78
 
79 79
 //
80 80
 // Temperature Sensors
81 81
 //
82
-#define TEMP_0_PIN          0   // Analog Input (HOTEND0 thermistor)
83
-#define TEMP_1_PIN          2   // Analog Input (HOTEND1 thermistor)
84
-#define TEMP_2_PIN          5   // Analog Input (unused)
85
-#define TEMP_BED_PIN        1   // Analog Input (BED thermistor)
82
+#define TEMP_0_PIN                             0  // Analog Input (HOTEND0 thermistor)
83
+#define TEMP_1_PIN                             2  // Analog Input (HOTEND1 thermistor)
84
+#define TEMP_2_PIN                             5  // Analog Input (unused)
85
+#define TEMP_BED_PIN                           1  // Analog Input (BED thermistor)
86 86
 
87 87
 // SPI for Max6675 or Max31855 Thermocouple
88 88
 #if DISABLED(SDSUPPORT)
89
-  #define MAX6675_SS_PIN   -1
89
+  #define MAX6675_SS_PIN                      -1
90 90
 #else
91
-  #define MAX6675_SS_PIN   -1
91
+  #define MAX6675_SS_PIN                      -1
92 92
 #endif
93 93
 
94 94
 //
95 95
 // Heaters / Fans
96 96
 //
97
-#define HEATER_0_PIN        7   // HOTEND0 MOSFET
98
-#define HEATER_1_PIN        8   // HOTEND1 MOSFET
99
-#define HEATER_BED_PIN     39   // BED MOSFET
97
+#define HEATER_0_PIN                           7  // HOTEND0 MOSFET
98
+#define HEATER_1_PIN                           8  // HOTEND1 MOSFET
99
+#define HEATER_BED_PIN                        39  // BED MOSFET
100 100
 
101 101
 #ifndef FAN_PIN
102
-  #define FAN_PIN          11   // FAN1 header on board - PRINT FAN
102
+  #define FAN_PIN                             11  // FAN1 header on board - PRINT FAN
103 103
 #endif
104
-#define FAN1_PIN            9   // FAN2 header on board - CONTROLLER FAN
105
-#define FAN2_PIN           12   // FAN3 header on board - EXTRUDER0 FAN
104
+#define FAN1_PIN                               9  // FAN2 header on board - CONTROLLER FAN
105
+#define FAN2_PIN                              12  // FAN3 header on board - EXTRUDER0 FAN
106 106
 
107 107
 //
108 108
 // Misc. Functions
109 109
 //
110
-#define SDSS                4
111
-#define PS_ON_PIN          40
110
+#define SDSS                                   4
111
+#define PS_ON_PIN                             40
112 112
 
113 113
 //
114 114
 // LCD / Controller
115 115
 //
116 116
 #if HAS_SPI_LCD
117 117
 
118
-  #define LCD_PINS_RS       42
119
-  #define LCD_PINS_ENABLE   43
120
-  #define LCD_PINS_D4       44
121
-  #define LCD_PINS_D5       45
122
-  #define LCD_PINS_D6       46
123
-  #define LCD_PINS_D7       47
118
+  #define LCD_PINS_RS                         42
119
+  #define LCD_PINS_ENABLE                     43
120
+  #define LCD_PINS_D4                         44
121
+  #define LCD_PINS_D5                         45
122
+  #define LCD_PINS_D6                         46
123
+  #define LCD_PINS_D7                         47
124 124
 
125 125
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
126 126
 
127
-    #define BEEPER_PIN      41
127
+    #define BEEPER_PIN                        41
128 128
 
129
-    #define BTN_EN1         50
130
-    #define BTN_EN2         52
131
-    #define BTN_ENC         48
129
+    #define BTN_EN1                           50
130
+    #define BTN_EN2                           52
131
+    #define BTN_ENC                           48
132 132
 
133
-    #define SDSS             4
134
-    #define SD_DETECT_PIN   14
133
+    #define SDSS                               4
134
+    #define SD_DETECT_PIN                     14
135 135
 
136 136
   #elif ENABLED(RADDS_DISPLAY)
137 137
 
138
-    #define BEEPER_PIN      41
138
+    #define BEEPER_PIN                        41
139 139
 
140
-    #define BTN_EN1         50
141
-    #define BTN_EN2         52
142
-    #define BTN_ENC         48
140
+    #define BTN_EN1                           50
141
+    #define BTN_EN2                           52
142
+    #define BTN_ENC                           48
143 143
 
144
-    #define BTN_BACK        71
144
+    #define BTN_BACK                          71
145 145
 
146 146
     #undef SDSS
147
-    #define SDSS             4
148
-    #define SD_DETECT_PIN   14
147
+    #define SDSS                               4
148
+    #define SD_DETECT_PIN                     14
149 149
 
150 150
   #elif HAS_SSD1306_OLED_I2C
151 151
 
152
-    #define BTN_EN1         50
153
-    #define BTN_EN2         52
154
-    #define BTN_ENC         48
155
-    #define BEEPER_PIN      41
156
-    #define LCD_SDSS         4
157
-    #define SD_DETECT_PIN   14
152
+    #define BTN_EN1                           50
153
+    #define BTN_EN2                           52
154
+    #define BTN_ENC                           48
155
+    #define BEEPER_PIN                        41
156
+    #define LCD_SDSS                           4
157
+    #define SD_DETECT_PIN                     14
158 158
 
159 159
   #elif ENABLED(SPARK_FULL_GRAPHICS)
160 160
 
161
-    #define LCD_PINS_D4     29
162
-    #define LCD_PINS_ENABLE 27
163
-    #define LCD_PINS_RS     25
161
+    #define LCD_PINS_D4                       29
162
+    #define LCD_PINS_ENABLE                   27
163
+    #define LCD_PINS_RS                       25
164 164
 
165
-    #define BTN_EN1         35
166
-    #define BTN_EN2         33
167
-    #define BTN_ENC         37
165
+    #define BTN_EN1                           35
166
+    #define BTN_EN2                           33
167
+    #define BTN_ENC                           37
168 168
 
169
-    #define BEEPER_PIN      -1
169
+    #define BEEPER_PIN                        -1
170 170
   #endif // SPARK_FULL_GRAPHICS
171 171
 #endif // HAS_SPI_LCD

+ 76
- 76
Marlin/src/pins/sam/pins_DUE3DOM_MINI.h Parādīt failu

@@ -34,141 +34,141 @@
34 34
 //
35 35
 // Servos
36 36
 //
37
-#define SERVO0_PIN          5
38
-#define SERVO1_PIN          6
39
-#define SERVO2_PIN          8   // 4-pin header FAN0
40
-#define SERVO3_PIN         -1
37
+#define SERVO0_PIN                             5
38
+#define SERVO1_PIN                             6
39
+#define SERVO2_PIN                             8  // 4-pin header FAN0
40
+#define SERVO3_PIN                            -1
41 41
 
42 42
 //
43 43
 // Limit Switches
44 44
 //
45
-#define X_MIN_PIN          38
46
-#define X_MAX_PIN          -1
47
-#define Y_MIN_PIN          34
48
-#define Y_MAX_PIN          -1
49
-#define Z_MIN_PIN          30
50
-#define Z_MAX_PIN          -1
45
+#define X_MIN_PIN                             38
46
+#define X_MAX_PIN                             -1
47
+#define Y_MIN_PIN                             34
48
+#define Y_MAX_PIN                             -1
49
+#define Z_MIN_PIN                             30
50
+#define Z_MAX_PIN                             -1
51 51
 
52 52
 //
53 53
 // Steppers
54 54
 //
55
-#define X_STEP_PIN         17
56
-#define X_DIR_PIN          16
57
-#define X_ENABLE_PIN       22
55
+#define X_STEP_PIN                            17
56
+#define X_DIR_PIN                             16
57
+#define X_ENABLE_PIN                          22
58 58
 
59
-#define Y_STEP_PIN          2
60
-#define Y_DIR_PIN           3
61
-#define Y_ENABLE_PIN       26
59
+#define Y_STEP_PIN                             2
60
+#define Y_DIR_PIN                              3
61
+#define Y_ENABLE_PIN                          26
62 62
 
63
-#define Z_STEP_PIN         64
64
-#define Z_DIR_PIN          63
65
-#define Z_ENABLE_PIN       15
63
+#define Z_STEP_PIN                            64
64
+#define Z_DIR_PIN                             63
65
+#define Z_ENABLE_PIN                          15
66 66
 
67
-#define E0_STEP_PIN        61
68
-#define E0_DIR_PIN         60
69
-#define E0_ENABLE_PIN      62
67
+#define E0_STEP_PIN                           61
68
+#define E0_DIR_PIN                            60
69
+#define E0_ENABLE_PIN                         62
70 70
 
71 71
 //
72 72
 // Temperature Sensors
73 73
 //
74
-#define TEMP_0_PIN          0   // Analog Input (HOTEND0 thermistor)
75
-#define TEMP_1_PIN          2   // Analog Input (unused)
76
-#define TEMP_2_PIN          5   // Analog Input (OnBoard thermistor beta 3950)
77
-#define TEMP_BED_PIN        1   // Analog Input (BED thermistor)
74
+#define TEMP_0_PIN                             0  // Analog Input (HOTEND0 thermistor)
75
+#define TEMP_1_PIN                             2  // Analog Input (unused)
76
+#define TEMP_2_PIN                             5  // Analog Input (OnBoard thermistor beta 3950)
77
+#define TEMP_BED_PIN                           1  // Analog Input (BED thermistor)
78 78
 
79 79
 // SPI for Max6675 or Max31855 Thermocouple
80 80
 #if DISABLED(SDSUPPORT)
81
-  #define MAX6675_SS_PIN   53
81
+  #define MAX6675_SS_PIN                      53
82 82
 #else
83
-  #define MAX6675_SS_PIN   53
83
+  #define MAX6675_SS_PIN                      53
84 84
 #endif
85 85
 
86 86
 //
87 87
 // Heaters / Fans
88 88
 //
89
-#define HEATER_0_PIN       13   // HOTEND0 MOSFET
90
-#define HEATER_BED_PIN      7   // BED MOSFET
89
+#define HEATER_0_PIN                          13  // HOTEND0 MOSFET
90
+#define HEATER_BED_PIN                         7  // BED MOSFET
91 91
 
92 92
 #ifndef FAN_PIN
93
-  #define FAN_PIN          11   // FAN1 header on board - PRINT FAN
93
+  #define FAN_PIN                             11  // FAN1 header on board - PRINT FAN
94 94
 #endif
95
-#define FAN1_PIN           12   // FAN2 header on board - CONTROLLER FAN
96
-#define FAN2_PIN            9   // FAN3 header on board - EXTRUDER0 FAN
97
-//#define FAN3_PIN          8   // FAN0 4-pin header on board
95
+#define FAN1_PIN                              12  // FAN2 header on board - CONTROLLER FAN
96
+#define FAN2_PIN                               9  // FAN3 header on board - EXTRUDER0 FAN
97
+//#define FAN3_PIN                             8  // FAN0 4-pin header on board
98 98
 
99 99
 //
100 100
 // Misc. Functions
101 101
 //
102
-#define SDSS                4
103
-#define PS_ON_PIN          40
102
+#define SDSS                                   4
103
+#define PS_ON_PIN                             40
104 104
 
105 105
 //
106 106
 // LCD / Controller
107 107
 //
108 108
 #if HAS_SPI_LCD
109 109
 
110
-  #define LCD_PINS_RS       42
111
-  #define LCD_PINS_ENABLE   43
112
-  #define LCD_PINS_D4       44
113
-  #define LCD_PINS_D5       45
114
-  #define LCD_PINS_D6       46
115
-  #define LCD_PINS_D7       47
110
+  #define LCD_PINS_RS                         42
111
+  #define LCD_PINS_ENABLE                     43
112
+  #define LCD_PINS_D4                         44
113
+  #define LCD_PINS_D5                         45
114
+  #define LCD_PINS_D6                         46
115
+  #define LCD_PINS_D7                         47
116 116
 
117 117
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
118 118
 
119
-    #define BEEPER_PIN      41
119
+    #define BEEPER_PIN                        41
120 120
 
121
-    #define BTN_EN1         50
122
-    #define BTN_EN2         52
123
-    #define BTN_ENC         48
121
+    #define BTN_EN1                           50
122
+    #define BTN_EN2                           52
123
+    #define BTN_ENC                           48
124 124
 
125
-    #define SDSS             4
126
-    #define SD_DETECT_PIN   14
125
+    #define SDSS                               4
126
+    #define SD_DETECT_PIN                     14
127 127
 
128 128
   #elif ENABLED(RADDS_DISPLAY)
129 129
 
130
-    #define BEEPER_PIN      41
130
+    #define BEEPER_PIN                        41
131 131
 
132
-    #define BTN_EN1         50
133
-    #define BTN_EN2         52
134
-    #define BTN_ENC         48
132
+    #define BTN_EN1                           50
133
+    #define BTN_EN2                           52
134
+    #define BTN_ENC                           48
135 135
 
136
-    #define BTN_BACK        71
136
+    #define BTN_BACK                          71
137 137
 
138 138
     #undef SDSS
139
-    #define SDSS             4
140
-    #define SD_DETECT_PIN   14
139
+    #define SDSS                               4
140
+    #define SD_DETECT_PIN                     14
141 141
 
142 142
   #elif HAS_SSD1306_OLED_I2C
143 143
 
144
-    #define BTN_EN1         50
145
-    #define BTN_EN2         52
146
-    #define BTN_ENC         48
147
-    #define BEEPER_PIN      41
148
-    #define LCD_SDSS         4
149
-    #define SD_DETECT_PIN   14
144
+    #define BTN_EN1                           50
145
+    #define BTN_EN2                           52
146
+    #define BTN_ENC                           48
147
+    #define BEEPER_PIN                        41
148
+    #define LCD_SDSS                           4
149
+    #define SD_DETECT_PIN                     14
150 150
 
151 151
   #elif ENABLED(SPARK_FULL_GRAPHICS)
152 152
 
153
-    #define LCD_PINS_D4     29
154
-    #define LCD_PINS_ENABLE 27
155
-    #define LCD_PINS_RS     25
153
+    #define LCD_PINS_D4                       29
154
+    #define LCD_PINS_ENABLE                   27
155
+    #define LCD_PINS_RS                       25
156 156
 
157
-    #define BTN_EN1         35
158
-    #define BTN_EN2         33
159
-    #define BTN_ENC         37
157
+    #define BTN_EN1                           35
158
+    #define BTN_EN2                           33
159
+    #define BTN_ENC                           37
160 160
 
161
-    #define BEEPER_PIN      -1
161
+    #define BEEPER_PIN                        -1
162 162
 
163 163
    #elif ENABLED(MINIPANEL)
164
-    #define BTN_EN1         52
165
-    #define BTN_EN2         50
166
-    #define BTN_ENC         48
167
-    #define LCD_SDSS        4
168
-    #define SD_DETECT_PIN   14
169
-    #define BEEPER_PIN      41
170
-    #define DOGLCD_A0       46
171
-    #define DOGLCD_CS       45
164
+    #define BTN_EN1                           52
165
+    #define BTN_EN2                           50
166
+    #define BTN_ENC                           48
167
+    #define LCD_SDSS                           4
168
+    #define SD_DETECT_PIN                     14
169
+    #define BEEPER_PIN                        41
170
+    #define DOGLCD_A0                         46
171
+    #define DOGLCD_CS                         45
172 172
 
173 173
   #endif // SPARK_FULL_GRAPHICS
174 174
 #endif // HAS_SPI_LCD

+ 0
- 0
Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h Parādīt failu


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels

Notiek ielāde…
Atcelt
Saglabāt