andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

✨ DWIN LCD for BTT SKR Mini E3 (#22288)

vanilla_fb_2.0.x
Krzysztof Błażewicz 4 years ago
committed by Scott Lahteine
parent
ee64081696
commit
6b2370fd7c
3 changed files with 56 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Marlin/src/inc/Conditionals_LCD.h
  2. 2
      Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
  3. 78
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h

6
Marlin/src/inc/Conditionals_LCD.h
View File

@ -1078,7 +1078,11 @@
#if ENABLED(DWIN_CREALITY_LCD) #if ENABLED(DWIN_CREALITY_LCD)
#define SERIAL_CATCHALL 0 #define SERIAL_CATCHALL 0
#ifndef LCD_SERIAL_PORT #ifndef LCD_SERIAL_PORT
#define LCD_SERIAL_PORT 3 // Creality 4.x board #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO)
#define LCD_SERIAL_PORT 1
#else
#define LCD_SERIAL_PORT 3 // Creality 4.x board
#endif
#endif #endif
#endif #endif

2
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
View File

@ -202,7 +202,7 @@
#define EXP1_10_PIN P2_08 #define EXP1_10_PIN P2_08
#if ENABLED(DWIN_CREALITY_LCD) #if ENABLED(DWIN_CREALITY_LCD)
#error "DWIN_CREALITY_LCD requires a custom cable with TX = P0_15, RX = P0_16, and LCD_SERIAL_PORT 1. Comment out this line to continue." #error "DWIN_CREALITY_LCD requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
#define BEEPER_PIN EXP1_10_PIN #define BEEPER_PIN EXP1_10_PIN
#define BTN_EN1 EXP1_03_PIN #define BTN_EN1 EXP1_03_PIN

78
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View File

@ -117,14 +117,14 @@
/** /**
* SKR Mini E3 V1.0, V1.2 SKR Mini E3 V2.0 * SKR Mini E3 V1.0, V1.2 SKR Mini E3 V2.0
* _____ _____ * ______ ______
* 5V | 1 2 | GND 5V | 1 2 | GND * 5V | 1 2 | GND 5V | 1 2 | GND
* (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS) (LCD_EN) PB15 | 3 4 | PB8 (LCD_RS) * (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS) (LCD_EN) PB15 | 3 4 | PB8 (LCD_RS)
* (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2) (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2) * (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2) (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
* RESET | 7 8 | PA9 (BTN_EN1) RESET | 7 8 | PA9 (BTN_EN1) * RESET | 7 8 | PA9 (BTN_EN1) RESET | 7 8 | PA9 (BTN_EN1)
* (BTN_ENC) PB6 | 9 10| PB5 (BEEPER) (BTN_ENC) PA15 | 9 10| PB5 (BEEPER) * (BTN_ENC) PB6 | 9 10 | PB5 (BEEPER) (BTN_ENC) PA15 | 9 10 | PB5 (BEEPER)
* ----- ----- * ------ ------
* EXP1 EXP1 * EXP1 EXP1
*/ */
#ifdef SKR_MINI_E3_V2 #ifdef SKR_MINI_E3_V2
#define EXP1_9 PA15 #define EXP1_9 PA15
@ -134,7 +134,28 @@
#define EXP1_3 PB7 #define EXP1_3 PB7
#endif #endif
#if HAS_WIRED_LCD #if ENABLED(DWIN_CREALITY_LCD)
/**
* ------ ------ ------
* VCC | 1 2 | GND VCC | 1 2 | GND GND | 2 1 | VCC
* A | 3 4 | B A | 3 4 | B B | 4 3 | A
* | 5 6 TX BEEP | 5 6 ENT ENT | 6 5 | BEEP
* | 7 8 | RX TX | 7 8 | RX RX | 8 7 | TX
* BEEP | 9 10 | ENT | 9 10 | | 10 9 |
* ------ ------ ------
* EXP1 DWIN DWIN (plug)
*
* All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
*/
#error "DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. Comment out this line to continue."
#define BEEPER_PIN EXP1_9
#define BTN_EN1 EXP1_3
#define BTN_EN2 PB8
#define BTN_ENC PB5
#elif HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
@ -184,19 +205,19 @@
* TFTGLCD_PANEL_SPI display pinout * TFTGLCD_PANEL_SPI display pinout
* *
* Board Display * Board Display
* _____ _____ * ______ ______
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK) * 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) LCD_CS | 3 4 | SD_CS (PA10) * (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) LCD_CS | 3 4 | SD_CS (PA10)
* (FREE) PB9 | 5 6 | PA10 (SD_CS) (FREE) | 5 6 | MOSI (SPI1-MOSI) * (FREE) PB9 | 5 6 | PA10 (SD_CS) (FREE) | 5 6 | MOSI (SPI1-MOSI)
* RESET | 7 8 | PA9 (MOD_RESET) (PB5) SD_DET | 7 8 | (FREE) * RESET | 7 8 | PA9 (MOD_RESET) (PB5) SD_DET | 7 8 | (FREE)
* (BEEPER) PB6 | 9 10| PB5 (SD_DET) GND | 9 10| 5V * (BEEPER) PB6 | 9 10 | PB5 (SD_DET) GND | 9 10 | 5V
* ----- ----- * ------ ------
* EXP1 EXP1 * EXP1 EXP1
* *
* Needs custom cable: * Needs custom cable:
* *
* Board Adapter Display * Board Display
* _________ *
* EXP1-1 ----------- EXP1-10 * EXP1-1 ----------- EXP1-10
* EXP1-2 ----------- EXP1-9 * EXP1-2 ----------- EXP1-9
* SPI1-4 ----------- EXP1-6 * SPI1-4 ----------- EXP1-6
@ -223,17 +244,18 @@
#error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue." #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
/** FYSETC TFT TFT81050 display pinout /**
* FYSETC TFT TFT81050 display pinout
* *
* Board Display * Board Display
* _____ _____ * ______ ______
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK) * 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) MOD_RESET | 3 4 | SD_CS (PA10) * (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) MOD_RESET | 3 4 | SD_CS (PA10)
* (FREE) PB9 | 5 6 | PA10 (SD_CS) (PB8) LCD_CS | 5 6 | MOSI (SPI1-MOSI) * (FREE) PB9 | 5 6 | PA10 (SD_CS) (PB8) LCD_CS | 5 6 | MOSI (SPI1-MOSI)
* RESET | 7 8 | PA9 (MOD_RESET) (PB5) SD_DET | 7 8 | RESET * RESET | 7 8 | PA9 (MOD_RESET) (PB5) SD_DET | 7 8 | RESET
* (BEEPER) PB6 | 9 10| PB5 (SD_DET) GND | 9 10| 5V * (BEEPER) PB6 | 9 10 | PB5 (SD_DET) GND | 9 10 | 5V
* ----- ----- * ------ ------
* EXP1 EXP1 * EXP1 EXP1
* *
* Needs custom cable: * Needs custom cable:
* *

Write Preview
Loading…
Cancel
Save