Skip to content

Commit fa31976

Browse files
lbouelboue
authored
Update ESP32_S3_Touch_LCD_4.3.h
1 parent 61e946a commit fa31976

File tree

1 file changed

+41
-35
lines changed

1 file changed

+41
-35
lines changed

‎src/board/waveshare/ESP32_S3_Touch_LCD_4.3.h

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -44,47 +44,53 @@
4444
#if ESP_PANEL_LCD_BUS_TYPE == ESP_PANEL_BUS_TYPE_RGB
4545

4646
#define ESP_PANEL_LCD_RGB_CLK_HZ (16 * 1000 * 1000)
47-
#define ESP_PANEL_LCD_RGB_HPW (40)
48-
#define ESP_PANEL_LCD_RGB_HBP (40)
49-
#define ESP_PANEL_LCD_RGB_HFP (48)
50-
#define ESP_PANEL_LCD_RGB_VPW (23)
51-
#define ESP_PANEL_LCD_RGB_VBP (32)
52-
#define ESP_PANEL_LCD_RGB_VFP (13)
53-
#define ESP_PANEL_LCD_RGB_PCLK_ACTIVE_NEG (0) // 0: rising edge, 1: falling edge
54-
#define ESP_PANEL_LCD_RGB_DATA_WIDTH (16) // 8 | 16
55-
#define ESP_PANEL_LCD_RGB_PIXEL_BITS (24) // 24 | 16
47+
#define ESP_PANEL_LCD_RGB_HPW (4)
48+
#define ESP_PANEL_LCD_RGB_HBP (8)
49+
#define ESP_PANEL_LCD_RGB_HFP (8)
50+
#define ESP_PANEL_LCD_RGB_VPW (4)
51+
#define ESP_PANEL_LCD_RGB_VBP (8)
52+
#define ESP_PANEL_LCD_RGB_VFP (8)
53+
#define ESP_PANEL_LCD_RGB_PCLK_ACTIVE_NEG (1) // 0: rising edge, 1: falling edge
54+
55+
// | 8-bit RGB888 | 16-bit RGB565 |
56+
// |--------------|---------------|
57+
#define ESP_PANEL_LCD_RGB_DATA_WIDTH (16) // | 8 | 16 |
58+
#define ESP_PANEL_LCD_RGB_PIXEL_BITS (16) // | 24 | 16 |
5659
#define ESP_PANEL_LCD_RGB_FRAME_BUF_NUM (1) // 1/2/3
57-
#define ESP_PANEL_LCD_RGB_BOUNCE_BUF_SIZE (ESP_PANEL_LCD_WIDTH * 10)
58-
// Bounce buffer size in bytes. This function is used to avoid screen drift.
59-
// To enable the bounce buffer, set it to a non-zero value.
60-
// Typically set to `ESP_PANEL_LCD_WIDTH * 10`
60+
#define ESP_PANEL_LCD_RGB_BOUNCE_BUF_SIZE (ESP_PANEL_LCD_WIDTH * 10) // Bounce buffer size in bytes. This function is used to avoid screen drift.
61+
// To enable the bounce buffer, set it to a non-zero value. Typically set to `ESP_PANEL_LCD_WIDTH * 10`
62+
// The size of the Bounce Buffer must satisfy `width_of_lcd * height_of_lcd = size_of_buffer * N`,
63+
// where N is an even number.
6164
#define ESP_PANEL_LCD_RGB_IO_HSYNC (46)
6265
#define ESP_PANEL_LCD_RGB_IO_VSYNC (3)
63-
#define ESP_PANEL_LCD_RGB_IO_DE (5) // -1 if not used
66+
#define ESP_PANEL_LCD_RGB_IO_DE (5) // -1 if not used
6467
#define ESP_PANEL_LCD_RGB_IO_PCLK (7)
6568
#define ESP_PANEL_LCD_RGB_IO_DISP (-1) // -1 if not used
66-
#define ESP_PANEL_LCD_RGB_IO_DATA0 (1)
67-
#define ESP_PANEL_LCD_RGB_IO_DATA1 (2)
68-
#define ESP_PANEL_LCD_RGB_IO_DATA2 (42)
69-
#define ESP_PANEL_LCD_RGB_IO_DATA3 (41)
70-
#define ESP_PANEL_LCD_RGB_IO_DATA4 (40)
71-
#define ESP_PANEL_LCD_RGB_IO_DATA5 (14)
72-
#define ESP_PANEL_LCD_RGB_IO_DATA6 (38)
73-
#define ESP_PANEL_LCD_RGB_IO_DATA7 (18)
69+
70+
// | RGB565 | RGB666 | RGB888 |
71+
// |--------|--------|--------|
72+
#define ESP_PANEL_LCD_RGB_IO_DATA0 (14) // | B0 | B0-1 | B0-3 |
73+
#define ESP_PANEL_LCD_RGB_IO_DATA1 (38) // | B1 | B2 | B4 |
74+
#define ESP_PANEL_LCD_RGB_IO_DATA2 (18) // | B2 | B3 | B5 |
75+
#define ESP_PANEL_LCD_RGB_IO_DATA3 (17) // | B3 | B4 | B6 |
76+
#define ESP_PANEL_LCD_RGB_IO_DATA4 (10) // | B4 | B5 | B7 |
77+
#define ESP_PANEL_LCD_RGB_IO_DATA5 (39) // | G0 | G0 | G0-2 |
78+
#define ESP_PANEL_LCD_RGB_IO_DATA6 (0) // | G1 | G1 | G3 |
79+
#define ESP_PANEL_LCD_RGB_IO_DATA7 (45) // | G2 | G2 | G4 |
7480
#if ESP_PANEL_LCD_RGB_DATA_WIDTH > 8
75-
#define ESP_PANEL_LCD_RGB_IO_DATA8 (17)
76-
#define ESP_PANEL_LCD_RGB_IO_DATA9 (10)
77-
#define ESP_PANEL_LCD_RGB_IO_DATA10 (39)
78-
#define ESP_PANEL_LCD_RGB_IO_DATA11 (0)
79-
#define ESP_PANEL_LCD_RGB_IO_DATA12 (45)
80-
#define ESP_PANEL_LCD_RGB_IO_DATA13 (48)
81-
#define ESP_PANEL_LCD_RGB_IO_DATA14 (47)
82-
#define ESP_PANEL_LCD_RGB_IO_DATA15 (21)
81+
#define ESP_PANEL_LCD_RGB_IO_DATA8 (48) // | G3 | G3 | G5 |
82+
#define ESP_PANEL_LCD_RGB_IO_DATA9 (47) // | G4 | G4 | G6 |
83+
#define ESP_PANEL_LCD_RGB_IO_DATA10 (21) // | G5 | G5 | G7 |
84+
#define ESP_PANEL_LCD_RGB_IO_DATA11 (1) // | R0 | R0-1 | R0-3 |
85+
#define ESP_PANEL_LCD_RGB_IO_DATA12 (2) // | R1 | R2 | R4 |
86+
#define ESP_PANEL_LCD_RGB_IO_DATA13 (42) // | R2 | R3 | R5 |
87+
#define ESP_PANEL_LCD_RGB_IO_DATA14 (41) // | R3 | R4 | R6 |
88+
#define ESP_PANEL_LCD_RGB_IO_DATA15 (40) // | R4 | R5 | R7 |
8389
#endif
8490
#if !ESP_PANEL_LCD_BUS_SKIP_INIT_HOST
85-
#define ESP_PANEL_LCD_3WIRE_SPI_IO_CS (39)
86-
#define ESP_PANEL_LCD_3WIRE_SPI_IO_SCK (48)
87-
#define ESP_PANEL_LCD_3WIRE_SPI_IO_SDA (47)
91+
#define ESP_PANEL_LCD_3WIRE_SPI_IO_CS (0)
92+
#define ESP_PANEL_LCD_3WIRE_SPI_IO_SCK (1)
93+
#define ESP_PANEL_LCD_3WIRE_SPI_IO_SDA (2)
8894
#define ESP_PANEL_LCD_3WIRE_SPI_CS_USE_EXPNADER (0) // 0/1
8995
#define ESP_PANEL_LCD_3WIRE_SPI_SCL_USE_EXPNADER (0) // 0/1
9096
#define ESP_PANEL_LCD_3WIRE_SPI_SDA_USE_EXPNADER (0) // 0/1
@@ -175,7 +181,7 @@
175181
#if ESP_PANEL_TOUCH_BUS_TYPE == ESP_PANEL_BUS_TYPE_I2C
176182

177183
#define ESP_PANEL_TOUCH_BUS_HOST_ID (0) // Typically set to 0
178-
#define ESP_PANEL_TOUCH_I2C_ADDRESS (0) // Typically set to 0 to use default address
184+
#define ESP_PANEL_TOUCH_I2C_ADDRESS (0x14) // For GT911, there are two addresses: 0x5D(default) and 0x14
179185
#if !ESP_PANEL_TOUCH_BUS_SKIP_INIT_HOST
180186
#define ESP_PANEL_TOUCH_I2C_CLK_HZ (400 * 1000)
181187
// Typically set to 400K
@@ -222,7 +228,7 @@
222228
///////////////////////////// Please update the following macros to configure the IO expander //////////////////////////
223229
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
224230
/* Set to 0 if not using IO Expander */
225-
#define ESP_PANEL_USE_EXPANDER (1) // 0/1
231+
#define ESP_PANEL_USE_EXPANDER (0) // 0/1
226232
#if ESP_PANEL_USE_EXPANDER
227233
/**
228234
* IO expander name.

0 commit comments

Comments
 (0)