Skip to content

Commit 62479b2

Browse files
leeeboleeebo
committed
Merge branch 'contrib/github_pr_440_v2.0' into 'release/v2.0'
fix(lcd): Fixed the initialization description errors for multiple (GitHub PR) (v2.0) See merge request ae_group/esp-iot-solution!1182
2 parents 0411b16 + 31fae1e commit 62479b2

File tree

6 files changed

+53
-53
lines changed

6 files changed

+53
-53
lines changed

‎components/display/lcd/esp_lcd_axs15231b/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
2525

2626
```c
2727
ESP_LOGI(TAG, "Initialize SPI bus");
28-
const spi_bus_config_t bus_config = AXS15231B_PANEL_BUS_SPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
28+
const spi_bus_config_t buscfg = AXS15231B_PANEL_BUS_SPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
2929
EXAMPLE_PIN_NUM_LCD_DATA0,
3030
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
31-
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &bus_config, SPI_DMA_CH_AUTO));
31+
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &buscfg, SPI_DMA_CH_AUTO));
3232

3333
ESP_LOGI(TAG, "Install panel IO");
3434
esp_lcd_panel_io_handle_t io_handle = NULL;
@@ -74,12 +74,12 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
7474
7575
```c
7676
ESP_LOGI(TAG, "Initialize QSPI bus");
77-
const esp_lcd_panel_io_spi_config_t io_config = AXS15231B_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
78-
EXAMPLE_PIN_NUM_LCD_DATA0,
79-
EXAMPLE_PIN_NUM_LCD_DATA1,
80-
EXAMPLE_PIN_NUM_LCD_DATA2,
81-
EXAMPLE_PIN_NUM_LCD_DATA3,
82-
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
77+
const spi_bus_config_t buscfg = AXS15231B_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
78+
EXAMPLE_PIN_NUM_LCD_DATA0,
79+
EXAMPLE_PIN_NUM_LCD_DATA1,
80+
EXAMPLE_PIN_NUM_LCD_DATA2,
81+
EXAMPLE_PIN_NUM_LCD_DATA3,
82+
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
8383
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &buscfg, SPI_DMA_CH_AUTO));
8484
8585
ESP_LOGI(TAG, "Install panel IO");
@@ -102,7 +102,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
102102
103103
ESP_LOGI(TAG, "Install AXS15231B panel driver");
104104
esp_lcd_panel_handle_t panel_handle = NULL;
105-
axs15231b_vendor_config_t vendor_config = {
105+
const axs15231b_vendor_config_t vendor_config = {
106106
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
107107
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(axs15231b_lcd_init_cmd_t),
108108
.flags = {

‎components/display/lcd/esp_lcd_gc9b71/README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
5252

5353
ESP_LOGI(TAG, "Install GC9B71 panel driver");
5454
esp_lcd_panel_handle_t panel_handle = NULL;
55-
gc9b71_vendor_config_t vendor_config = {
55+
const gc9b71_vendor_config_t vendor_config = {
5656
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
5757
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(gc9b71_lcd_init_cmd_t),
5858
.flags = {
@@ -75,12 +75,12 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
7575
7676
```c
7777
ESP_LOGI(TAG, "Initialize QSPI bus");
78-
const esp_lcd_panel_io_spi_config_t io_config = GC9B71_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
79-
EXAMPLE_PIN_NUM_LCD_DATA0,
80-
EXAMPLE_PIN_NUM_LCD_DATA1,
81-
EXAMPLE_PIN_NUM_LCD_DATA2,
82-
EXAMPLE_PIN_NUM_LCD_DATA3,
83-
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
78+
const spi_bus_config_t buscfg = GC9B71_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
79+
EXAMPLE_PIN_NUM_LCD_DATA0,
80+
EXAMPLE_PIN_NUM_LCD_DATA1,
81+
EXAMPLE_PIN_NUM_LCD_DATA2,
82+
EXAMPLE_PIN_NUM_LCD_DATA3,
83+
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
8484
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &buscfg, SPI_DMA_CH_AUTO));
8585
8686
ESP_LOGI(TAG, "Install panel IO");
@@ -103,7 +103,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
103103
104104
ESP_LOGI(TAG, "Install GC9B71 panel driver");
105105
esp_lcd_panel_handle_t panel_handle = NULL;
106-
gc9b71_vendor_config_t vendor_config = {
106+
const gc9b71_vendor_config_t vendor_config = {
107107
// .init_cmds = lcd_init_cmds, // Only useful when `use_external_init_cmds` is set to 1
108108
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(gc9b71_lcd_init_cmd_t),
109109
.flags = {

‎components/display/lcd/esp_lcd_sh8601/README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
2424

2525
```c
2626
ESP_LOGI(TAG, "Initialize SPI bus");
27-
const esp_lcd_panel_io_spi_config_t io_config = SH8601_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
28-
EXAMPLE_PIN_NUM_LCD_DATA0,
29-
EXAMPLE_PIN_NUM_LCD_DATA1,
30-
EXAMPLE_PIN_NUM_LCD_DATA2,
31-
EXAMPLE_PIN_NUM_LCD_DATA3,
32-
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
33-
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &bus_config, SPI_DMA_CH_AUTO));
27+
const spi_bus_config_t buscfg = SH8601_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
28+
EXAMPLE_PIN_NUM_LCD_DATA0,
29+
EXAMPLE_PIN_NUM_LCD_DATA1,
30+
EXAMPLE_PIN_NUM_LCD_DATA2,
31+
EXAMPLE_PIN_NUM_LCD_DATA3,
32+
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
33+
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &buscfg, SPI_DMA_CH_AUTO));
3434

3535
ESP_LOGI(TAG, "Install panel IO");
3636
esp_lcd_panel_io_handle_t io_handle = NULL;
@@ -53,7 +53,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
5353

5454
ESP_LOGI(TAG, "Install SH8601 panel driver");
5555
esp_lcd_panel_handle_t panel_handle = NULL;
56-
sh8601_vendor_config_t vendor_config = {
56+
const sh8601_vendor_config_t vendor_config = {
5757
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
5858
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(sh8601_lcd_init_cmd_t),
5959
.flags = {
@@ -76,7 +76,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
7676
7777
```c
7878
ESP_LOGI(TAG, "Initialize QSPI bus");
79-
const esp_lcd_panel_io_spi_config_t io_config = SH8601_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
79+
const spi_bus_config_t buscfg = SH8601_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
8080
EXAMPLE_PIN_NUM_LCD_DATA0,
8181
EXAMPLE_PIN_NUM_LCD_DATA1,
8282
EXAMPLE_PIN_NUM_LCD_DATA2,
@@ -104,7 +104,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
104104
105105
ESP_LOGI(TAG, "Install SH8601 panel driver");
106106
esp_lcd_panel_handle_t panel_handle = NULL;
107-
sh8601_vendor_config_t vendor_config = {
107+
const sh8601_vendor_config_t vendor_config = {
108108
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
109109
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(sh8601_lcd_init_cmd_t),
110110
.flags = {

‎components/display/lcd/esp_lcd_spd2010/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ For more information on LCD, please refer to the [LCD documentation](https://doc
2626

2727
```c
2828
ESP_LOGI(TAG, "Initialize SPI bus");
29-
const spi_bus_config_t bus_config = SPD2010_PANEL_BUS_SPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
29+
const spi_bus_config_t buscfg = SPD2010_PANEL_BUS_SPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
3030
EXAMPLE_PIN_NUM_LCD_DATA0,
3131
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
32-
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &bus_config, SPI_DMA_CH_AUTO));
32+
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &buscfg, SPI_DMA_CH_AUTO));
3333

3434
ESP_LOGI(TAG, "Install panel IO");
3535
esp_lcd_panel_io_handle_t io_handle = NULL;
@@ -74,7 +74,7 @@ For more information on LCD, please refer to the [LCD documentation](https://doc
7474
7575
```c
7676
ESP_LOGI(TAG, "Initialize QSPI bus");
77-
const esp_lcd_panel_io_spi_config_t io_config = SPD2010_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
77+
const spi_bus_config_t buscfg = SPD2010_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
7878
EXAMPLE_PIN_NUM_LCD_DATA0,
7979
EXAMPLE_PIN_NUM_LCD_DATA1,
8080
EXAMPLE_PIN_NUM_LCD_DATA2,
@@ -102,7 +102,7 @@ For more information on LCD, please refer to the [LCD documentation](https://doc
102102
103103
ESP_LOGI(TAG, "Install SPD2010 panel driver");
104104
esp_lcd_panel_handle_t panel_handle = NULL;
105-
spd2010_vendor_config_t vendor_config = {
105+
const spd2010_vendor_config_t vendor_config = {
106106
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
107107
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(spd2010_lcd_init_cmd_t),
108108
.flags = {

‎components/display/lcd/esp_lcd_st77916/README.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
2626

2727
```c
2828
ESP_LOGI(TAG, "Initialize SPI bus");
29-
const spi_bus_config_t bus_config = ST77916_PANEL_BUS_SPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK, EXAMPLE_PIN_NUM_LCD_DATA0, EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
30-
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &bus_config, SPI_DMA_CH_AUTO));
29+
const spi_bus_config_t buscfg = ST77916_PANEL_BUS_SPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK, EXAMPLE_PIN_NUM_LCD_DATA0, EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
30+
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &buscfg, SPI_DMA_CH_AUTO));
3131

