소스 검색

Add EXP labels to SKR pins

Scott Lahteine 5 년 전
부모
커밋
63469ed8f7
3개의 변경된 파일127개의 추가작업 그리고 93개의 파일을 삭제
  1. 64
    45
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
  2. 32
    26
      Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
  3. 31
    22
      Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h

+ 64
- 45
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h 파일 보기

195
  *               -----                                              -----
195
  *               -----                                              -----
196
  *               EXP2                                               EXP1
196
  *               EXP2                                               EXP1
197
  */
197
  */
198
+
199
+#define EXP1_1_PIN          P1_30
200
+#define EXP1_2_PIN          P1_18
201
+#define EXP1_3_PIN          P1_20
202
+#define EXP1_4_PIN          P1_22
203
+#define EXP1_6_PIN          P0_28
204
+#define EXP1_7_PIN          P1_19
205
+#define EXP1_8_PIN          P1_21
206
+#define EXP1_9_PIN          P1_23
207
+
208
+#define EXP2_1_PIN          P0_17
209
+#define EXP2_2_PIN          P3_26
210
+#define EXP2_3_PIN          P3_25
211
+#define EXP2_4_PIN          P1_31
212
+#define EXP2_6_PIN          P0_15
213
+#define EXP2_7_PIN          P0_16
214
+#define EXP2_8_PIN          P0_18
215
+#define EXP2_9_PIN          -1
216
+
198
 #if HAS_SPI_LCD
217
 #if HAS_SPI_LCD
199
 
218
 
200
   #if ENABLED(ANET_FULL_GRAPHICS_LCD)
219
   #if ENABLED(ANET_FULL_GRAPHICS_LCD)
222
     *                   LCD                             LCD
241
     *                   LCD                             LCD
223
     */
242
     */
224
 
243
 
225
-    #define LCD_PINS_RS    P1_23
244
+    #define LCD_PINS_RS    EXP1_9_PIN
226
 
245
 
227
-    #define BTN_EN1        P1_20
228
-    #define BTN_EN2        P1_22
229
-    #define BTN_ENC        P1_18
246
+    #define BTN_EN1        EXP1_3_PIN
247
+    #define BTN_EN2        EXP1_4_PIN
248
+    #define BTN_ENC        EXP1_2_PIN
230
 
249
 
231
-    #define LCD_PINS_ENABLE P1_21
232
-    #define LCD_PINS_D4    P1_19
250
+    #define LCD_PINS_ENABLE EXP1_8_PIN
251
+    #define LCD_PINS_D4    EXP1_7_PIN
233
 
252
 
234
   #elif ENABLED(CR10_STOCKDISPLAY)
253
   #elif ENABLED(CR10_STOCKDISPLAY)
235
 
254
 
236
-    #define LCD_PINS_RS    P1_22
255
+    #define LCD_PINS_RS    EXP1_4_PIN
237
 
256
 
238
-    #define BTN_EN1        P1_18
239
-    #define BTN_EN2        P1_20
240
-    #define BTN_ENC        P0_28   // (58) open-drain
257
+    #define BTN_EN1        EXP1_2_PIN
258
+    #define BTN_EN2        EXP1_3_PIN
259
+    #define BTN_ENC        EXP1_6_PIN   // (58) open-drain
241
 
260
 
242
-    #define LCD_PINS_ENABLE P1_23
243
-    #define LCD_PINS_D4    P1_21
261
+    #define LCD_PINS_ENABLE EXP1_9_PIN
262
+    #define LCD_PINS_D4    EXP1_8_PIN
244
 
263
 
245
   #else // !CR10_STOCKDISPLAY
264
   #else // !CR10_STOCKDISPLAY
246
 
265
 
247
-    #define LCD_PINS_RS    P1_19
266
+    #define LCD_PINS_RS    EXP1_7_PIN
248
 
267
 
249
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
250
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
251
-    #define BTN_ENC        P0_28   // (58) open-drain
268
+    #define BTN_EN1        EXP2_2_PIN   // (31) J3-2 & AUX-4
269
+    #define BTN_EN2        EXP2_3_PIN   // (33) J3-4 & AUX-4
270
+    #define BTN_ENC        EXP1_6_PIN   // (58) open-drain
252
 
