瀏覽代碼

Unify AVR90USB: Pins cleanup

Scott Lahteine 7 年之前
父節點
當前提交
5426fc1735

+ 5
- 5
Marlin/pins_AZTEEG_X3_PRO.h 查看文件

@@ -134,9 +134,9 @@
134 134
 
135 135
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
136 136
   #undef SD_DETECT_PIN
137
-  #define SD_DETECT_PIN    49 // For easy adapter board
137
+  #define SD_DETECT_PIN    49   // For easy adapter board
138 138
   #undef BEEPER_PIN
139
-  #define  BEEPER_PIN  12     // 33 isn't physically available to the LCD display
139
+  #define  BEEPER_PIN      12   // 33 isn't physically available to the LCD display
140 140
 #else
141 141
   #define STAT_LED_RED_PIN 32
142 142
   #define STAT_LED_BLUE_PIN 35
@@ -146,9 +146,9 @@
146 146
 // Misc. Functions
147 147
 //
148 148
 #if ENABLED(CASE_LIGHT_ENABLE)  && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN
149
-  #undef DOGLCD_A0            // steal pin 44 for the case light; if you have a Viki2 and have connected it
150
-  #define DOGLCD_A0      57   // following the Panucatt wiring diagram, you may need to tweak these pin assignments
151
-                                // as the wiring diagram uses pin 44 for DOGLCD_A0
149
+  #undef DOGLCD_A0            // Steal pin 44 for the case light; if you have a Viki2 and have connected it
150
+  #define DOGLCD_A0        57 // following the Panucatt wiring diagram, you may need to tweak these pin assignments
151
+                              // as the wiring diagram uses pin 44 for DOGLCD_A0
152 152
 #endif
153 153
 
154 154
 //

+ 3
- 3
Marlin/pins_GEN6.h 查看文件

@@ -107,7 +107,7 @@
107 107
 //
108 108
 #define SDSS               17
109 109
 #define DEBUG_PIN           0
110
-#define CASE_LIGHT_PIN   16     // MUST BE HARDWARE PWM
110
+#define CASE_LIGHT_PIN     16   // MUST BE HARDWARE PWM
111 111
 
112 112
 // RS485 pins
113 113
 #define TX_ENABLE_PIN      12
@@ -116,6 +116,6 @@
116 116
 //
117 117
 // M3/M4/M5 - Spindle/Laser Control
118 118
 //
119
-#define SPINDLE_LASER_ENABLE_PIN  5     // Pin should have a pullup/pulldown!
120
-#define SPINDLE_LASER_PWM_PIN    16     // MUST BE HARDWARE PWM
119
+#define SPINDLE_LASER_ENABLE_PIN  5   // Pin should have a pullup/pulldown!
120
+#define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
121 121
 #define SPINDLE_DIR_PIN           6

+ 3
- 3
Marlin/pins_GEN7_CUSTOM.h 查看文件

@@ -96,14 +96,14 @@
96 96
 // Heaters
97 97
 //
98 98
 #define HEATER_0_PIN     4
99
-#define HEATER_BED_PIN   3  // (bed)
99
+#define HEATER_BED_PIN   3   // (bed)
100 100
 
101 101
 //
102 102
 // Misc. Functions
103 103
 //
104
-#define SDSS            31  // SCL pin of I2C header || CS Pin for SD Card support
104
+#define SDSS            31   // SCL pin of I2C header || CS Pin for SD Card support
105 105
 #define PS_ON_PIN       19
106
-#define CASE_LIGHT_PIN  15    // MUST BE HARDWARE PWM
106
+#define CASE_LIGHT_PIN  15   // MUST BE HARDWARE PWM
107 107
 
108 108
 // A pin for debugging
109 109
 #define DEBUG_PIN       -1

+ 4
- 4
Marlin/pins_MEGATRONICS_3.h 查看文件

@@ -131,7 +131,7 @@
131 131
 #define SDSS               53
132 132
 #define LED_PIN            13
133 133
 #define PS_ON_PIN          12