3232
ESP_LOGI(TAG, "Install panel IO");
3333
esp_lcd_panel_io_handle_t io_handle = NULL;
@@ -39,7 +39,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
3939
* Uncomment these line if use custom initialization commands.
4040
* The array should be declared as static const and positioned outside the function.
4141
*/
42-
// static const ST77916_lcd_init_cmd_t lcd_init_cmds[] = {
42+
// static const st77916_lcd_init_cmd_t lcd_init_cmds[] = {
4343
// // {cmd, { data }, data_size, delay_ms}
4444
// {0xF0, (uint8_t []){0x08}, 1, 0},
4545
// {0xF2, (uint8_t []){0x08}, 1, 0},
@@ -50,9 +50,9 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
5050

5151
ESP_LOGI(TAG, "Install ST77916 panel driver");
5252
esp_lcd_panel_handle_t panel_handle = NULL;
53-
ST77916_vendor_config_t vendor_config = {
53+
const st77916_vendor_config_t vendor_config = {
5454
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
55-
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(ST77916_lcd_init_cmd_t),
55+
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(st77916_lcd_init_cmd_t),
5656
.flags = {
5757
.use_qspi_interface = 0,
5858
},
@@ -73,12 +73,12 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
7373
7474
```c
7575
ESP_LOGI(TAG, "Initialize QSPI bus");
76-
const esp_lcd_panel_io_spi_config_t io_config = ST77916_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
77-
EXAMPLE_PIN_NUM_LCD_DATA0,
78-
EXAMPLE_PIN_NUM_LCD_DATA1,
79-
EXAMPLE_PIN_NUM_LCD_DATA2,
80-
EXAMPLE_PIN_NUM_LCD_DATA3
81-
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
76+
const spi_bus_config_t buscfg = ST77916_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
77+
EXAMPLE_PIN_NUM_LCD_DATA0,
78+
EXAMPLE_PIN_NUM_LCD_DATA1,
79+
EXAMPLE_PIN_NUM_LCD_DATA2,
80+
EXAMPLE_PIN_NUM_LCD_DATA3,
81+
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
8282
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &buscfg, SPI_DMA_CH_AUTO));
8383
8484
ESP_LOGI(TAG, "Install panel IO");
@@ -90,7 +90,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
9090
* Uncomment these line if use custom initialization commands.
9191
* The array should be declared as static const and positioned outside the function.
9292
*/
93-
// static const ST77916_lcd_init_cmd_t lcd_init_cmds[] = {
93+
// static const st77916_lcd_init_cmd_t lcd_init_cmds[] = {
9494
// // {cmd, { data }, data_size, delay_ms}
9595
// {0xF0, (uint8_t []){0x08}, 1, 0},
9696
// {0xF2, (uint8_t []){0x08}, 1, 0},
@@ -101,9 +101,9 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
101101
102102
ESP_LOGI(TAG, "Install ST77916 panel driver");
103103
esp_lcd_panel_handle_t panel_handle = NULL;
104-
ST77916_vendor_config_t vendor_config = {
104+
const st77916_vendor_config_t vendor_config = {
105105
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
106-
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(ST77916_lcd_init_cmd_t),
106+
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(st77916_lcd_init_cmd_t),
107107
.flags = {
108108
.use_qspi_interface = 1,
109109
},

‎components/display/lcd/esp_lcd_st77922/README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
2828

2929
```c
3030
ESP_LOGI(TAG, "Initialize SPI bus");
31-
const spi_bus_config_t bus_config = ST77922_PANEL_BUS_SPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK, EXAMPLE_PIN_NUM_LCD_DATA0, EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
32-
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &bus_config, SPI_DMA_CH_AUTO));
31+
const spi_bus_config_t buscfg = ST77922_PANEL_BUS_SPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK, EXAMPLE_PIN_NUM_LCD_DATA0, EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
32+
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &buscfg, SPI_DMA_CH_AUTO));
3333