271
 
253
-    #define LCD_PINS_ENABLE P1_18
254
-    #define LCD_PINS_D4    P1_20
272
+    #define LCD_PINS_ENABLE EXP1_2_PIN
273
+    #define LCD_PINS_D4    EXP1_3_PIN
255
 
274
 
256
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
257
-    #define SD_DETECT_PIN  P1_31   // (49) (NOT 5V tolerant)
275
+    #define LCD_SDSS       EXP2_7_PIN   // (16) J3-7 & AUX-4
276
+    #define SD_DETECT_PIN  EXP2_4_PIN   // (49) (NOT 5V tolerant)
258
 
277
 
259
     #if ENABLED(FYSETC_MINI_12864)
278
     #if ENABLED(FYSETC_MINI_12864)
260
-      #define DOGLCD_CS    P1_18
261
-      #define DOGLCD_A0    P1_19
262
-      #define DOGLCD_SCK   P0_15
263
-      #define DOGLCD_MOSI  P0_18
279
+      #define DOGLCD_CS    EXP1_2_PIN
280
+      #define DOGLCD_A0    EXP1_7_PIN
281
+      #define DOGLCD_SCK   EXP2_6_PIN
282
+      #define DOGLCD_MOSI  EXP2_8_PIN
264
 
283
 
265
       #define LCD_BACKLIGHT_PIN -1
284
       #define LCD_BACKLIGHT_PIN -1
266
 
285
 
267
       #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
286
       #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
268
                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
287
                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
269
 
288
 
270
-      #define LCD_RESET_PIN P1_20   // Must be high or open for LCD to operate normally.
289
+      #define LCD_RESET_PIN EXP1_3_PIN   // Must be high or open for LCD to operate normally.
271
 
290
 
272
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
291
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
273
         #ifndef RGB_LED_R_PIN
292
         #ifndef RGB_LED_R_PIN
274
-          #define RGB_LED_R_PIN P1_21
293
+          #define RGB_LED_R_PIN EXP1_8_PIN
275
         #endif
294
         #endif
276
         #ifndef RGB_LED_G_PIN
295
         #ifndef RGB_LED_G_PIN
277
-          #define RGB_LED_G_PIN P1_22
296
+          #define RGB_LED_G_PIN EXP1_4_PIN
278
         #endif
297
         #endif
279
         #ifndef RGB_LED_B_PIN
298
         #ifndef RGB_LED_B_PIN
280
-          #define RGB_LED_B_PIN P1_23
299
+          #define RGB_LED_B_PIN EXP1_9_PIN
281
         #endif
300
         #endif
282
       #elif ENABLED(FYSETC_MINI_12864_2_1)
301
       #elif ENABLED(FYSETC_MINI_12864_2_1)
283
-        #define NEOPIXEL_PIN    P1_21
302
+        #define NEOPIXEL_PIN    EXP1_8_PIN
284
       #endif
303
       #endif
285
 
304
 
286
     #else // !FYSETC_MINI_12864
305
     #else // !FYSETC_MINI_12864
287
 
306
 
288
       #if ENABLED(MKS_MINI_12864)
307
       #if ENABLED(MKS_MINI_12864)
289
 
308
 
290
-        #define DOGLCD_CS    P1_21
291
-        #define DOGLCD_A0    P1_22
292
-        #define DOGLCD_SCK   P0_15
293
-        #define DOGLCD_MOSI  P0_18
309
+        #define DOGLCD_CS    EXP1_8_PIN
310
+        #define DOGLCD_A0    EXP1_4_PIN
311
+        #define DOGLCD_SCK   EXP2_6_PIN
312
+        #define DOGLCD_MOSI  EXP2_8_PIN
294
 
313
 
295
       #elif ENABLED(ENDER2_STOCKDISPLAY)
314
       #elif ENABLED(ENDER2_STOCKDISPLAY)
296
 
315
 
300
          *               5V | · · | GND
319
          *               5V | · · | GND
301
          *     (MOSI) P1_23 | · · | P1_22 (LCD_CS)
