Skip to content

Commit 1aad0b4

Browse files
Lzw655Lzw655
committed
feat: update
1 parent 2824f8a commit 1aad0b4

File tree

7 files changed

+302
-195
lines changed

7 files changed

+302
-195
lines changed

‎examples/arduino/drivers/lcd_3wire_spi_rgb/README.md

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,33 @@ The example demonstrates how to develop different model LCDs with "3-wire SPI +
1919

2020
```
2121
...
22-
3-wire SPI + RGB LCD example start
23-
Initialize backlight and turn it off
24-
Create 3-wire SPI + RGB LCD bus
25-
Create LCD device
22+
Initializing backlight and turn it off
23+
Initializing "3-wire SPI + RGB" LCD without config
24+
[I][Panel][esp_lcd_st7701.c:0026](esp_lcd_new_panel_st7701): version: 1.1.1
2625
Draw color bar from top left to bottom right, the order is B - G - R
26+
LCD draw finish callback
27+
LCD draw finish callback
28+
LCD draw finish callback
29+
LCD draw finish callback
30+
LCD draw finish callback
31+
LCD draw finish callback
32+
LCD draw finish callback
33+
LCD draw finish callback
34+
LCD draw finish callback
35+
LCD draw finish callback
36+
LCD draw finish callback
37+
LCD draw finish callback
38+
LCD draw finish callback
39+
LCD draw finish callback
40+
LCD draw finish callback
41+
LCD draw finish callback
2742
Turn on the backlight
28-
3-wire SPI + RGB LCD example end
29-
RGB refresh rate: 0
30-
RGB refresh rate: 60
31-
RGB refresh rate: 60
32-
RGB refresh rate: 60
43+
IDLE loop
44+
LCD FPS: 98
45+
LCD FPS: 98
46+
IDLE loop
47+
LCD FPS: 98
48+
LCD FPS: 98
3349
...
3450
```
3551

‎examples/arduino/drivers/lcd_3wire_spi_rgb/lcd_3wire_spi_rgb.ino

Lines changed: 186 additions & 98 deletions
Large diffs are not rendered by default.