134
-#define CASE_LIGHT_PIN     45 // try the keypad connector
134
+#define CASE_LIGHT_PIN     45   // Try the keypad connector
135 135
 
136 136
 //
137 137
 // LCD / Controller
@@ -144,9 +144,9 @@
144 144
 
145 145
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
146 146
 
147
-  #define LCD_PINS_RS      56 // CS chip select / SS chip slave select
148
-  #define LCD_PINS_ENABLE  51 // SID (MOSI)
149
-  #define LCD_PINS_D4      52 // SCK (CLK) clock
147
+  #define LCD_PINS_RS      56   // CS chip select / SS chip slave select
148
+  #define LCD_PINS_ENABLE  51   // SID (MOSI)
149
+  #define LCD_PINS_D4      52   // SCK (CLK) clock
150 150
   #define SD_DETECT_PIN    35
151 151
 
152 152
 #else

+ 74
- 77
Marlin/pins_MIGHTYBOARD_REVE.h 查看文件

@@ -64,20 +64,20 @@
64 64
 //
65 65
 // Servos
66 66
 //
67
-#define SERVO0_PIN         36 // C1 (1280-EX1)
68
-#define SERVO1_PIN         37 // C0 (1280-EX2)
69
-#define SERVO2_PIN         40 // G1 (1280-EX3)
70
-#define SERVO3_PIN         41 // G0 (1280-EX4)
67
+#define SERVO0_PIN         36   // C1 (1280-EX1)
68
+#define SERVO1_PIN         37   // C0 (1280-EX2)
69
+#define SERVO2_PIN         40   // G1 (1280-EX3)
70
+#define SERVO3_PIN         41   // G0 (1280-EX4)
71 71
 
72 72
 //
73 73
 // Limit Switches
74 74
 //
75
-#define X_MIN_PIN          49 // L0
76
-#define X_MAX_PIN          48 // L1
77
-#define Y_MIN_PIN          47 // L2
78
-#define Y_MAX_PIN          46 // L3
79
-#define Z_MIN_PIN          43 // L6
80
-#define Z_MAX_PIN          42 // L7
75
+#define X_MIN_PIN          49   // L0
76
+#define X_MAX_PIN          48   // L1
77
+#define Y_MIN_PIN          47   // L2
78
+#define Y_MAX_PIN          46   // L3
79
+#define Z_MIN_PIN          43   // L6
80
+#define Z_MAX_PIN          42   // L7
81 81
 
82 82
 //
83 83
 // Z Probe (when not Z_MIN_PIN)
@@ -89,25 +89,25 @@
89 89
 //
90 90
 // Steppers
91 91
 //
92
-#define X_STEP_PIN         55 // F1
93
-#define X_DIR_PIN          54 // F0
94
-#define X_ENABLE_PIN       56 // F2
92
+#define X_STEP_PIN         55   // F1
93
+#define X_DIR_PIN          54   // F0
94
+#define X_ENABLE_PIN       56   // F2
95 95
 
96
-#define Y_STEP_PIN         59 // F5
97
-#define Y_DIR_PIN          58 // F4
98
-#define Y_ENABLE_PIN       60 // F6
96
+#define Y_STEP_PIN         59   // F5
97
+#define Y_DIR_PIN          58   // F4
98
+#define Y_ENABLE_PIN       60   // F6
99 99
 
100
-#define Z_STEP_PIN         63 // K1
101
-#define Z_DIR_PIN          62 // K0
102
-#define Z_ENABLE_PIN       64 // K2
100
+#define Z_STEP_PIN         63   // K1
101
+#define Z_DIR_PIN          62   // K0
102
+#define Z_ENABLE_PIN       64   // K2
103 103
 
104
-#define E0_STEP_PIN        25 // A3
105
-#define E0_DIR_PIN         24 // A2
106
-#define E0_ENABLE_PIN      26 // A4
104
+#define E0_STEP_PIN        25   // A3
105
+#define E0_DIR_PIN         24   // A2
106
+#define E0_ENABLE_PIN      26   // A4
107 107
 
