|
@@ -197,11 +197,11 @@
|
197
|
197
|
|
198
|
198
|
#if HAS_WIRED_LCD
|
199
|
199
|
|
200
|
|
- #if ENABLED(CR10_STOCKDISPLAY)
|
|
200
|
+ #if EITHER(CR10_STOCKDISPLAY, LCD_FOR_MELZI)
|
201
|
201
|
|
202
|
202
|
#define BEEPER_PIN PE8
|
203
|
|
- #define BTN_ENC PE9
|
204
|
203
|
|
|
204
|
+ #define BTN_ENC PE9
|
205
|
205
|
#define BTN_EN1 PE7
|
206
|
206
|
#define BTN_EN2 PB2
|
207
|
207
|
|
|
@@ -209,6 +209,40 @@
|
209
|
209
|
#define LCD_PINS_ENABLE PE11
|
210
|
210
|
#define LCD_PINS_D4 PE10
|
211
|
211
|
|
|
212
|
+ #if ENABLED(LCD_FOR_MELZI)
|
|
213
|
+
|
|
214
|
+ #error "CAUTION! LCD_FOR_MELZI requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
|
|
215
|
+
|
|
216
|
+ /** LCD_FOR_MELZI display pinout
|
|
217
|
+ *
|
|
218
|
+ * BTT E3 RRF Display Ribbon
|
|
219
|
+ * ------ ------
|
|
220
|
+ * (BEEPER) PE8 |10 9 | PE9 (BTN_ENC) GND |10 9 | 5V
|
|
221
|
+ * (BTN_EN1) PE7 | 8 7 | RESET BEEPER | 8 7 | ESTOP (RESET)
|
|
222
|
+ * (BTN_EN2) PB2 6 5 | PE10 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4)
|
|
223
|
+ * (LCD_RS) PB1 | 4 3 | PE11 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN)
|
|
224
|
+ * GND | 2 1 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS)
|
|
225
|
+ * ------ ------
|
|
226
|
+ * EXP1 Ribbon
|
|
227
|
+ *
|
|
228
|
+ * Needs custom cable:
|
|
229
|
+ *
|
|
230
|
+ * Board Adapter Display Ribbon (coming from display)
|
|
231
|
+ *
|
|
232
|
+ * EXP1-1 ----------- EXP1-9
|
|
233
|
+ * EXP1-2 ----------- EXP1-10
|
|
234
|
+ * EXP1-3 ----------- EXP1-3
|
|
235
|
+ * EXP1-4 ----------- EXP1-1
|
|
236
|
+ * EXP1-5 ----------- EXP1-5
|
|
237
|
+ * EXP1-6 ----------- EXP1-4
|
|
238
|
+ * EXP1-7 ----------- EXP1-7
|
|
239
|
+ * EXP1-8 ----------- EXP1-8
|
|
240
|
+ * EXP1-9 ----------- EXP1-6
|
|
241
|
+ * EXP1-10 ----------- EXP1-8
|
|
242
|
+ */
|
|
243
|
+
|
|
244
|
+ #endif
|
|
245
|
+
|
212
|
246
|
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
|
213
|
247
|
|
214
|
248
|
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
|
|
@@ -275,11 +309,15 @@
|
275
|
309
|
#endif
|
276
|
310
|
|
277
|
311
|
#else
|
278
|
|
- #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BTT_E3_RRF."
|
|
312
|
+ #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BTT_E3_RRF."
|
279
|
313
|
#endif
|
280
|
314
|
|
281
|
315
|
// Alter timing for graphical display
|
282
|
|
- #if IS_U8GLIB_ST7920
|
|
316
|
+ #if ENABLED(LCD_FOR_MELZI) // LCD_FOR_MELZI default timing is too fast. This works but may be reduced.
|
|
317
|
+ #define BOARD_ST7920_DELAY_1 200
|
|
318
|
+ #define BOARD_ST7920_DELAY_2 400
|
|
319
|
+ #define BOARD_ST7920_DELAY_3 1200
|
|
320
|
+ #elif IS_U8GLIB_ST7920
|
283
|
321
|
#define BOARD_ST7920_DELAY_1 96
|
284
|
322
|
#define BOARD_ST7920_DELAY_2 48
|
285
|
323
|
#define BOARD_ST7920_DELAY_3 600
|
|
@@ -306,7 +344,7 @@
|
306
|
344
|
* Needs custom cable:
|
307
|
345
|
*
|
308
|
346
|
* Board Adapter Display
|
309
|
|
- * _________
|
|
347
|
+ *
|
310
|
348
|
* EXP1-1 ----------- EXP1-10
|
311
|
349
|
* EXP1-2 ----------- EXP1-9
|
312
|
350
|
* SPI1-4 ----------- EXP1-6
|