|
@@ -117,14 +117,14 @@
|
117
|
117
|
|
118
|
118
|
/**
|
119
|
119
|
* SKR Mini E3 V1.0, V1.2 SKR Mini E3 V2.0
|
120
|
|
- * _____ _____
|
121
|
|
- * 5V | 1 2 | GND 5V | 1 2 | GND
|
122
|
|
- * (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS) (LCD_EN) PB15 | 3 4 | PB8 (LCD_RS)
|
123
|
|
- * (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2) (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
|
124
|
|
- * RESET | 7 8 | PA9 (BTN_EN1) RESET | 7 8 | PA9 (BTN_EN1)
|
125
|
|
- * (BTN_ENC) PB6 | 9 10| PB5 (BEEPER) (BTN_ENC) PA15 | 9 10| PB5 (BEEPER)
|
126
|
|
- * ----- -----
|
127
|
|
- * EXP1 EXP1
|
|
120
|
+ * ______ ______
|
|
121
|
+ * 5V | 1 2 | GND 5V | 1 2 | GND
|
|
122
|
+ * (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS) (LCD_EN) PB15 | 3 4 | PB8 (LCD_RS)
|
|
123
|
+ * (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2) (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
|
|
124
|
+ * RESET | 7 8 | PA9 (BTN_EN1) RESET | 7 8 | PA9 (BTN_EN1)
|
|
125
|
+ * (BTN_ENC) PB6 | 9 10 | PB5 (BEEPER) (BTN_ENC) PA15 | 9 10 | PB5 (BEEPER)
|
|
126
|
+ * ------ ------
|
|
127
|
+ * EXP1 EXP1
|
128
|
128
|
*/
|
129
|
129
|
#ifdef SKR_MINI_E3_V2
|
130
|
130
|
#define EXP1_9 PA15
|
|
@@ -134,7 +134,28 @@
|
134
|
134
|
#define EXP1_3 PB7
|
135
|
135
|
#endif
|
136
|
136
|
|
137
|
|
-#if HAS_WIRED_LCD
|
|
137
|
+#if ENABLED(DWIN_CREALITY_LCD)
|
|
138
|
+ /**
|
|
139
|
+ * ------ ------ ------
|
|
140
|
+ * VCC | 1 2 | GND VCC | 1 2 | GND GND | 2 1 | VCC
|
|
141
|
+ * A | 3 4 | B A | 3 4 | B B | 4 3 | A
|
|
142
|
+ * | 5 6 TX BEEP | 5 6 ENT ENT | 6 5 | BEEP
|
|
143
|
+ * | 7 8 | RX TX | 7 8 | RX RX | 8 7 | TX
|
|
144
|
+ * BEEP | 9 10 | ENT | 9 10 | | 10 9 |
|
|
145
|
+ * ------ ------ ------
|
|
146
|
+ * EXP1 DWIN DWIN (plug)
|
|
147
|
+ *
|
|
148
|
+ * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
|
|
149
|
+ */
|
|
150
|
+
|
|
151
|
+ #error "DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. Comment out this line to continue."
|
|
152
|
+
|
|
153
|
+ #define BEEPER_PIN EXP1_9
|
|
154
|
+ #define BTN_EN1 EXP1_3
|
|
155
|
+ #define BTN_EN2 PB8
|
|
156
|
+ #define BTN_ENC PB5
|
|
157
|
+
|
|
158
|
+#elif HAS_WIRED_LCD
|
138
|
159
|
|
139
|
160
|
#if ENABLED(CR10_STOCKDISPLAY)
|
140
|
161
|
|
|
@@ -184,19 +205,19 @@
|
184
|
205
|
* TFTGLCD_PANEL_SPI display pinout
|
185
|
206
|
*
|
186
|
207
|
* Board Display
|
187
|
|
- * _____ _____
|
188
|
|
- * 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
|
189
|
|
- * (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) LCD_CS | 3 4 | SD_CS (PA10)
|
190
|
|
- * (FREE) PB9 | 5 6 | PA10 (SD_CS) (FREE) | 5 6 | MOSI (SPI1-MOSI)
|
191
|
|
- * RESET | 7 8 | PA9 (MOD_RESET) (PB5) SD_DET | 7 8 | (FREE)
|
192
|
|
- * (BEEPER) PB6 | 9 10| PB5 (SD_DET) GND | 9 10| 5V
|
193
|
|
- * ----- -----
|
194
|
|
- * EXP1 EXP1
|
|
208
|
+ * ______ ______
|
|
209
|
+ * 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
|
|
210
|
+ * (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) LCD_CS | 3 4 | SD_CS (PA10)
|
|
211
|
+ * (FREE) PB9 | 5 6 | PA10 (SD_CS) (FREE) | 5 6 | MOSI (SPI1-MOSI)
|
|
212
|
+ * RESET | 7 8 | PA9 (MOD_RESET) (PB5) SD_DET | 7 8 | (FREE)
|
|
213
|
+ * (BEEPER) PB6 | 9 10 | PB5 (SD_DET) GND | 9 10 | 5V
|
|
214
|
+ * ------ ------
|
|
215
|
+ * EXP1 EXP1
|
195
|
216
|
*
|
196
|
217
|
* Needs custom cable:
|
197
|
218
|
*
|
198
|
|
- * Board Adapter Display
|
199
|
|
- * _________
|
|
219
|
+ * Board Display
|
|
220
|
+ *
|
200
|
221
|
* EXP1-1 ----------- EXP1-10
|
201
|
222
|
* EXP1-2 ----------- EXP1-9
|
202
|
223
|
* SPI1-4 ----------- EXP1-6
|
|
@@ -223,17 +244,18 @@
|
223
|
244
|
|
224
|
245
|
#error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
|
225
|
246
|
|
226
|
|
- /** FYSETC TFT TFT81050 display pinout
|
|
247
|
+ /**
|
|
248
|
+ * FYSETC TFT TFT81050 display pinout
|
227
|
249
|
*
|
228
|
250
|
* Board Display
|
229
|
|
- * _____ _____
|
230
|
|
- * 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
|
231
|
|
- * (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) MOD_RESET | 3 4 | SD_CS (PA10)
|
232
|
|
- * (FREE) PB9 | 5 6 | PA10 (SD_CS) (PB8) LCD_CS | 5 6 | MOSI (SPI1-MOSI)
|
233
|
|
- * RESET | 7 8 | PA9 (MOD_RESET) (PB5) SD_DET | 7 8 | RESET
|
234
|
|
- * (BEEPER) PB6 | 9 10| PB5 (SD_DET) GND | 9 10| 5V
|
235
|
|
- * ----- -----
|
236
|
|
- * EXP1 EXP1
|
|
251
|
+ * ______ ______
|
|
252
|
+ * 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
|
|
253
|
+ * (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) MOD_RESET | 3 4 | SD_CS (PA10)
|
|
254
|
+ * (FREE) PB9 | 5 6 | PA10 (SD_CS) (PB8) LCD_CS | 5 6 | MOSI (SPI1-MOSI)
|
|
255
|
+ * RESET | 7 8 | PA9 (MOD_RESET) (PB5) SD_DET | 7 8 | RESET
|
|
256
|
+ * (BEEPER) PB6 | 9 10 | PB5 (SD_DET) GND | 9 10 | 5V
|
|
257
|
+ * ------ ------
|
|
258
|
+ * EXP1 EXP1
|
237
|
259
|
*
|
238
|
260
|
* Needs custom cable:
|
239
|
261
|
*
|