|
@@ -187,32 +187,32 @@
|
187
|
187
|
|
188
|
188
|
/**
|
189
|
189
|
* _____ _____
|
190
|
|
- * NC | · · | GND 5V | · · | GND
|
191
|
|
- * RESET | · · | 1.31 (SD_DETECT) (LCD_D7) 1.23 | · · | 1.22 (LCD_D6)
|
192
|
|
- * (MOSI) 0.18 | · · | 3.25 (BTN_EN2) (LCD_D5) 1.21 | · · | 1.20 (LCD_D4)
|
193
|
|
- * (SD_SS) 0.16 | · · | 3.26 (BTN_EN1) (LCD_RS) 1.19 | · · | 1.18 (LCD_EN)
|
194
|
|
- * (SCK) 0.15 | · · | 0.17 (MISO) (BTN_ENC) 0.28 | · · | 1.30 (BEEPER)
|
|
190
|
+ * NC | 1 2 | GND 5V | 1 2 | GND
|
|
191
|
+ * RESET | 3 4 | 1.31 (SD_DETECT) (LCD_D7) 1.23 | 3 4 | 1.22 (LCD_D6)
|
|
192
|
+ * (MOSI) 0.18 | 5 6 3.25 (BTN_EN2) (LCD_D5) 1.21 | 5 6 1.20 (LCD_D4)
|
|
193
|
+ * (SD_SS) 0.16 | 7 8 | 3.26 (BTN_EN1) (LCD_RS) 1.19 | 7 8 | 1.18 (LCD_EN)
|
|
194
|
+ * (SCK) 0.15 | 9 10| 0.17 (MISO) (BTN_ENC) 0.28 | 9 10| 1.30 (BEEPER)
|
195
|
195
|
* ----- -----
|
196
|
196
|
* EXP2 EXP1
|
197
|
197
|
*/
|
198
|
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
|
|
199
|
+#define EXPA1_03_PIN P1_23
|
|
200
|
+#define EXPA1_04_PIN P1_22
|
|
201
|
+#define EXPA1_05_PIN P1_21
|
|
202
|
+#define EXPA1_06_PIN P1_20
|
|
203
|
+#define EXPA1_07_PIN P1_19
|
|
204
|
+#define EXPA1_08_PIN P1_18
|
|
205
|
+#define EXPA1_09_PIN P0_28
|
|
206
|
+#define EXPA1_10_PIN P1_30
|
|
207
|
+
|
|
208
|
+#define EXPA2_03_PIN -1
|
|
209
|
+#define EXPA2_04_PIN P1_31
|
|
210
|
+#define EXPA2_05_PIN P0_18
|
|
211
|
+#define EXPA2_06_PIN P3_25
|
|
212
|
+#define EXPA2_07_PIN P0_16
|
|
213
|
+#define EXPA2_08_PIN P3_26
|
|
214
|
+#define EXPA2_09_PIN P0_15
|
|
215
|
+#define EXPA2_10_PIN P0_17
|
216
|
216
|
|
217
|
217
|
#if HAS_SPI_LCD
|
218
|
218
|
|
|
@@ -232,114 +232,114 @@
|
232
|
232
|
*
|
233
|
233
|
* BEFORE AFTER
|
234
|
234
|
* _____ _____
|
235
|
|
- * GND 1 | · · | 2 5V 5V 1 | · · | 2 GND
|
236
|
|
- * CS 3 | · · | 4 BTN_EN2 CS 3 | · · | 4 BTN_EN2
|
237
|
|
- * SID 5 | · · | 6 BTN_EN1 SID 5 | · · | 6 BTN_EN1
|
238
|
|
- * open 7 | · · | 8 BTN_ENC CLK 7 | · · | 8 BTN_ENC
|
239
|
|
- * CLK 9 | · · | 10 Beeper open 9 | · · | 10 Beeper
|
|
235
|
+ * GND 1 | 1 2 | 2 5V 5V 1 | 1 2 | 2 GND
|
|
236
|
+ * CS 3 | 3 4 | 4 BTN_EN2 CS 3 | 3 4 | 4 BTN_EN2
|
|
237
|
+ * SID 5 | 5 6 6 BTN_EN1 SID 5 | 5 6 6 BTN_EN1
|
|
238
|
+ * open 7 | 7 8 | 8 BTN_ENC CLK 7 | 7 8 | 8 BTN_ENC
|
|
239
|
+ * CLK 9 | 9 10| 10 Beeper open 9 | 9 10| 10 Beeper
|
240
|
240
|
* ----- -----
|
241
|
241
|
* LCD LCD
|
242
|
242
|
*/
|
243
|
243
|
|
244
|
|
- #define LCD_PINS_RS EXP1_9_PIN
|
|
244
|
+ #define LCD_PINS_RS EXPA1_03_PIN
|
245
|
245
|
|
246
|
|
- #define BTN_EN1 EXP1_3_PIN
|
247
|
|
- #define BTN_EN2 EXP1_4_PIN
|
248
|
|
- #define BTN_ENC EXP1_2_PIN
|
|
246
|
+ #define BTN_EN1 EXPA1_06_PIN
|
|
247
|
+ #define BTN_EN2 EXPA1_04_PIN
|
|
248
|
+ #define BTN_ENC EXPA1_08_PIN
|
249
|
249
|
|
250
|
|
- #define LCD_PINS_ENABLE EXP1_8_PIN
|
251
|
|
- #define LCD_PINS_D4 EXP1_7_PIN
|
|
250
|
+ #define LCD_PINS_ENABLE EXPA1_05_PIN
|
|
251
|
+ #define LCD_PINS_D4 EXPA1_07_PIN
|
252
|
252
|
|
253
|
253
|
#elif ENABLED(CR10_STOCKDISPLAY)
|
254
|
254
|
|
255
|
|
- #define LCD_PINS_RS EXP1_4_PIN
|
|
255
|
+ #define LCD_PINS_RS EXPA1_04_PIN
|
256
|
256
|
|
257
|
|
- #define BTN_EN1 EXP1_2_PIN
|
258
|
|
- #define BTN_EN2 EXP1_3_PIN
|
259
|
|
- #define BTN_ENC EXP1_6_PIN // (58) open-drain
|
|
257
|
+ #define BTN_EN1 EXPA1_08_PIN
|
|
258
|
+ #define BTN_EN2 EXPA1_06_PIN
|
|
259
|
+ #define BTN_ENC EXPA1_09_PIN // (58) open-drain
|
260
|
260
|
|
261
|
|
- #define LCD_PINS_ENABLE EXP1_9_PIN
|
262
|
|
- #define LCD_PINS_D4 EXP1_8_PIN
|
|
261
|
+ #define LCD_PINS_ENABLE EXPA1_03_PIN
|
|
262
|
+ #define LCD_PINS_D4 EXPA1_05_PIN
|
263
|
263
|
|
264
|
264
|
#else // !CR10_STOCKDISPLAY
|
265
|
265
|
|
266
|
|
- #define LCD_PINS_RS EXP1_7_PIN
|
|
266
|
+ #define LCD_PINS_RS EXPA1_07_PIN
|
267
|
267
|
|
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
|
|
268
|
+ #define BTN_EN1 EXPA2_08_PIN // (31) J3-2 & AUX-4
|
|
269
|
+ #define BTN_EN2 EXPA2_06_PIN // (33) J3-4 & AUX-4
|
|
270
|
+ #define BTN_ENC EXPA1_09_PIN // (58) open-drain
|
271
|
271
|
|
272
|
|
- #define LCD_PINS_ENABLE EXP1_2_PIN
|
273
|
|
- #define LCD_PINS_D4 EXP1_3_PIN
|
|
272
|
+ #define LCD_PINS_ENABLE EXPA1_08_PIN
|
|
273
|
+ #define LCD_PINS_D4 EXPA1_06_PIN
|
274
|
274
|
|
275
|
|
- #define LCD_SDSS EXP2_7_PIN // (16) J3-7 & AUX-4
|
276
|
|
- #define SD_DETECT_PIN EXP2_4_PIN // (49) (NOT 5V tolerant)
|
|
275
|
+ #define LCD_SDSS EXPA2_07_PIN // (16) J3-7 & AUX-4
|
|
276
|
+ #define SD_DETECT_PIN EXPA2_04_PIN // (49) (NOT 5V tolerant)
|
277
|
277
|
|
278
|
278
|
#if ENABLED(FYSETC_MINI_12864)
|
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
|
|
279
|
+ #define DOGLCD_CS EXPA1_08_PIN
|
|
280
|
+ #define DOGLCD_A0 EXPA1_07_PIN
|
|
281
|
+ #define DOGLCD_SCK EXPA2_09_PIN
|
|
282
|
+ #define DOGLCD_MOSI EXPA2_05_PIN
|
283
|
283
|
|
284
|
284
|
#define LCD_BACKLIGHT_PIN -1
|
285
|
285
|
|
286
|
286
|
#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
|
287
|
287
|
// results in LCD soft SPI mode 3, SD soft SPI mode 0
|
288
|
288
|
|
289
|
|
- #define LCD_RESET_PIN EXP1_3_PIN // Must be high or open for LCD to operate normally.
|
|
289
|
+ #define LCD_RESET_PIN EXPA1_06_PIN // Must be high or open for LCD to operate normally.
|
290
|
290
|
|
291
|
291
|
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
|
292
|
292
|
#ifndef RGB_LED_R_PIN
|
293
|
|
- #define RGB_LED_R_PIN EXP1_8_PIN
|
|
293
|
+ #define RGB_LED_R_PIN EXPA1_05_PIN
|
294
|
294
|
#endif
|
295
|
295
|
#ifndef RGB_LED_G_PIN
|
296
|
|
- #define RGB_LED_G_PIN EXP1_4_PIN
|
|
296
|
+ #define RGB_LED_G_PIN EXPA1_04_PIN
|
297
|
297
|
#endif
|
298
|
298
|
#ifndef RGB_LED_B_PIN
|
299
|
|
- #define RGB_LED_B_PIN EXP1_9_PIN
|
|
299
|
+ #define RGB_LED_B_PIN EXPA1_03_PIN
|
300
|
300
|
#endif
|
301
|
301
|
#elif ENABLED(FYSETC_MINI_12864_2_1)
|
302
|
|
- #define NEOPIXEL_PIN EXP1_8_PIN
|
|
302
|
+ #define NEOPIXEL_PIN EXPA1_05_PIN
|
303
|
303
|
#endif
|
304
|
304
|
|
305
|
305
|
#else // !FYSETC_MINI_12864
|
306
|
306
|
|
307
|
307
|
#if ENABLED(MKS_MINI_12864)
|
308
|
308
|
|
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
|
|
309
|
+ #define DOGLCD_CS EXPA1_05_PIN
|
|
310
|
+ #define DOGLCD_A0 EXPA1_04_PIN
|
|
311
|
+ #define DOGLCD_SCK EXPA2_09_PIN
|
|
312
|
+ #define DOGLCD_MOSI EXPA2_05_PIN
|
313
|
313
|
|
314
|
314
|
#elif ENABLED(ENDER2_STOCKDISPLAY)
|
315
|
315
|
|
316
|
316
|
/**
|
317
|
317
|
* Creality Ender-2 display pinout
|
318
|
318
|
* _____
|
319
|
|
- * 5V | · · | GND
|
320
|
|
- * (MOSI) P1_23 | · · | P1_22 (LCD_CS)
|
321
|
|
- * (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2)
|
322
|
|
- * RESET P1_19 | · · | P1_18 (BTN_EN1)
|
323
|
|
- * (BTN_ENC) P0_28 | · · | P1_30 (SCK)
|
|
319
|
+ * 5V | 1 2 | GND
|
|
320
|
+ * (MOSI) P1_23 | 3 4 | P1_22 (LCD_CS)
|
|
321
|
+ * (LCD_A0) P1_21 | 5 6 P1_20 (BTN_EN2)
|
|
322
|
+ * RESET P1_19 | 7 8 | P1_18 (BTN_EN1)
|
|
323
|
+ * (BTN_ENC) P0_28 | 9 10| P1_30 (SCK)
|
324
|
324
|
* -----
|
325
|
325
|
* EXP1
|
326
|
326
|
*/
|
327
|
327
|
|
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
|
|
328
|
+ #define BTN_EN1 EXPA1_08_PIN
|
|
329
|
+ #define BTN_EN2 EXPA1_06_PIN
|
|
330
|
+ #define BTN_ENC EXPA1_09_PIN
|
|
331
|
+ #define DOGLCD_CS EXPA1_04_PIN
|
|
332
|
+ #define DOGLCD_A0 EXPA1_05_PIN
|
|
333
|
+ #define DOGLCD_SCK EXPA1_10_PIN
|
|
334
|
+ #define DOGLCD_MOSI EXPA1_03_PIN
|
335
|
335
|
#define FORCE_SOFT_SPI
|
336
|
336
|
#define LCD_BACKLIGHT_PIN -1
|
337
|
337
|
#endif
|
338
|
338
|
|
339
|
339
|
#if ENABLED(ULTIPANEL)
|
340
|
|
- #define LCD_PINS_D5 EXP1_8_PIN
|
341
|
|
- #define LCD_PINS_D6 EXP1_4_PIN
|
342
|
|
- #define LCD_PINS_D7 EXP1_9_PIN
|
|
340
|
+ #define LCD_PINS_D5 EXPA1_05_PIN
|
|
341
|
+ #define LCD_PINS_D6 EXPA1_04_PIN
|
|
342
|
+ #define LCD_PINS_D7 EXPA1_03_PIN
|
343
|
343
|
#endif
|
344
|
344
|
|
345
|
345
|
#endif // !FYSETC_MINI_12864
|
|
@@ -357,7 +357,7 @@
|
357
|
357
|
#endif
|
358
|
358
|
|
359
|
359
|
#if SD_CONNECTION_IS(LCD)
|
360
|
|
- #define SS_PIN EXP2_7_PIN
|
|
360
|
+ #define SS_PIN EXPA2_07_PIN
|
361
|
361
|
#endif
|
362
|
362
|
|
363
|
363
|
/**
|