108
-#define E1_STEP_PIN        29 // A7
109
-#define E1_DIR_PIN         28 // A6
110
-#define E1_ENABLE_PIN      39 // G2
108
+#define E1_STEP_PIN        29   // A7
109
+#define E1_DIR_PIN         28   // A6
110
+#define E1_ENABLE_PIN      39   // G2
111 111
 
112 112
 //
113 113
 // I2C Digipots - MCP4018
@@ -115,17 +115,17 @@
115 115
 // Set from 0 - 127 with stop bit.
116 116
 // (Ex. 3F << 1 | 1)
117 117
 //
118
-#define DIGIPOTS_I2C_SCL    76 // J5
119
-#define DIGIPOTS_I2C_SDA_X  57 // F3
120
-#define DIGIPOTS_I2C_SDA_Y  61 // F7
121
-#define DIGIPOTS_I2C_SDA_Z  65 // K3
122
-#define DIGIPOTS_I2C_SDA_E0 27 // A5
123
-#define DIGIPOTS_I2C_SDA_E1 77 // J6
118
+#define DIGIPOTS_I2C_SCL    76   // J5
119
+#define DIGIPOTS_I2C_SDA_X  57   // F3
120
+#define DIGIPOTS_I2C_SDA_Y  61   // F7
121
+#define DIGIPOTS_I2C_SDA_Z  65   // K3
122
+#define DIGIPOTS_I2C_SDA_E0 27   // A5
123
+#define DIGIPOTS_I2C_SDA_E1 77   // J6
124 124
 
125 125
 //
126 126
 // Temperature Sensors
127 127
 //
128
-#define TEMP_BED_PIN       69 // K7
128
+#define TEMP_BED_PIN        69   // K7
129 129
 
130 130
 // SPI for Max6675 or Max31855 Thermocouple
131 131
 // Uses a separate SPI bus
@@ -135,10 +135,10 @@
135 135
 //  2 E4 CS2
136 136
 // 78 E2 SCK
137 137
 //
138
-#define THERMO_SCK_PIN     78 // E2
139
-#define THERMO_DO_PIN       3 // E5
140
-#define THERMO_CS1          5 // E3
141
-#define THERMO_CS2          2 // E4
138
+#define THERMO_SCK_PIN      78   // E2
139
+#define THERMO_DO_PIN        3   // E5
140
+#define THERMO_CS1           5   // E3
141
+#define THERMO_CS2           2   // E4
142 142
 
143 143
 #define MAX6675_SS          THERMO_CS1
144 144
 #define MAX6675_SCK_PIN     THERMO_SCK_PIN
@@ -150,10 +150,10 @@
150 150
 // 2 extruders or 1 extruder and a heated bed.
151 151
 // With no heated bed, an additional 24V fan is possible.
152 152
 //
153
-#define MOSFET_A_PIN     6 // H3
154
-#define MOSFET_B_PIN    11 // B5 - Rev A of this file had this pin assigned to 9
155
-#define MOSFET_C_PIN    45 // L4
156
-#define MOSFET_D_PIN    44 // L5
153
+#define MOSFET_A_PIN         6   // H3
154
+#define MOSFET_B_PIN        11   // B5 - Rev A of this file had this pin assigned to 9
155
+#define MOSFET_C_PIN        45   // L4
156
+#define MOSFET_D_PIN        44   // L5
157 157
 
158 158
 #if HOTENDS > 1
159 159
   #if TEMP_SENSOR_BED
@@ -195,43 +195,43 @@
195 195
 //
196 196
 // Extruder Auto Fan Pins
197 197
 //
198
-#define ORIG_E0_AUTO_FAN_PIN   7 // H4
199
-#define ORIG_E1_AUTO_FAN_PIN  12 // B6
198
+#define ORIG_E0_AUTO_FAN_PIN  7   // H4
199
+#define ORIG_E1_AUTO_FAN_PIN 12   // B6
200 200
 
201 201
 //
202 202
 // Misc. Functions
203 203
 //