320
          *     (MOSI) P1_23 | · · | P1_22 (LCD_CS)
302
          *   (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2)
321
          *   (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2)
303
-         *      RESET P1.19 | · · | P1_18 (BTN_EN1)
322
+         *      RESET P1_19 | · · | P1_18 (BTN_EN1)
304
          *  (BTN_ENC) P0_28 | · · | P1_30 (SCK)
323
          *  (BTN_ENC) P0_28 | · · | P1_30 (SCK)
305
          *                   -----
324
          *                   -----
306
          *                    EXP1
325
          *                    EXP1
307
          */
326
          */
308
 
327
 
309
-        #define BTN_EN1      P1_18
310
-        #define BTN_EN2      P1_20
311
-        #define BTN_ENC      P0_28
312
-        #define DOGLCD_CS    P1_22
313
-        #define DOGLCD_A0    P1_21
314
-        #define DOGLCD_SCK   P1_30
315
-        #define DOGLCD_MOSI  P1_23
328
+        #define BTN_EN1      EXP1_2_PIN
329
+        #define BTN_EN2      EXP1_3_PIN
330
+        #define BTN_ENC      EXP1_6_PIN
331
+        #define DOGLCD_CS    EXP1_4_PIN
332
+        #define DOGLCD_A0    EXP1_8_PIN
333
+        #define DOGLCD_SCK   EXP1_1_PIN
334
+        #define DOGLCD_MOSI  EXP1_9_PIN
316
         #define FORCE_SOFT_SPI
335
         #define FORCE_SOFT_SPI
317
         #define LCD_BACKLIGHT_PIN -1
336
         #define LCD_BACKLIGHT_PIN -1
318
       #endif
337
       #endif
319
 
338
 
320
       #if ENABLED(ULTIPANEL)
339
       #if ENABLED(ULTIPANEL)
321
-        #define LCD_PINS_D5 P1_21
322
-        #define LCD_PINS_D6 P1_22
323
-        #define LCD_PINS_D7 P1_23
340
+        #define LCD_PINS_D5 EXP1_8_PIN
341
+        #define LCD_PINS_D6 EXP1_4_PIN
342
+        #define LCD_PINS_D7 EXP1_9_PIN
324
       #endif
343
       #endif
325
 
344
 
326
     #endif // !FYSETC_MINI_12864
345
     #endif // !FYSETC_MINI_12864
338
 #endif
357
 #endif
339
 
358
 
340
 #if SD_CONNECTION_IS(LCD)
359
 #if SD_CONNECTION_IS(LCD)
341
-  #define SS_PIN           P0_16
360
+  #define SS_PIN           EXP2_7_PIN
342
 #endif
361
 #endif
343
 
362
 
344
 /**
363
 /**

+ 32
- 26
Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h 파일 보기

42
 //
42
 //
43
 // Servos
43
 // Servos
44
 //
44
 //
45
-#define SERVO0_PIN         PA1
45
+#define SERVO0_PIN         PA1    // SERVOS
46
 
46
 
47
 //
47
 //
48
 // Limit Switches
48
 // Limit Switches
49
 //
49
 //
50
-#define X_STOP_PIN         PC1
51
-#define Y_STOP_PIN         PC0
52
-#define Z_STOP_PIN         PC15
50
+#define X_STOP_PIN         PC1    // X-STOP
51
+#define Y_STOP_PIN         PC0    // Y-STOP
52
+#define Z_STOP_PIN         PC15   // Z-STOP
53
 
53
 
54
 //
54
 //
55
 // Z Probe must be this pin
55
 // Z Probe must be this pin
56
 //
56
 //
57
-#define Z_MIN_PROBE_PIN    PC14
57
+#define Z_MIN_PROBE_PIN    PC14   // PROBE
58
 
58
 
59
 //
59
 //
60
 // Filament Runout Sensor
60
 // Filament Runout Sensor
61
 //
61
 //
62
 #ifndef FIL_RUNOUT_PIN
62
 #ifndef FIL_RUNOUT_PIN
63
-  #define FIL_RUNOUT_PIN   PC2
63
+  #define FIL_RUNOUT_PIN   PC2    // E0-STOP
64
 #endif
64
 #endif
65
 
65
 
66
 //
66
 //
143
 //
143
 //
144
 // Temperature Sensors
144
 // Temperature Sensors
145
 //
145
 //
146
-#define TEMP_0_PIN         PA0   // Analog Input
147
-#define TEMP_BED_PIN       PC3   // Analog Input
146
+#define TEMP_0_PIN         PA0   // Analog Input "TH0"
147
+#define TEMP_BED_PIN       PC3   // Analog Input "TB0"
148
 
148
 
149
 //
149
 //
150
 // Heaters / Fans
150
 // Heaters / Fans
151
 //
151
 //
152
-#define HEATER_0_PIN       PC8   // EXTRUDER
153
-#define HEATER_BED_PIN     PC9   // BED
154
-#define FAN_PIN            PA8
152
+#define HEATER_0_PIN       PC8   // HE
153
+#define HEATER_BED_PIN     PC9   // HB
154
+#define FAN_PIN            PA8   // FAN0
155
 
155
 
156
 //
156
 //
157
 // USB connect control
157
 // USB connect control
171
  *                 -----
171
  *                 -----
172
  *                 EXP1
172
  *                 EXP1
173
  */
