diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h index 272c7d2ed2e18..8f8f9907ed2a0 100644 --- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h +++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h @@ -377,9 +377,9 @@ #if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI) + #define TFT_A0_PIN 43 #define TFT_CS_PIN 49 #define TFT_DC_PIN 43 - #define TFT_A0_PIN TFT_DC_PIN #define TFT_SCK_PIN SD_SCK_PIN #define TFT_MISO_PIN SD_MISO_PIN #define TFT_MOSI_PIN SD_MOSI_PIN diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h index 72a65efc52b85..cb79fc4751d19 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h @@ -319,7 +319,7 @@ #define BTN_EN1 EXP2_03_PIN #define BTN_EN2 EXP2_05_PIN - #define TFT_A0_PIN TFT_DC_PIN + #define TFT_DC_PIN TFT_A0_PIN #ifndef TFT_WIDTH #define TFT_WIDTH 480 @@ -329,23 +329,10 @@ #endif #if ENABLED(BTT_TFT35_SPI_V1_0) - - /** - * ------ ------ - * BEEPER | 1 2 | LCD-BTN MISO | 1 2 | CLK - * T_MOSI | 3 4 | T_CS LCD-ENCA | 3 4 | TFTCS - * T_CLK | 5 6 T_MISO LCD-ENCB | 5 6 MOSI - * PENIRQ | 7 8 | F_CS RS | 7 8 | RESET - * GND | 9 10 | VCC GND | 9 10 | NC - * ------ ------ - * EXP1 EXP2 - * - * 480x320, 3.5", SPI Display with Rotary Encoder. - * Stock Display for the BIQU B1 SE Series. - * Schematic: https://github.com/bigtreetech/TFT35-SPI/blob/master/v1/Hardware/BTT%20TFT35-SPI%20V1-SCH.pdf - */ + // 480x320, 3.5", SPI Display with Rotary Encoder. + // Stock Display for the BIQU B1 SE. #define TFT_CS_PIN EXP2_04_PIN - #define TFT_DC_PIN EXP2_07_PIN + #define TFT_A0_PIN EXP2_07_PIN #define TOUCH_CS_PIN EXP1_04_PIN #define TOUCH_SCK_PIN EXP1_05_PIN @@ -355,17 +342,8 @@ #elif ENABLED(MKS_TS35_V2_0) - /** ------ ------ - * BEEPER | 1 2 | BTN_ENC SPI1_MISO | 1 2 | SPI1_SCK - * TFT_BKL / LCD_EN | 3 4 | TFT_RESET / LCD_RS BTN_EN1 | 3 4 | SPI1_CS - * TOUCH_CS / LCD_D4 | 5 6 TOUCH_INT / LCD_D5 BTN_EN2 | 5 6 SPI1_MOSI - * SPI1_CS / LCD_D6 | 7 8 | SPI1_RS / LCD_D7 SPI1_RS | 7 8 | RESET - * GND | 9 10 | VCC GND | 9 10 | VCC - * ------ ------ - * EXP1 EXP2 - */ #define TFT_CS_PIN EXP1_07_PIN - #define TFT_DC_PIN EXP1_08_PIN + #define TFT_A0_PIN EXP1_08_PIN #define TFT_RESET_PIN EXP1_04_PIN diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index b3ebec561d9ca..ce5359b3f4a35 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -396,8 +396,8 @@ #elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI #define TFT_CS_PIN EXP1_07_PIN + #define TFT_A0_PIN EXP1_08_PIN #define TFT_DC_PIN EXP1_08_PIN - #define TFT_A0_PIN TFT_DC_PIN #define TFT_MISO_PIN EXP2_01_PIN #define TFT_BACKLIGHT_PIN EXP1_03_PIN #define TFT_RESET_PIN EXP1_04_PIN diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h index 328213e873306..a265bea7bc365 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h @@ -295,8 +295,8 @@ #elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI #define TFT_CS_PIN EXP1_07_PIN + #define TFT_A0_PIN EXP1_08_PIN #define TFT_DC_PIN EXP1_08_PIN - #define TFT_A0_PIN TFT_DC_PIN #define TFT_MISO_PIN EXP2_01_PIN #define TFT_BACKLIGHT_PIN EXP1_03_PIN #define TFT_RESET_PIN EXP1_04_PIN diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h index 2469305696569..cf93570c33215 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h @@ -514,40 +514,15 @@ #if HAS_SPI_TFT - #define TFT_SCK_PIN EXP2_02_PIN - #define TFT_MISO_PIN EXP2_01_PIN - #define TFT_MOSI_PIN EXP2_06_PIN - #define BTN_ENC EXP1_02_PIN #define BTN_EN1 EXP2_03_PIN #define BTN_EN2 EXP2_05_PIN - #ifndef TFT_WIDTH - #define TFT_WIDTH 480 - #endif - #ifndef TFT_HEIGHT - #define TFT_HEIGHT 320 - #endif - #if ENABLED(BTT_TFT35_SPI_V1_0) - - /** - * ------ ------ - * BEEPER | 1 2 | LCD-BTN MISO | 1 2 | CLK - * T_MOSI | 3 4 | T_CS LCD-ENCA | 3 4 | TFTCS - * T_CLK | 5 6 T_MISO LCD-ENCB | 5 6 MOSI - * PENIRQ | 7 8 | F_CS RS | 7 8 | RESET - * GND | 9 10 | VCC GND | 9 10 | NC - * ------ ------ - * EXP1 EXP2 - * - * 480x320, 3.5", SPI Display with Rotary Encoder. - * Stock Display for the BIQU B1 SE Series. - * Schematic: https://github.com/bigtreetech/TFT35-SPI/blob/master/v1/Hardware/BTT%20TFT35-SPI%20V1-SCH.pdf - */ + // 480x320, 3.5", SPI Display with Rotary Encoder. + // Stock Display for the BIQU B1 SE. #define TFT_CS_PIN EXP2_04_PIN - #define TFT_DC_PIN EXP2_07_PIN - #define TFT_A0_PIN TFT_DC_PIN + #define TFT_A0_PIN EXP2_07_PIN #define TOUCH_CS_PIN EXP1_04_PIN #define TOUCH_SCK_PIN EXP1_05_PIN @@ -555,22 +530,6 @@ #define TOUCH_MOSI_PIN EXP1_03_PIN #define TOUCH_INT_PIN EXP1_07_PIN - #ifndef TOUCH_CALIBRATION_X - #define TOUCH_CALIBRATION_X 17540 - #endif - #ifndef TOUCH_CALIBRATION_Y - #define TOUCH_CALIBRATION_Y -11388 - #endif - #ifndef TOUCH_OFFSET_X - #define TOUCH_OFFSET_X -21 - #endif - #ifndef TOUCH_OFFSET_Y - #define TOUCH_OFFSET_Y 337 - #endif - #ifndef TOUCH_ORIENTATION - #define TOUCH_ORIENTATION TOUCH_LANDSCAPE - #endif - #elif ENABLED(MKS_TS35_V2_0) /** ------ ------ @@ -583,8 +542,8 @@ * EXP1 EXP2 */ #define TFT_CS_PIN EXP1_07_PIN // SPI1_CS - #define TFT_DC_PIN EXP1_08_PIN // SPI1_RS - #define TFT_A0_PIN TFT_DC_PIN + #define TFT_A0_PIN EXP1_08_PIN // SPI1_RS + #define TFT_DC_PIN TFT_DC_PIN #define TFT_RESET_PIN EXP1_04_PIN @@ -604,22 +563,6 @@ #define TFT_BUFFER_WORDS 14400 - #ifndef TOUCH_CALIBRATION_X - #define TOUCH_CALIBRATION_X -17253 - #endif - #ifndef TOUCH_CALIBRATION_Y - #define TOUCH_CALIBRATION_Y 11579 - #endif - #ifndef TOUCH_OFFSET_X - #define TOUCH_OFFSET_X 514 - #endif - #ifndef TOUCH_OFFSET_Y - #define TOUCH_OFFSET_Y -24 - #endif - #ifndef TOUCH_ORIENTATION - #define TOUCH_ORIENTATION TOUCH_LANDSCAPE - #endif - #endif #endif // HAS_SPI_TFT diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h index 47bcb732ebf2a..22c60df36bfe4 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h @@ -459,13 +459,11 @@ #elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI - #define TFT_SCK_PIN EXP2_02_PIN - #define TFT_MISO_PIN EXP2_01_PIN - #define TFT_MOSI_PIN EXP2_06_PIN - #define BTN_EN1 EXP2_03_PIN #define BTN_EN2 EXP2_05_PIN + #define TFT_DC_PIN TFT_A0_PIN + #ifndef TFT_WIDTH #define TFT_WIDTH 480 #endif @@ -474,24 +472,10 @@ #endif #if ENABLED(BTT_TFT35_SPI_V1_0) - - /** - * ------ ------ - * BEEPER | 1 2 | LCD-BTN MISO | 1 2 | CLK - * T_MOSI | 3 4 | T_CS LCD-ENCA | 3 4 | TFTCS - * T_CLK | 5 6 T_MISO LCD-ENCB | 5 6 MOSI - * PENIRQ | 7 8 | F_CS RS | 7 8 | RESET - * GND | 9 10 | VCC GND | 9 10 | NC - * ------ ------ - * EXP1 EXP2 - * - * 480x320, 3.5", SPI Display with Rotary Encoder. - * Stock Display for the BIQU B1 SE Series. - * Schematic: https://github.com/bigtreetech/TFT35-SPI/blob/master/v1/Hardware/BTT%20TFT35-SPI%20V1-SCH.pdf - */ + // 480x320, 3.5", SPI Display with Rotary Encoder. + // Stock Display for the BIQU B1 SE. #define TFT_CS_PIN EXP2_04_PIN - #define TFT_DC_PIN EXP2_07_PIN - #define TFT_A0_PIN TFT_DC_PIN + #define TFT_A0_PIN EXP2_07_PIN #define TOUCH_CS_PIN EXP1_04_PIN #define TOUCH_SCK_PIN EXP1_05_PIN @@ -527,8 +511,7 @@ * EXP1 EXP2 */ #define TFT_CS_PIN EXP1_07_PIN // SPI1_CS - #define TFT_DC_PIN EXP1_08_PIN // SPI1_RS - #define TFT_A0_PIN TFT_DC_PIN + #define TFT_A0_PIN EXP1_08_PIN // SPI1_RS #define TFT_RESET_PIN EXP1_04_PIN