204
-#define LED_PIN             13 // B7
205
-#define CUTOFF_RESET_PIN    16 // H1
206
-#define CUTOFF_TEST_PIN     17 // H0
207
-#define CASE_LIGHT_PIN      44 // L5   MUST BE HARDWARE PWM
204
+#define LED_PIN             13   // B7
205
+#define CUTOFF_RESET_PIN    16   // H1
206
+#define CUTOFF_TEST_PIN     17   // H0
207
+#define CASE_LIGHT_PIN      44   // L5   MUST BE HARDWARE PWM
208 208
 
209 209
 //
210 210
 // LCD / Controller
211 211
 //
212 212
 #ifdef 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
-  #define BTN_CENTER            15 // J0
230
-  #define BTN_ENC               BTN_CENTER
229
+  #define BTN_CENTER        15   // J0
230
+  #define BTN_ENC           BTN_CENTER
231 231
 
232 232
   //on board leds
233
-  #define STAT_LED_RED_LED      SERVO0_PIN // C1 (1280-EX1, DEBUG2)
234
-  #define STAT_LED_BLUE_PIN     SERVO1_PIN // C0 (1280-EX2, DEBUG3)
233
+  #define STAT_LED_RED_LED  SERVO0_PIN // C1 (1280-EX1, DEBUG2)
234
+  #define STAT_LED_BLUE_PIN SERVO1_PIN // C0 (1280-EX2, DEBUG3)
235 235
 
236 236
 #else
237 237
   // Replicator uses a 3-wire SR controller with HD44780
@@ -239,29 +239,29 @@
239 239
   //
240 240
 
241 241
   #define SAV_3DLCD
242
-  #define SR_DATA_PIN         34 // C3
243
-  #define SR_CLK_PIN          35 // C2
244
-  #define SR_STROBE_PIN       33 // C4
242
+  #define SR_DATA_PIN       34   // C3
243
+  #define SR_CLK_PIN        35   // C2
244
+  #define SR_STROBE_PIN     33   // C4
245 245
 
246
-  #define BTN_UP              75 // J4
247
-  #define BTN_DOWN            73 // J3
248
-  #define BTN_LEFT            72 // J2
249
-  #define BTN_RIGHT           14 // J1
250
-  #define BTN_CENTER          15 // J0
251
-  #define BTN_ENC             BTN_CENTER
246
+  #define BTN_UP            75   // J4
247
+  #define BTN_DOWN          73   // J3
248
+  #define BTN_LEFT          72   // J2
249
+  #define BTN_RIGHT         14   // J1
250
+  #define BTN_CENTER        15   // J0
251
+  #define BTN_ENC           BTN_CENTER
252 252
 
253
-  #define BEEPER_PIN           4 // G5
253
+  #define BEEPER_PIN         4   // G5
254 254
 
255
-  #define STAT_LED_RED_PIN    32 // C5
256
-  #define STAT_LED_BLUE_PIN   31 // C6 (Actually green)
255
+  #define STAT_LED_RED_PIN  32   // C5
256
+  #define STAT_LED_BLUE_PIN 31   // C6 (Actually green)
257 257
 
258 258
 #endif
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
 #define MAX_PIN             THERMO_SCK_PIN
267 267
 
@@ -275,9 +275,6 @@
275 275
 
276 276
 
277 277
 
278
-
279
-
280
-
281 278
 // Check if all pins are defined in mega/pins_arduino.h
282 279
 #include <Arduino.h>
