MarlinUI for SPI/I2C TFT-GLCD character-based display bridge (#19375)
This commit is contained in:
@ -65,7 +65,16 @@
|
||||
* by redrawing the screen after SD card accesses.
|
||||
*/
|
||||
|
||||
#if HAS_WIRED_LCD
|
||||
#if IS_TFTGLCD_PANEL
|
||||
|
||||
#if ENABLED(TFTGLCD_PANEL_SPI)
|
||||
#define TFTGLCD_CS P3_26
|
||||
#endif
|
||||
|
||||
#define SD_DETECT_PIN P1_31
|
||||
|
||||
#elif HAS_WIRED_LCD
|
||||
|
||||
#define BTN_EN1 P3_26
|
||||
#define BTN_EN2 P3_25
|
||||
#define BTN_ENC P2_11
|
||||
@ -80,7 +89,8 @@
|
||||
#define DOGLCD_CS P2_06
|
||||
#define DOGLCD_A0 P0_16
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// SD Support
|
||||
@ -89,7 +99,7 @@
|
||||
// requires jumpers on the SKR V1.1 board as documented here:
|
||||
// https://www.facebook.com/groups/505736576548648/permalink/630639874058317/
|
||||
#ifndef SDCARD_CONNECTION
|
||||
#if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
|
||||
#if ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY, IS_TFTGLCD_PANEL)
|
||||
#define SDCARD_CONNECTION LCD
|
||||
#else
|
||||
#define SDCARD_CONNECTION ONBOARD
|
||||
|
@ -265,6 +265,14 @@
|
||||
|
||||
#error "ADC BUTTONS do not work unmodifed on SKR 1.3, The ADC ports cannot take more than 3.3v."
|
||||
|
||||
#elif IS_TFTGLCD_PANEL
|
||||
|
||||
#if ENABLED(TFTGLCD_PANEL_SPI)
|
||||
#define TFTGLCD_CS EXPA2_08_PIN
|
||||
#endif
|
||||
|
||||
#define SD_DETECT_PIN EXPA2_04_PIN
|
||||
|
||||
#else // !CR10_STOCKDISPLAY
|
||||
|
||||
#define LCD_PINS_RS EXPA1_07_PIN
|
||||
|
@ -309,6 +309,14 @@
|
||||
#define XPT2046_Y_OFFSET -285
|
||||
#endif
|
||||
|
||||
#elif IS_TFTGLCD_PANEL
|
||||
|
||||
#if ENABLED(TFTGLCD_PANEL_SPI)
|
||||
#define TFTGLCD_CS P3_26
|
||||
#endif
|
||||
|
||||
#define SD_DETECT_PIN P1_31
|
||||
|
||||
#else
|
||||
|
||||
#define BTN_ENC P0_28 // (58) open-drain
|
||||
|
@ -217,7 +217,18 @@
|
||||
* that the garbage/lines are erased immediately after the SD card accesses are completed.
|
||||
*/
|
||||
|
||||
#if HAS_WIRED_LCD
|
||||
#if IS_TFTGLCD_PANEL
|
||||
|
||||
#if ENABLED(TFTGLCD_PANEL_SPI)
|
||||
#define TFTGLCD_CS P3_25 // EXP2.3
|
||||
#endif
|
||||
|
||||
#if SD_CONNECTION_IS(LCD)
|
||||
#define SD_DETECT_PIN P0_28 // EXP2.4
|
||||
#endif
|
||||
|
||||
#elif HAS_WIRED_LCD
|
||||
|
||||
#define BEEPER_PIN P1_31 // EXP1.1
|
||||
#define BTN_ENC P1_30 // EXP1.2
|
||||
#define BTN_EN1 P3_26 // EXP2.5
|
||||
@ -273,7 +284,7 @@
|
||||
//#define LCD_SCREEN_ROT_270
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
/**
|
||||
* Example for trinamic drivers using the J8 connector on MKs Sbase.
|
||||
|
@ -249,6 +249,15 @@
|
||||
#define LCD_PINS_ENABLE P1_22
|
||||
#define LCD_PINS_D4 P0_17
|
||||
|
||||
#elif IS_TFTGLCD_PANEL
|
||||
|
||||
#undef BEEPER_PIN
|
||||
#undef BTN_ENC
|
||||
|
||||
#if ENABLED(TFTGLCD_PANEL_SPI)
|
||||
#define TFTGLCD_CS P3_25
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
#define BTN_EN1 P3_25
|
||||
|
@ -326,6 +326,15 @@
|
||||
#define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
|
||||
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
|
||||
|
||||
#elif IS_TFTGLCD_PANEL
|
||||
|
||||
#if ENABLED(TFTGLCD_PANEL_SPI)
|
||||
#define TFTGLCD_CS P3_26 // (31) J3-2 & AUX-4
|
||||
#endif
|
||||
|
||||
#define SD_DETECT_PIN P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant)
|
||||
#define KILL_PIN P1_22 // (41) J5-4 & AUX-4
|
||||
|
||||
#elif HAS_WIRED_LCD
|
||||
|
||||
//#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
|
||||
|
Reference in New Issue
Block a user