173
  */
174
+#define EXP1_1_PIN         PA15
175
+#define EXP1_2_PIN         PA9
176
+#define EXP1_3_PIN         PA10
177
+#define EXP1_4_PIN         PB8
178
+#define EXP1_6_PIN         PB6
179
+#define EXP1_7_PIN         -1
180
+#define EXP1_8_PIN         PB9
181
+#define EXP1_9_PIN         PB7
182
+
174
 #if HAS_SPI_LCD
183
 #if HAS_SPI_LCD
175
-  #define BEEPER_PIN       PA15
176
-  #define BTN_ENC          PB6
184
+  #define BTN_ENC          EXP1_6_PIN
185
+  #define BTN_EN1          EXP1_2_PIN
186
+  #define BTN_EN2          EXP1_3_PIN
177
 
187
 
178
   #if ENABLED(CR10_STOCKDISPLAY)
188
   #if ENABLED(CR10_STOCKDISPLAY)
179
 
189
 
180
-    #define LCD_PINS_RS    PB8
181
-
182
-    #define BTN_EN1        PA9
183
-    #define BTN_EN2        PA10
190
+    #define BEEPER_PIN     EXP1_1_PIN
184
 
191
 
185
-    #define LCD_PINS_ENABLE PB7
186
-    #define LCD_PINS_D4    PB9
192
+    #define LCD_PINS_RS    EXP1_4_PIN
193
+    #define LCD_PINS_ENABLE EXP1_9_PIN
194
+    #define LCD_PINS_D4    EXP1_8_PIN
187
 
195
 
188
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
196
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
189
 
197
 
198
      *                    EXP1
206
      *                    EXP1
199
      */
207
      */
200
 
208
 
201
-    #define BTN_EN1      PA9
202
-    #define BTN_EN2      PA10
203
-    #define DOGLCD_CS    PB8
204
-    #define DOGLCD_A0    PB9
205
-    #define DOGLCD_SCK   PA15
206
-    #define DOGLCD_MOSI  PB7
209
+    #define DOGLCD_CS    EXP1_4_PIN
210
+    #define DOGLCD_A0    EXP1_8_PIN
211
+    #define DOGLCD_SCK   EXP1_1_PIN
212
+    #define DOGLCD_MOSI  EXP1_9_PIN
207
     #define FORCE_SOFT_SPI
213
     #define FORCE_SOFT_SPI
208
     #define LCD_BACKLIGHT_PIN -1
214
     #define LCD_BACKLIGHT_PIN -1
209
 
215
 
210
   #else
216
   #else
211
-    #error "Only CR10_STOCKDISPLAY and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_E3_DIP."
217
+    #error "Only CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_E3_DIP."
212
   #endif
218
   #endif
213
 
219
 
214
 #endif // HAS_SPI_LCD
220
 #endif // HAS_SPI_LCD