3434
ESP_LOGI(TAG, "Install panel IO");
3535
esp_lcd_panel_io_handle_t io_handle = NULL;
@@ -52,7 +52,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
5252

5353
ESP_LOGI(TAG, "Install st77922 panel driver");
5454
esp_lcd_panel_handle_t panel_handle = NULL;
55-
st77922_vendor_config_t vendor_config = {
55+
const st77922_vendor_config_t vendor_config = {
5656
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
5757
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(st77922_lcd_init_cmd_t),
5858
.flags = {
@@ -75,11 +75,11 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
7575
7676
```c
7777
ESP_LOGI(TAG, "Initialize QSPI bus");
78-
const esp_lcd_panel_io_spi_config_t io_config = ST77922_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
78+
const spi_bus_config_t buscfg = ST77922_PANEL_BUS_QSPI_CONFIG(EXAMPLE_PIN_NUM_LCD_PCLK,
7979
EXAMPLE_PIN_NUM_LCD_DATA0,
8080
EXAMPLE_PIN_NUM_LCD_DATA1,
8181
EXAMPLE_PIN_NUM_LCD_DATA2,
82-
EXAMPLE_PIN_NUM_LCD_DATA3
82+
EXAMPLE_PIN_NUM_LCD_DATA3,
8383
EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t));
8484
ESP_ERROR_CHECK(spi_bus_initialize(EXAMPLE_LCD_HOST, &buscfg, SPI_DMA_CH_AUTO));
8585
@@ -103,7 +103,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
103103
104104
ESP_LOGI(TAG, "Install st77922 panel driver");
105105
esp_lcd_panel_handle_t panel_handle = NULL;
106-
st77922_vendor_config_t vendor_config = {
106+
const st77922_vendor_config_t vendor_config = {
107107
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
108108
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(st77922_lcd_init_cmd_t),
109109
.flags = {
@@ -196,7 +196,7 @@ void lvgl_port_rounder_callback(struct _lv_disp_drv_t * disp_drv, lv_area_t * ar
196196
};
197197
rgb_config.timings.h_res = EXAMPLE_LCD_H_RES;
198198
rgb_config.timings.v_res = EXAMPLE_LCD_V_RES;
199-
st77922_vendor_config_t vendor_config = {
199+
const st77922_vendor_config_t vendor_config = {
200200
.rgb_config = &rgb_config,
201201
.flags = {
202202
.use_rgb_interface = 1,
@@ -252,7 +252,7 @@ void lvgl_port_rounder_callback(struct _lv_disp_drv_t * disp_drv, lv_area_t * ar
252252
ESP_LOGI(TAG, "Install LCD driver of st77922");
253253
esp_lcd_panel_handle_t panel_handle = NULL;
254254
esp_lcd_dpi_panel_config_t dpi_config = ST77922_480_360_PANEL_60HZ_DPI_CONFIG(EXAMPLE_MIPI_DPI_PX_FORMAT);
255-
st77922_vendor_config_t vendor_config = {
255+
const st77922_vendor_config_t vendor_config = {
256256
// .init_cmds = lcd_init_cmds, // Uncomment these line if use custom initialization commands
257257
// .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(st77922_lcd_init_cmd_t),
258258
.flags.use_mipi_interface = 1,

0 commit comments

Comments
 (0)