bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

MarlinUI for SPI/I2C TFT-GLCD character-based display bridge (#19375)

Browse Source
This commit is contained in:
Serhiy-K
2020-09-28 09:52:38 +03:00
committed by GitHub
parent c2c6a679ea
commit 27bdf4b24e
31 changed files with 2516 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View File

@ -279,9 +279,7 @@
#if SD_CONNECTION_IS(ONBOARD)
#define SD_DETECT_PIN PC4
#endif
#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) && SD_CONNECTION_IS(LCD)
#elif SD_CONNECTION_IS(LCD) && BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
#define SD_DETECT_PIN PA15
#define SS_PIN PA10
#elif SD_CONNECTION_IS(CUSTOM_CABLE)

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

@ -169,8 +169,48 @@
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
#error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
/**
* TFTGLCD_PANEL_SPI display pinout
*
* Board Display
* _____ _____
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) GLCD_CS | 3 4 | SD_CS (PA10)
* (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)
* (BEEPER) PB6 | 9 10| PB5 (SD_DET) GND | 9 10| 5V
* ----- -----
* EXP1 EXP1
*
* Needs custom cable:
*
* Board Adapter Display
* _________
* EXP1-1 ----------- EXP1-10
* EXP1-2 ----------- EXP1-9
* SPI1-4 ----------- EXP1-6
* EXP1-4 ----------- FREE
* SPI1-3 ----------- EXP1-2
* EXP1-6 ----------- EXP1-4
* EXP1-7 ----------- FREE
* EXP1-8 ----------- EXP1-3
* SPI1-1 ----------- EXP1-1
* EXP1-10 ----------- EXP1-7
*
*/
#define TFTGLCD_CS PA9
#endif
#else
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3."
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
#endif
#endif // HAS_WIRED_LCD
@ -227,9 +267,7 @@
#if SD_CONNECTION_IS(ONBOARD)
#define SD_DETECT_PIN PC4
#endif
#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) && SD_CONNECTION_IS(LCD)
#elif SD_CONNECTION_IS(LCD) && (BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) || IS_TFTGLCD_PANEL)
#define SD_DETECT_PIN PB5
#define SS_PIN PA10
#elif SD_CONNECTION_IS(CUSTOM_CABLE)

11
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
View File

@ -123,6 +123,17 @@
#define LCD_PINS_ENABLE PC14
#define LCD_PINS_D4 PB7
#elif IS_TFTGLCD_PANEL
#undef BEEPER_PIN
#undef BTN_ENC
#if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS PD2
#endif
#define SD_DETECT_PIN PB9
#else
#define LCD_PINS_RS PC12

6
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
View File

@ -115,6 +115,12 @@
#define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15
#elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS PB11
#endif
#else // !MKS_MINI_12864
#define LCD_PINS_D4 PA6

13
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View File

@ -356,6 +356,19 @@
#define DOGLCD_SCK PA5
#define DOGLCD_MOSI PA7
#elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
#define PIN_SPI_SCK PA5
#define PIN_TFT_MISO PA6
#define PIN_TFT_MOSI PA7
#define TFTGLCD_CS PE8
#endif
#ifndef BEEPER_PIN
#define BEEPER_PIN -1
#endif
#else // !MKS_MINI_12864
#define LCD_PINS_D4 PE14

7
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View File

@ -225,6 +225,12 @@
#define BTN_EN2 PG4
#endif
#elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS PG5
#endif
#elif HAS_WIRED_LCD
#define BEEPER_PIN PC5
@ -254,6 +260,7 @@
#endif
#endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
#endif
#ifndef BOARD_ST7920_DELAY_1