+ 31
- 22
Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h 파일 보기

111
  *                 -----
111
  *                 -----
112
  *                 EXP1
112
  *                 EXP1
113
  */
113
  */
114
+
115
+#define EXP1_1_PIN         PB5
116
+#define EXP1_2_PIN         PA9
117
+#define EXP1_3_PIN         PA10
118
+#define EXP1_4_PIN         PB8
119
+#define EXP1_6_PIN         PB6
120
+#define EXP1_7_PIN         -1
121
+#define EXP1_8_PIN         PB9
122
+#define EXP1_9_PIN         PB7
123
+
114
 #if HAS_SPI_LCD
124
 #if HAS_SPI_LCD
115
 
125
 
116
   #if ENABLED(CR10_STOCKDISPLAY)
126
   #if ENABLED(CR10_STOCKDISPLAY)
117
 
127
 
118
-    #define BEEPER_PIN     PB5
119
-    #define BTN_ENC        PB6
120
-
121
-    #define LCD_PINS_RS    PB8
128
+    #define BEEPER_PIN     EXP1_1_PIN
122
 
129
 
123
-    #define BTN_EN1        PA9
124
-    #define BTN_EN2        PA10
130
+    #define BTN_EN1        EXP1_2_PIN
131
+    #define BTN_EN2        EXP1_3_PIN
132
+    #define BTN_ENC        EXP1_6_PIN
125
 
133
 
126
-    #define LCD_PINS_ENABLE PB7
127
-    #define LCD_PINS_D4    PB9
134
+    #define LCD_PINS_RS    EXP1_4_PIN
135
+    #define LCD_PINS_ENABLE EXP1_9_PIN
136
+    #define LCD_PINS_D4    EXP1_8_PIN
128
 
137
 
129
   #elif ENABLED(ZONESTAR_LCD)     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
138
   #elif ENABLED(ZONESTAR_LCD)     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
130
 
139
 
131
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
140
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
132
 
141
 
133
-    #define LCD_PINS_RS    PB9
134
-    #define LCD_PINS_ENABLE PB6
135
-    #define LCD_PINS_D4    PB8
136
-    #define LCD_PINS_D5    PA10
137
-    #define LCD_PINS_D6    PA9
138
-    #define LCD_PINS_D7    PB5
142
+    #define LCD_PINS_RS    EXP1_8_PIN
143
+    #define LCD_PINS_ENABLE EXP1_6_PIN
144
+    #define LCD_PINS_D4    EXP1_4_PIN
145
+    #define LCD_PINS_D5    EXP1_3_PIN
146
+    #define LCD_PINS_D6    EXP1_2_PIN
147
+    #define LCD_PINS_D7    EXP1_1_PIN
139
     #define ADC_KEYPAD_PIN PA1    // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
148
     #define ADC_KEYPAD_PIN PA1    // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
140
 
149
 
141
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
150
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
150
      *                   -----
159
      *                   -----
151
      *                    EXP1
160
      *                    EXP1
152
      */
161
      */
153
-    #define BTN_EN1        PA9
154
-    #define BTN_EN2        PA10
155
-    #define BTN_ENC        PB6
156
-
157
-    #define DOGLCD_CS      PB8
158
-    #define DOGLCD_A0      PB9
159
-    #define DOGLCD_SCK     PB5
160
-    #define DOGLCD_MOSI    PB7
162
+    #define BTN_EN1        EXP1_2_PIN
163
+    #define BTN_EN2        EXP1_3_PIN
164
+    #define BTN_ENC        EXP1_6_PIN
165
+
166
+    #define DOGLCD_CS      EXP1_4_PIN
167
+    #define DOGLCD_A0      EXP1_8_PIN
168
+    #define DOGLCD_SCK     EXP1_1_PIN
169
+    #define DOGLCD_MOSI    EXP1_9_PIN
161
     #define FORCE_SOFT_SPI
170
     #define FORCE_SOFT_SPI
162
     #define LCD_BACKLIGHT_PIN -1
171
     #define LCD_BACKLIGHT_PIN -1
163
 
172
 

Loading…
취소
저장