283 280
 static_assert(NUM_DIGITAL_PINS > MAX_PIN, "add missing pins to [arduino dir]/hardware/arduino/avr/variants/mega/pins_arduino.h based on fastio.h"

+ 3
- 3
Marlin/pins_MINITRONICS.h 查看文件

@@ -104,9 +104,9 @@
104 104
 
105 105
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
106 106
 
107
-  #define LCD_PINS_RS      15 // CS chip select /SS chip slave select
108
-  #define LCD_PINS_ENABLE  11 // SID (MOSI)
109
-  #define LCD_PINS_D4      10 // SCK (CLK) clock
107
+  #define LCD_PINS_RS      15   // CS chip select /SS chip slave select
108
+  #define LCD_PINS_ENABLE  11   // SID (MOSI)
109
+  #define LCD_PINS_D4      10   // SCK (CLK) clock
110 110
 
111 111
   #define BTN_EN1          18
112 112
   #define BTN_EN2          17

+ 10
- 10
Marlin/pins_RAMBO.h 查看文件

@@ -151,12 +151,12 @@
151 151
 
152 152
   #if ENABLED(NEWPANEL)
153 153
 
154
-    #define LCD_PINS_RS 70
154
+    #define LCD_PINS_RS     70
155 155
     #define LCD_PINS_ENABLE 71
156
-    #define LCD_PINS_D4 72
157
-    #define LCD_PINS_D5 73
158
-    #define LCD_PINS_D6 74
159
-    #define LCD_PINS_D7 75
156
+    #define LCD_PINS_D4     72
157
+    #define LCD_PINS_D5     73
158
+    #define LCD_PINS_D6     74
159
+    #define LCD_PINS_D7     75
160 160
 
161 161
     #if ENABLED(VIKI2) || ENABLED(miniVIKI)
162 162
       #define BEEPER_PIN 44
@@ -202,12 +202,12 @@
202 202
     //#define SHIFT_OUT 40
203 203
     //#define SHIFT_EN 17
204 204
 
205
-    #define LCD_PINS_RS 75
205
+    #define LCD_PINS_RS     75
206 206
     #define LCD_PINS_ENABLE 17
207
-    #define LCD_PINS_D4 23
208
-    #define LCD_PINS_D5 25
209
-    #define LCD_PINS_D6 27
210
-    #define LCD_PINS_D7 29
207
+    #define LCD_PINS_D4     23
208
+    #define LCD_PINS_D5     25
209
+    #define LCD_PINS_D6     27
210
+    #define LCD_PINS_D7     29
211 211
 
212 212
   #endif // !NEWPANEL
213 213
 

+ 90
- 83
Marlin/pins_RAMPS.h 查看文件

@@ -220,25 +220,25 @@
220 220
 #if ENABLED(ULTRA_LCD)
221 221
 
222 222
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
223
-    #define LCD_PINS_RS     49 // CS chip select /SS chip slave select
224
-    #define LCD_PINS_ENABLE 51 // SID (MOSI)
225
-    #define LCD_PINS_D4     52 // SCK (CLK) clock
223
+    #define LCD_PINS_RS         49 // CS chip select /SS chip slave select
224
+    #define LCD_PINS_ENABLE     51 // SID (MOSI)
225
+    #define LCD_PINS_D4         52 // SCK (CLK) clock
226 226
   #elif ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
227
-    #define LCD_PINS_RS 40
228
-    #define LCD_PINS_ENABLE 42
229
-    #define LCD_PINS_D4 65
230
-    #define LCD_PINS_D5 66
231
-    #define LCD_PINS_D6 44
232
-    #define LCD_PINS_D7 64
227
+    #define LCD_PINS_RS         40
228
+    #define LCD_PINS_ENABLE     42
229
+    #define LCD_PINS_D4         65
230
+    #define LCD_PINS_D5         66
231
+    #define LCD_PINS_D6         44
232
+    #define LCD_PINS_D7         64
233 233
   #else
234
-    #define LCD_PINS_RS 16
235
-    #define LCD_PINS_ENABLE 17
236
-    #define LCD_PINS_D4 23
237
-    #define LCD_PINS_D5 25
238
-    #define LCD_PINS_D6 27
239
-    #define LCD_PINS_D7 29
234
+    #define LCD_PINS_RS         16
235
+    #define LCD_PINS_ENABLE     17
236
+    #define LCD_PINS_D4         23
237
+    #define LCD_PINS_D5         25
238
+    #define LCD_PINS_D6         27
239
+    #define LCD_PINS_D7         29
240 240
     #if DISABLED(NEWPANEL)
241
-      #define BEEPER_PIN 33
241
+      #define BEEPER_PIN        33
242 242
       // Buttons are attached to a shift register
243 243
       // Not wired yet
244 244
       //#define SHIFT_CLK 38
@@ -251,118 +251,125 @@
251 251
   #if ENABLED(NEWPANEL)
252 252
 
253 253
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
254
-      #define BEEPER_PIN 37
255 254
 
256
-      #define BTN_EN1 31
257
-      #define BTN_EN2 33
258
-      #define BTN_ENC 35
255
+      #define BEEPER_PIN        37
259 256
 
260
-      #define SD_DETECT_PIN 49
261
-      #define KILL_PIN 41
257
+      #define BTN_EN1           31
258
+      #define BTN_EN2           33
259
+      #define BTN_ENC           35
260
+
261
+      #define SD_DETECT_PIN     49
262
+      #define KILL_PIN          41
262 263
 
263 264
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
264 265
         #define LCD_BACKLIGHT_PIN 39
265 266
       #endif
266 267
 
267 268
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
268
-      #define BTN_EN1 64
269
-      #define BTN_EN2 59
270
-      #define BTN_ENC 63
271
-      #define SD_DETECT_PIN 42
269
+
270
+      #define BTN_EN1           64
271
+      #define BTN_EN2           59
272
+      #define BTN_ENC           63
273
+      #define SD_DETECT_PIN     42
274
+
272 275
     #elif ENABLED(LCD_I2C_PANELOLU2)
273
-      #define BTN_EN1 47  // reverse if the encoder turns the wrong way.
274
-      #define BTN_EN2 43
275
-      #define BTN_ENC 32
276
-      #define LCD_SDSS 53
277
-      #define SD_DETECT_PIN -1
278
-      #define KILL_PIN 41
276
+
277
+      #define BTN_EN1           47
278
+      #define BTN_EN2           43
279
+      #define BTN_ENC           32
280
+      #define LCD_SDSS          53
281
+      #define SD_DETECT_PIN     -1
282
+      #define KILL_PIN          41
283
+
279 284
     #elif ENABLED(LCD_I2C_VIKI)
280
-      #define BTN_EN1 22  // reverse if the encoder turns the wrong way.
281
-      #define BTN_EN2 7   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf
282
-                          // tells about 40/42.
283
-                          // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
284
-      #define BTN_ENC -1
285
-      #define LCD_SDSS 53
286
-      #define SD_DETECT_PIN 49
285
+
286
+      #define BTN_EN1           22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
287
+      #define BTN_EN2            7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
288
+
289
+      #define BTN_ENC           -1
290
+      #define LCD_SDSS          53
291
+      #define SD_DETECT_PIN     49
292
+
287 293
     #elif ENABLED(VIKI2) || ENABLED(miniVIKI)
288
-      #define BEEPER_PIN       33
294
+
295
+      #define BEEPER_PIN        33
289 296
 
290 297
       // Pins for DOGM SPI LCD Support
291
-      #define DOGLCD_A0        44
292
-      #define DOGLCD_CS        45
298
+      #define DOGLCD_A0         44
299
+      #define DOGLCD_CS         45
293 300
       #define LCD_SCREEN_ROT_180
294 301
 
295
-      #define BTN_EN1          22
296
-      #define BTN_EN2           7
297
-      #define BTN_ENC          39
302
+      #define BTN_EN1           22
303
+      #define BTN_EN2            7
304
+      #define BTN_ENC           39
298 305
 
299
-      #define SDSS             53
300
-      #define SD_DETECT_PIN    -1  // Pin 49 for display sd interface, 72 for easy adapter board
306
+      #define SDSS              53
307
+      #define SD_DETECT_PIN     -1 // Pin 49 for display sd interface, 72 for easy adapter board
301 308
 
302
-      #define KILL_PIN         31
309
+      #define KILL_PIN          31
303 310
 
304
-      #define STAT_LED_RED_PIN 32
311
+      #define STAT_LED_RED_PIN  32
305 312
       #define STAT_LED_BLUE_PIN 35
306 313
 
307 314
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
308
-      #define BTN_EN1 35  // reverse if the encoder turns the wrong way.
309
-      #define BTN_EN2 37
310
-      #define BTN_ENC 31
311
-      #define SD_DETECT_PIN 49
312
-      #define LCD_SDSS 53
313
-      #define KILL_PIN 41
314
-      #define BEEPER_PIN 23
315
-      #define DOGLCD_CS 29
316
-      #define DOGLCD_A0 27
315
+      #define BTN_EN1           35
316
+      #define BTN_EN2           37
317
+      #define BTN_ENC           31
318
+      #define SD_DETECT_PIN     49
319
+      #define LCD_SDSS          53
320
+      #define KILL_PIN          41
321
+      #define BEEPER_PIN        23
322
+      #define DOGLCD_CS         29
323
+      #define DOGLCD_A0         27
317 324
       #define LCD_BACKLIGHT_PIN 33
318 325
     #elif ENABLED(MINIPANEL)
319
-      #define BEEPER_PIN 42
326
+      #define BEEPER_PIN        42
320 327
       // Pins for DOGM SPI LCD Support
321
-      #define DOGLCD_A0  44
322
-      #define DOGLCD_CS  66
328
+      #define DOGLCD_A0         44
329
+      #define DOGLCD_CS         66
323 330
       #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
324
-      #define SDSS   53
331
+      #define SDSS              53
325 332
 
326
-      #define KILL_PIN 64
333
+      #define KILL_PIN          64
327 334
       // GLCD features
328
-      //#define LCD_CONTRAST 190
335
+      //#define LCD_CONTRAST   190
329 336
       // Uncomment screen orientation
330 337
       //#define LCD_SCREEN_ROT_90
331 338
       //#define LCD_SCREEN_ROT_180
332 339
       //#define LCD_SCREEN_ROT_270
333 340
       // The encoder and click button
334
-      #define BTN_EN1 40
335
-      #define BTN_EN2 63
336
-      #define BTN_ENC 59
341
+      #define BTN_EN1           40
342
+      #define BTN_EN2           63
343
+      #define BTN_ENC           59
337 344
       // not connected to a pin
338
-      #define SD_DETECT_PIN 49
345
+      #define SD_DETECT_PIN     49
339 346
 
340 347
     #else
341 348
 
342 349
       // Beeper on AUX-4
343
-      #define BEEPER_PIN 33
350
+      #define BEEPER_PIN        33
344 351
 
345 352
       // buttons are directly attached using AUX-2
346 353
       #if ENABLED(REPRAPWORLD_KEYPAD)
347
-        #define BTN_EN1 64 // encoder
348
-        #define BTN_EN2 59 // encoder
349
-        #define BTN_ENC 63 // enter button
350
-        #define SHIFT_OUT 40 // shift register
351
-        #define SHIFT_CLK 44 // shift register
352
-        #define SHIFT_LD 42 // shift register
354
+        #define BTN_EN1         64
355
+        #define BTN_EN2         59
356
+        #define BTN_ENC         63
357
+        #define SHIFT_OUT       40
358
+        #define SHIFT_CLK       44
359
+        #define SHIFT_LD        42
353 360
       #elif ENABLED(PANEL_ONE)
354
-        #define BTN_EN1 59 // AUX2 PIN 3
355
-        #define BTN_EN2 63 // AUX2 PIN 4
356
-        #define BTN_ENC 49 // AUX3 PIN 7
361
+        #define BTN_EN1         59 // AUX2 PIN 3
362
+        #define BTN_EN2         63 // AUX2 PIN 4
363
+        #define BTN_ENC         49 // AUX3 PIN 7
357 364
       #else
358
-        #define BTN_EN1 37
359
-        #define BTN_EN2 35
360
-        #define BTN_ENC 31 // the click
365
+        #define BTN_EN1         37
366
+        #define BTN_EN2         35
367
+        #define BTN_ENC         31
361 368
       #endif
362 369
 
363 370
       #if ENABLED(G3D_PANEL)
364
-        #define SD_DETECT_PIN 49
365
-        #define KILL_PIN 41
371
+        #define SD_DETECT_PIN   49
372
+        #define KILL_PIN        41
366 373
       #else
367 374
         //#define SD_DETECT_PIN -1 // Ramps doesn't use this
368 375
       #endif

+ 13
- 13
Marlin/pins_SCOOVO_X9H.h 查看文件

@@ -126,21 +126,21 @@
126 126
 //
127 127
 // LCD / Controller
128 128
 //
129
-#define LCD_PINS_RS         70 // Ext2_5
130
-#define LCD_PINS_ENABLE     71 // Ext2_7
131
-#define LCD_PINS_D4         72 // Ext2_9 ?
132
-#define LCD_PINS_D5         73 // Ext2_11 ?
133
-#define LCD_PINS_D6         74 // Ext2_13
134
-#define LCD_PINS_D7         75 // Ext2_15 ?
129
+#define LCD_PINS_RS         70   // Ext2_5
130
+#define LCD_PINS_ENABLE     71   // Ext2_7
131
+#define LCD_PINS_D4         72   // Ext2_9 ?
132
+#define LCD_PINS_D5         73   // Ext2_11 ?
133
+#define LCD_PINS_D6         74   // Ext2_13
134
+#define LCD_PINS_D7         75   // Ext2_15 ?
135 135
 #define BEEPER_PIN          -1
136 136
 
137
-#define BTN_HOME            80 // Ext_16
138
-#define BTN_CENTER          81 // Ext_14
137
+#define BTN_HOME            80   // Ext_16
138
+#define BTN_CENTER          81   // Ext_14
139 139
 #define BTN_ENC             BTN_CENTER
140
-#define BTN_RIGHT           82 // Ext_12
141
-#define BTN_LEFT            83 // Ext_10
142
-#define BTN_UP              84 // Ext2_8
143
-#define BTN_DOWN            85 // Ext2_6
140
+#define BTN_RIGHT           82   // Ext_12
141
+#define BTN_LEFT            83   // Ext_10
142
+#define BTN_UP              84   // Ext2_8
143
+#define BTN_DOWN            85   // Ext2_6
144 144
 
145 145
 #define HOME_PIN            BTN_HOME
146 146
 
@@ -151,7 +151,7 @@
151 151
   #define DOGLCD_CS         71
152 152
   #define LCD_SCREEN_ROT_180
153 153
 
154
-  #define SD_DETECT_PIN     -1 // Pin 72 if using easy adapter board
154
+  #define SD_DETECT_PIN     -1   // Pin 72 if using easy adapter board
155 155
 
156 156
   #define STAT_LED_RED_PIN  22
157 157
   #define STAT_LED_BLUE_PIN 32

+ 6
- 6
Marlin/pins_ULTIMAKER.h 查看文件

@@ -109,7 +109,7 @@
109 109
 #define SDSS               53
110 110
 #define LED_PIN            13
111 111
 #define PS_ON_PIN          12
112
-#define SUICIDE_PIN        54  // PIN that has to be turned on right after start, to keep power flowing.
112
+#define SUICIDE_PIN        54   // PIN that has to be turned on right after start, to keep power flowing.
113 113
 #define CASE_LIGHT_PIN      8
114 114
 
115 115
 //
@@ -121,12 +121,12 @@
121 121
 
122 122
   #if ENABLED(NEWPANEL)
123 123
 
124
-    #define LCD_PINS_RS 20
124
+    #define LCD_PINS_RS    20
125 125
     #define LCD_PINS_ENABLE 17
126
-    #define LCD_PINS_D4 16
127
-    #define LCD_PINS_D5 21
128
-    #define LCD_PINS_D6 5
129
-    #define LCD_PINS_D7 6
126
+    #define LCD_PINS_D4    16
127
+    #define LCD_PINS_D5    21
128
+    #define LCD_PINS_D6     5
129
+    #define LCD_PINS_D7     6
130 130
 
131 131
     // buttons are directly attached
132 132
     #define BTN_EN1 40

Loading…
取消
儲存