‎examples/arduino/drivers/lcd_mipi_dsi/MIPI_DSI.ino

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ const esp_panel_lcd_vendor_init_cmd_t lcd_init_cmd[] = {
127127
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
128128
//////////////////// Please update the following configuration according to your board spec ////////////////////////////
129129
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
130-
#define EXAMPLE_LCD_PIN_NUM_RST (27) // Set to -1 if not used
131-
#define EXAMPLE_LCD_PIN_NUM_BK_LIGHT (26) // Set to -1 if not used
132-
#define EXAMPLE_LCD_BK_LIGHT_ON_LEVEL (1)
133-
#define EXAMPLE_LCD_BK_LIGHT_OFF_LEVEL !EXAMPLE_LCD_BK_LIGHT_ON_LEVEL
130+
#define EXAMPLE_LCD_RST_IO (27) // Set to -1 if not used
131+
#define EXAMPLE_LCD_BL_IO (26) // Set to -1 if not used
132+
#define EXAMPLE_LCD_BL_ON_LEVEL (1)
133+
#define EXAMPLE_LCD_BL_OFF_LEVEL !EXAMPLE_LCD_BL_ON_LEVEL
134134

135135
/* Enable or disable pattern test */
136136
#define EXAMPLE_ENABLE_PATTERN_EXAMPLE (1)
@@ -183,10 +183,10 @@ void setup()
183183
Serial.begin(115200);
184184
Serial.println("MIPI-DSI LCD example start");
185185

186-
#if EXAMPLE_LCD_PIN_NUM_BK_LIGHT >= 0
186+
#if EXAMPLE_LCD_BL_IO >= 0
187187
Serial.println("Initialize backlight control pin and turn it on");
188188
ESP_PanelBacklight *backlight = new ESP_PanelBacklight(
189-
EXAMPLE_LCD_PIN_NUM_BK_LIGHT, EXAMPLE_LCD_BK_LIGHT_ON_LEVEL, true
189+
EXAMPLE_LCD_BL_IO, EXAMPLE_LCD_BL_ON_LEVEL, true
190190
);
191191
backlight->begin();
192192
backlight->on();
@@ -203,7 +203,7 @@ void setup()
203203
panel_bus->begin();
204204

205205
Serial.println("Create LCD device");
206-
ESP_PanelLcd *lcd = new EXAMPLE_LCD_CLASS(EXAMPLE_LCD_NAME, panel_bus, EXAMPLE_LCD_COLOR_BITS, EXAMPLE_LCD_PIN_NUM_RST);
206+
ESP_PanelLcd *lcd = new EXAMPLE_LCD_CLASS(EXAMPLE_LCD_NAME, panel_bus, EXAMPLE_LCD_COLOR_BITS, EXAMPLE_LCD_RST_IO);
207207
#if EXAMPLE_LCD_USE_EXTERNAL_CMD
208208
// Configure external initialization commands, should called before `init()`
209209
lcd->configVendorCommands(lcd_init_cmd, sizeof(lcd_init_cmd)/sizeof(lcd_init_cmd[0]));

‎examples/arduino/drivers/lcd_qspi/lcd_qspi.ino

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@ const esp_panel_lcd_vendor_init_cmd_t lcd_init_cmd[] = {
103103
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
104104
//////////////////// Please update the following configuration according to your board spec ////////////////////////////
105105
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
106-
#define EXAMPLE_LCD_PIN_NUM_SPI_CS (9)
107-
#define EXAMPLE_LCD_PIN_NUM_SPI_SCK (10)
108-
#define EXAMPLE_LCD_PIN_NUM_SPI_DATA0 (11)
109-
#define EXAMPLE_LCD_PIN_NUM_SPI_DATA1 (12)
110-
#define EXAMPLE_LCD_PIN_NUM_SPI_DATA2 (13)
111-
#define EXAMPLE_LCD_PIN_NUM_SPI_DATA3 (14)
112-
#define EXAMPLE_LCD_PIN_NUM_RST (3) // Set to -1 if not used
113-
#define EXAMPLE_LCD_PIN_NUM_BK_LIGHT (-1) // Set to -1 if not used
114-
#define EXAMPLE_LCD_BK_LIGHT_ON_LEVEL (1)
115-
#define EXAMPLE_LCD_BK_LIGHT_OFF_LEVEL !EXAMPLE_LCD_BK_LIGHT_ON_LEVEL
106+
#define EXAMPLE_LCD_SPI_CS (9)
107+
#define EXAMPLE_LCD_SPI_SCK (10)
108+
#define EXAMPLE_LCD_SPI_DATA0 (11)
109+
#define EXAMPLE_LCD_SPI_DATA1 (12)
110+
#define EXAMPLE_LCD_SPI_DATA2 (13)
111+
#define EXAMPLE_LCD_SPI_DATA3 (14)
112+
#define EXAMPLE_LCD_RST_IO (3) // Set to -1 if not used
113+
#define EXAMPLE_LCD_BL_IO (-1) // Set to -1 if not used
114+
#define EXAMPLE_LCD_BL_ON_LEVEL (1)
115+
#define EXAMPLE_LCD_BL_OFF_LEVEL !EXAMPLE_LCD_BL_ON_LEVEL
116116

117117
/* Enable or disable the attachment of a callback function that is called after each bitmap drawing is completed */
118118
#define EXAMPLE_ENABLE_ATTACH_CALLBACK (1)
@@ -134,25 +134,25 @@ void setup()
134134
Serial.begin(115200);
135135
Serial.println("QSPI LCD example start");
136136

137-
#if EXAMPLE_LCD_PIN_NUM_BK_LIGHT >= 0
137+
#if EXAMPLE_LCD_BL_IO >= 0
138138
Serial.println("Initialize backlight control pin and turn it off");
139139
ESP_PanelBacklight *backlight = new ESP_PanelBacklight(
140-
EXAMPLE_LCD_PIN_NUM_BK_LIGHT, EXAMPLE_LCD_BK_LIGHT_ON_LEVEL, true
140+
EXAMPLE_LCD_BL_IO, EXAMPLE_LCD_BL_ON_LEVEL, true
141141
);
142142
backlight->begin();
143143
backlight->off();
144144
#endif
145145

146146
Serial.println("Create QSPI LCD bus");
147147
ESP_PanelBusQSPI *panel_bus = new ESP_PanelBusQSPI(
148-
EXAMPLE_LCD_PIN_NUM_SPI_CS, EXAMPLE_LCD_PIN_NUM_SPI_SCK, EXAMPLE_LCD_PIN_NUM_SPI_DATA0,
149-
EXAMPLE_LCD_PIN_NUM_SPI_DATA1, EXAMPLE_LCD_PIN_NUM_SPI_DATA2, EXAMPLE_LCD_PIN_NUM_SPI_DATA3
148+
EXAMPLE_LCD_SPI_CS, EXAMPLE_LCD_SPI_SCK, EXAMPLE_LCD_SPI_DATA0,
149+
EXAMPLE_LCD_SPI_DATA1, EXAMPLE_LCD_SPI_DATA2, EXAMPLE_LCD_SPI_DATA3
150150
);
151151
panel_bus->configQspiFreqHz(EXAMPLE_LCD_SPI_FREQ_HZ);
152152
panel_bus->begin();
153153

154154
Serial.println("Create LCD device");
155-
ESP_PanelLcd *lcd = new EXAMPLE_LCD_CLASS(EXAMPLE_LCD_NAME, panel_bus, EXAMPLE_LCD_COLOR_BITS, EXAMPLE_LCD_PIN_NUM_RST);
155+
ESP_PanelLcd *lcd = new EXAMPLE_LCD_CLASS(EXAMPLE_LCD_NAME, panel_bus, EXAMPLE_LCD_COLOR_BITS, EXAMPLE_LCD_RST_IO);
156156
#if EXAMPLE_LCD_USE_EXTERNAL_CMD
157157
// Configure external initialization commands, should called before `init()`
158158
lcd->configVendorCommands(lcd_init_cmd, sizeof(lcd_init_cmd)/sizeof(lcd_init_cmd[0]));
@@ -170,7 +170,7 @@ void setup()
170170
/* Users can refer to the implementation within `colorBardTest()` to draw patterns on the LCD */
171171
lcd->colorBarTest(EXAMPLE_LCD_WIDTH, EXAMPLE_LCD_HEIGHT);
172172

173-
#if EXAMPLE_LCD_PIN_NUM_BK_LIGHT >= 0
173+
#if EXAMPLE_LCD_BL_IO >= 0
174174
Serial.println("Turn on the backlight");
175175
backlight->on();
176176
#endif

‎examples/arduino/drivers/lcd_rgb/RGB.ino

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -67,35 +67,35 @@
6767
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
6868
//////////////////// Please update the following configuration according to your board spec ////////////////////////////
6969
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
70-
#define EXAMPLE_LCD_PIN_NUM_RGB_DISP (-1)
71-
#define EXAMPLE_LCD_PIN_NUM_RGB_VSYNC (3)
72-
#define EXAMPLE_LCD_PIN_NUM_RGB_HSYNC (46)
73-
#define EXAMPLE_LCD_PIN_NUM_RGB_DE (17)
74-
#define EXAMPLE_LCD_PIN_NUM_RGB_PCLK (9)
70+
#define EXAMPLE_LCD_RGB_IO_DISP (-1)
71+
#define EXAMPLE_LCD_RGB_IO_VSYNC (3)
72+
#define EXAMPLE_LCD_RGB_IO_HSYNC (46)
73+
#define EXAMPLE_LCD_RGB_IO_DE (17)
74+
#define EXAMPLE_LCD_RGB_IO_PCLK (9)
7575
// | RGB565 | RGB666 | RGB888 |
7676
// |--------|--------|--------|
77-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA0 (10) // | B0 | B0-1 | B0-3 |
78-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA1 (11) // | B1 | B2 | B4 |
79-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA2 (12) // | B2 | B3 | B5 |
80-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA3 (13) // | B3 | B4 | B6 |
81-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA4 (14) // | B4 | B5 | B7 |
82-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA5 (21) // | G0 | G0 | G0-2 |
83-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA6 (8) // | G1 | G1 | G3 |
84-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA7 (18) // | G2 | G2 | G4 |
77+
#define EXAMPLE_LCD_RGB_DATA0 (10) // | B0 | B0-1 | B0-3 |
78+
#define EXAMPLE_LCD_RGB_DATA1 (11) // | B1 | B2 | B4 |
79+
#define EXAMPLE_LCD_RGB_DATA2 (12) // | B2 | B3 | B5 |
80+
#define EXAMPLE_LCD_RGB_DATA3 (13) // | B3 | B4 | B6 |
81+
#define EXAMPLE_LCD_RGB_DATA4 (14) // | B4 | B5 | B7 |
82+
#define EXAMPLE_LCD_RGB_DATA5 (21) // | G0 | G0 | G0-2 |
83+
#define EXAMPLE_LCD_RGB_DATA6 (8) // | G1 | G1 | G3 |
84+
#define EXAMPLE_LCD_RGB_DATA7 (18) // | G2 | G2 | G4 |
8585
#if EXAMPLE_LCD_RGB_DATA_WIDTH > 8
86-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA8 (45) // | G3 | G3 | G5 |
87-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA9 (38) // | G4 | G4 | G6 |
88-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA10 (39) // | G5 | G5 | G7 |
89-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA11 (40) // | R0 | R0-1 | R0-3 |
90-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA12 (41) // | R1 | R2 | R4 |
91-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA13 (42) // | R2 | R3 | R5 |
92-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA14 (2) // | R3 | R4 | R6 |
93-
#define EXAMPLE_LCD_PIN_NUM_RGB_DATA15 (1) // | R4 | R5 | R7 |
86+
#define EXAMPLE_LCD_RGB_DATA8 (45) // | G3 | G3 | G5 |
87+
#define EXAMPLE_LCD_RGB_DATA9 (38) // | G4 | G4 | G6 |
88+
#define EXAMPLE_LCD_RGB_DATA10 (39) // | G5 | G5 | G7 |
89+
#define EXAMPLE_LCD_RGB_DATA11 (40) // | R0 | R0-1 | R0-3 |
90+
#define EXAMPLE_LCD_RGB_DATA12 (41) // | R1 | R2 | R4 |
91+
#define EXAMPLE_LCD_RGB_DATA13 (42) // | R2 | R3 | R5 |
92+
#define EXAMPLE_LCD_RGB_DATA14 (2) // | R3 | R4 | R6 |
93+
#define EXAMPLE_LCD_RGB_DATA15 (1) // | R4 | R5 | R7 |
9494
#endif
95-
#define EXAMPLE_LCD_PIN_NUM_RST (-1) // Set to -1 if not used
96-
#define EXAMPLE_LCD_PIN_NUM_BK_LIGHT (-1) // Set to -1 if not used
97-
#define EXAMPLE_LCD_BK_LIGHT_ON_LEVEL (1)
98-
#define EXAMPLE_LCD_BK_LIGHT_OFF_LEVEL !EXAMPLE_LCD_BK_LIGHT_ON_LEVEL
95+
#define EXAMPLE_LCD_RST_IO (-1) // Set to -1 if not used
96+
#define EXAMPLE_LCD_BL_IO (-1) // Set to -1 if not used
97+
#define EXAMPLE_LCD_BL_ON_LEVEL (1)
98+
#define EXAMPLE_LCD_BL_OFF_LEVEL !EXAMPLE_LCD_BL_ON_LEVEL
9999

100100
/* Enable or disable printing RGB refresh rate */
101101
#define EXAMPLE_ENABLE_PRINT_LCD_FPS (1)
@@ -135,10 +135,10 @@ void setup()
135135
Serial.begin(115200);
136136
Serial.println("RGB LCD example start");
137137

138-
#if EXAMPLE_LCD_PIN_NUM_BK_LIGHT >= 0
138+
#if EXAMPLE_LCD_BL_IO >= 0
139139
Serial.println("Initialize backlight control pin and turn it off");
140140
ESP_PanelBacklight *backlight = new ESP_PanelBacklight(
141-
EXAMPLE_LCD_PIN_NUM_BK_LIGHT, EXAMPLE_LCD_BK_LIGHT_ON_LEVEL, true
141+
EXAMPLE_LCD_BL_IO, EXAMPLE_LCD_BL_ON_LEVEL, true
142142
);
143143
backlight->begin();
144144
backlight->off();
@@ -148,20 +148,20 @@ void setup()
148148
ESP_PanelBusRGB *panel_bus = new ESP_PanelBusRGB(
149149
#if EXAMPLE_LCD_RGB_DATA_WIDTH == 8
150150
EXAMPLE_LCD_WIDTH, EXAMPLE_LCD_HEIGHT,
151-
EXAMPLE_LCD_PIN_NUM_RGB_DATA0, EXAMPLE_LCD_PIN_NUM_RGB_DATA1, EXAMPLE_LCD_PIN_NUM_RGB_DATA2,
152-
EXAMPLE_LCD_PIN_NUM_RGB_DATA3, EXAMPLE_LCD_PIN_NUM_RGB_DATA4, EXAMPLE_LCD_PIN_NUM_RGB_DATA5,
153-
EXAMPLE_LCD_PIN_NUM_RGB_DATA6, EXAMPLE_LCD_PIN_NUM_RGB_DATA7, EXAMPLE_LCD_PIN_NUM_RGB_HSYNC,
154-
EXAMPLE_LCD_PIN_NUM_RGB_VSYNC, EXAMPLE_LCD_PIN_NUM_RGB_PCLK, EXAMPLE_LCD_PIN_NUM_RGB_DE,
155-
EXAMPLE_LCD_PIN_NUM_RGB_DISP
151+
EXAMPLE_LCD_RGB_DATA0, EXAMPLE_LCD_RGB_DATA1, EXAMPLE_LCD_RGB_DATA2,
152+
EXAMPLE_LCD_RGB_DATA3, EXAMPLE_LCD_RGB_DATA4, EXAMPLE_LCD_RGB_DATA5,
153+
EXAMPLE_LCD_RGB_DATA6, EXAMPLE_LCD_RGB_DATA7, EXAMPLE_LCD_RGB_IO_HSYNC,
154+
EXAMPLE_LCD_RGB_IO_VSYNC, EXAMPLE_LCD_RGB_IO_PCLK, EXAMPLE_LCD_RGB_IO_DE,
155+
EXAMPLE_LCD_RGB_IO_DISP
156156
#elif EXAMPLE_LCD_RGB_DATA_WIDTH == 16
157-
EXAMPLE_LCD_WIDTH, EXAMPLE_LCD_HEIGHT, EXAMPLE_LCD_PIN_NUM_RGB_DATA0, EXAMPLE_LCD_PIN_NUM_RGB_DATA1,
158-
EXAMPLE_LCD_PIN_NUM_RGB_DATA2, EXAMPLE_LCD_PIN_NUM_RGB_DATA3, EXAMPLE_LCD_PIN_NUM_RGB_DATA4,
159-
EXAMPLE_LCD_PIN_NUM_RGB_DATA5, EXAMPLE_LCD_PIN_NUM_RGB_DATA6, EXAMPLE_LCD_PIN_NUM_RGB_DATA7,
160-
EXAMPLE_LCD_PIN_NUM_RGB_DATA8, EXAMPLE_LCD_PIN_NUM_RGB_DATA9, EXAMPLE_LCD_PIN_NUM_RGB_DATA10,
161-
EXAMPLE_LCD_PIN_NUM_RGB_DATA11, EXAMPLE_LCD_PIN_NUM_RGB_DATA12, EXAMPLE_LCD_PIN_NUM_RGB_DATA13,
162-
EXAMPLE_LCD_PIN_NUM_RGB_DATA14, EXAMPLE_LCD_PIN_NUM_RGB_DATA15, EXAMPLE_LCD_PIN_NUM_RGB_HSYNC,
163-
EXAMPLE_LCD_PIN_NUM_RGB_VSYNC, EXAMPLE_LCD_PIN_NUM_RGB_PCLK, EXAMPLE_LCD_PIN_NUM_RGB_DE,
164-
EXAMPLE_LCD_PIN_NUM_RGB_DISP
157+
EXAMPLE_LCD_WIDTH, EXAMPLE_LCD_HEIGHT, EXAMPLE_LCD_RGB_DATA0, EXAMPLE_LCD_RGB_DATA1,
158+
EXAMPLE_LCD_RGB_DATA2, EXAMPLE_LCD_RGB_DATA3, EXAMPLE_LCD_RGB_DATA4,
159+
EXAMPLE_LCD_RGB_DATA5, EXAMPLE_LCD_RGB_DATA6, EXAMPLE_LCD_RGB_DATA7,
160+
EXAMPLE_LCD_RGB_DATA8, EXAMPLE_LCD_RGB_DATA9, EXAMPLE_LCD_RGB_DATA10,
161+
EXAMPLE_LCD_RGB_DATA11, EXAMPLE_LCD_RGB_DATA12, EXAMPLE_LCD_RGB_DATA13,
162+
EXAMPLE_LCD_RGB_DATA14, EXAMPLE_LCD_RGB_DATA15, EXAMPLE_LCD_RGB_IO_HSYNC,
163+
EXAMPLE_LCD_RGB_IO_VSYNC, EXAMPLE_LCD_RGB_IO_PCLK, EXAMPLE_LCD_RGB_IO_DE,
164+
EXAMPLE_LCD_RGB_IO_DISP
165165
#endif
166166
);
167167
panel_bus->configRgbTimingFreqHz(EXAMPLE_LCD_RGB_TIMING_FREQ_HZ);
@@ -173,7 +173,7 @@ void setup()
173173
panel_bus->begin();
174174

175175
Serial.println("Create LCD device");
176-
ESP_PanelLcd *lcd = new EXAMPLE_LCD_CLASS(EXAMPLE_LCD_NAME, panel_bus, EXAMPLE_LCD_COLOR_BITS, EXAMPLE_LCD_PIN_NUM_RST);
176+
ESP_PanelLcd *lcd = new EXAMPLE_LCD_CLASS(EXAMPLE_LCD_NAME, panel_bus, EXAMPLE_LCD_COLOR_BITS, EXAMPLE_LCD_RST_IO);
177177
lcd->init();
178178
lcd->reset();
179179
lcd->begin();
@@ -187,7 +187,7 @@ void setup()
187187
/* Users can refer to the implementation within `colorBardTest()` to draw patterns on the LCD */
188188
lcd->colorBarTest(EXAMPLE_LCD_WIDTH, EXAMPLE_LCD_HEIGHT);
189189

190-
#if EXAMPLE_LCD_PIN_NUM_BK_LIGHT >= 0
190+
#if EXAMPLE_LCD_BL_IO >= 0
191191
Serial.println("Turn on the backlight");
192192
backlight->on();
193193
#endif

‎examples/arduino/drivers/lcd_spi/SPI.ino

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ const esp_panel_lcd_vendor_init_cmd_t lcd_init_cmd[] = {
116116
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
117117
//////////////////// Please update the following configuration according to your board spec ////////////////////////////
118118
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
119-
#define EXAMPLE_LCD_PIN_NUM_SPI_CS (5)
120-
#define EXAMPLE_LCD_PIN_NUM_SPI_DC (4)
121-
#define EXAMPLE_LCD_PIN_NUM_SPI_SCK (7)
122-
#define EXAMPLE_LCD_PIN_NUM_SPI_SDA (6)
123-
#define EXAMPLE_LCD_PIN_NUM_SPI_SDO (-1)
124-
#define EXAMPLE_LCD_PIN_NUM_RST (48) // Set to -1 if not used
125-
#define EXAMPLE_LCD_PIN_NUM_BK_LIGHT (47) // Set to -1 if not used
126-
#define EXAMPLE_LCD_BK_LIGHT_ON_LEVEL (1)
127-
#define EXAMPLE_LCD_BK_LIGHT_OFF_LEVEL !EXAMPLE_LCD_BK_LIGHT_ON_LEVEL
119+
#define EXAMPLE_LCD_SPI_CS (5)
120+
#define EXAMPLE_LCD_SPI_DC (4)
121+
#define EXAMPLE_LCD_SPI_SCK (7)
122+
#define EXAMPLE_LCD_SPI_SDA (6)
123+
#define EXAMPLE_LCD_SPI_SDO (-1)
124+
#define EXAMPLE_LCD_RST_IO (48) // Set to -1 if not used
125+
#define EXAMPLE_LCD_BL_IO (47) // Set to -1 if not used
126+
#define EXAMPLE_LCD_BL_ON_LEVEL (1)
127+
#define EXAMPLE_LCD_BL_OFF_LEVEL !EXAMPLE_LCD_BL_ON_LEVEL
128128

129129
/* Enable or disable the attachment of a callback function that is called after each bitmap drawing is completed */
130130
#define EXAMPLE_ENABLE_ATTACH_CALLBACK (1)
@@ -146,22 +146,22 @@ void setup()
146146
Serial.begin(115200);
147147
Serial.println("SPI LCD example start");
148148

149-
#if EXAMPLE_LCD_PIN_NUM_BK_LIGHT >= 0
149+
#if EXAMPLE_LCD_BL_IO >= 0
150150
Serial.println("Initialize backlight control pin and turn it off");
151-
ESP_PanelBacklight *backlight = new ESP_PanelBacklight(EXAMPLE_LCD_PIN_NUM_BK_LIGHT, EXAMPLE_LCD_BK_LIGHT_ON_LEVEL, true);
151+
ESP_PanelBacklight *backlight = new ESP_PanelBacklight(EXAMPLE_LCD_BL_IO, EXAMPLE_LCD_BL_ON_LEVEL, true);
152152
backlight->begin();
153153
backlight->off();
154154
#endif
155155

156156
Serial.println("Create SPI LCD bus");
157-
ESP_PanelBusSPI *panel_bus = new ESP_PanelBusSPI(EXAMPLE_LCD_PIN_NUM_SPI_CS, EXAMPLE_LCD_PIN_NUM_SPI_DC,
158-
EXAMPLE_LCD_PIN_NUM_SPI_SCK, EXAMPLE_LCD_PIN_NUM_SPI_SDA,
159-
EXAMPLE_LCD_PIN_NUM_SPI_SDO);
157+
ESP_PanelBusSPI *panel_bus = new ESP_PanelBusSPI(EXAMPLE_LCD_SPI_CS, EXAMPLE_LCD_SPI_DC,
158+
EXAMPLE_LCD_SPI_SCK, EXAMPLE_LCD_SPI_SDA,
159+
EXAMPLE_LCD_SPI_SDO);
160160
panel_bus->configSpiFreqHz(EXAMPLE_LCD_SPI_FREQ_HZ);
161161
panel_bus->begin();
162162

163163
Serial.println("Create LCD device");
164-
ESP_PanelLcd *lcd = new EXAMPLE_LCD_CLASS(EXAMPLE_LCD_NAME, panel_bus, EXAMPLE_LCD_COLOR_BITS, EXAMPLE_LCD_PIN_NUM_RST);
164+
ESP_PanelLcd *lcd = new EXAMPLE_LCD_CLASS(EXAMPLE_LCD_NAME, panel_bus, EXAMPLE_LCD_COLOR_BITS, EXAMPLE_LCD_RST_IO);
165165
#if EXAMPLE_LCD_USE_EXTERNAL_CMD
166166
// Configure external initialization commands, should called before `init()`
167167
lcd->configVendorCommands(lcd_init_cmd, sizeof(lcd_init_cmd)/sizeof(lcd_init_cmd[0]));
@@ -182,7 +182,7 @@ void setup()
182182
Serial.println("Draw color bar from top left to bottom right, the order is B - G - R");
183183
lcd->colorBarTest(EXAMPLE_LCD_WIDTH, EXAMPLE_LCD_HEIGHT);
184184

185-
#if EXAMPLE_LCD_PIN_NUM_BK_LIGHT >= 0
185+
#if EXAMPLE_LCD_BL_IO >= 0
186186
Serial.println("Turn on the backlight");
187187
backlight->on();
188188
#endif

0 commit comments

Comments
 (0)