Skip to content

Commit ca6290a

Browse files
espzavespzav
authored
Merge pull request #618 from espressif/fix/idf6_esp_lcd
fix(bsp): Fix all BSPs for esp_lcd changes in IDF6
2 parents 5424af1 + b31b81c commit ca6290a

File tree

102 files changed

+392
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+392
-309
lines changed

‎.github/workflows/build-run-applications.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ jobs:
129129
runner:
130130
- example: "test_example_display"
131131
- example: "test_example_lvgl_demos"
132-
- example: "test_example_display_sensors"
133132
- example: "test_example_generic_button_led"
134133
- example: "test_example_lvgl_benchmark"
135134
env:
@@ -161,7 +160,7 @@ jobs:
161160
run: |
162161
export PYTEST_EMBEDDED_CACHE_DIR=/tmp/pytest-embedded-cache-dummy
163162
mkdir -p /tmp/pytest-embedded-cache-dummy
164-
pytest --suppress-no-test-exit-code --ignore-glob '*/managed_components/*' --ignore=.github --junit-xml=${{ env.TEST_RESULT_FILE }} -k ${{ matrix.runner.example }} -n auto ${{ env.PYTEST_BENCHMARK_IGNORE }}
163+
pytest --suppress-no-test-exit-code --ignore-glob '*/managed_components/*' --ignore=.github --junit-xml=${{ env.TEST_RESULT_FILE }} -k "${{ matrix.runner.example }} and not test_example_display_sensors" -n auto ${{ env.PYTEST_BENCHMARK_IGNORE }}
165164
- name: Upload test results
166165
uses: actions/upload-artifact@v4
167166
if: always()

‎SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/idf_component.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
version: "1.0.2"
1+
version: "1.0.3"
22
description: Board Support Package for WaveShare 7inch
33
url: https://github.com/espressif/esp-bsp/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch
44

55
dependencies:
6-
idf: ">=5.0"
6+
idf: ">=5.3"
77
esp_lcd_ra8875: "^1"
88
esp_lcd_touch_gt911: "^1"
99
lvgl/lvgl: "^8"

‎SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/ws_7inch.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: CC0-1.0
55
*/
@@ -84,8 +84,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand
8484
},
8585
.bus_width = BSP_LCD_WIDTH,
8686
.max_transfer_bytes = (BSP_LCD_H_RES) * 80 * sizeof(uint16_t),
87-
.psram_trans_align = 64,
88-
.sram_trans_align = 4,
87+
.dma_burst_size = 64,
8988
};
9089
ESP_RETURN_ON_ERROR(esp_lcd_new_i80_bus(&bus_config, &i80_bus), TAG, "I80 init failed");
9190

@@ -118,7 +117,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand
118117
};
119118
esp_lcd_panel_dev_config_t panel_config = {
120119
.reset_gpio_num = BSP_LCD_RST,
121-
.color_space = ESP_LCD_COLOR_SPACE_RGB,
120+
.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
122121
.bits_per_pixel = 16,
123122
.vendor_config = (void *) &vendor_config,
124123
};

‎bsp/esp-box-3/API.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ Below are some of the most relevant predefined constants:
945945
| define | [**BSP\_LCD\_BIGENDIAN**](#define-bsp_lcd_bigendian) (1)<br> |
946946
| define | [**BSP\_LCD\_BITS\_PER\_PIXEL**](#define-bsp_lcd_bits_per_pixel) (16)<br> |
947947
| define | [**BSP\_LCD\_COLOR\_FORMAT**](#define-bsp_lcd_color_format) (ESP\_LCD\_COLOR\_FORMAT\_RGB565)<br> |
948-
| define | [**BSP\_LCD\_COLOR\_SPACE**](#define-bsp_lcd_color_space) (ESP\_LCD\_COLOR\_SPACE\_BGR)<br> |
948+
| define | [**BSP\_LCD\_COLOR\_SPACE**](#define-bsp_lcd_color_space) (LCD\_RGB\_ELEMENT\_ORDER\_BGR)<br> |
949949
| define | [**BSP\_LCD\_CS**](#define-bsp_lcd_cs) (GPIO\_NUM\_5)<br> |
950950
| define | [**BSP\_LCD\_DATA0**](#define-bsp_lcd_data0) (GPIO\_NUM\_6)<br> |
951951
| define | [**BSP\_LCD\_DC**](#define-bsp_lcd_dc) (GPIO\_NUM\_4)<br> |

‎bsp/esp-box-3/README.md‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ ESP32-S3-BOX-3 also uses a Type-C USB connector that provides 5 V of power input
2626
<div align="center">
2727
<!-- START_DEPENDENCIES -->
2828

29-
| Available | Capability |Controller/Codec| Component | Version |
30-
|------------------|------------------------|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|
31-
|:heavy_check_mark:| :pager: DISPLAY | st7789, ili9341| [espressif/esp_lcd_ili9341](https://components.espressif.com/components/espressif/esp_lcd_ili9341)<br/>idf |^1<br/>>=5.3|
32-
|:heavy_check_mark:|:black_circle: LVGL_PORT| | [espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port) | ^2 |
33-
|:heavy_check_mark:| :point_up: TOUCH | tt21100, gt911 |[espressif/esp_lcd_touch_gt911](https://components.espressif.com/components/espressif/esp_lcd_touch_gt911)<br/>[espressif/esp_lcd_touch_tt21100](https://components.espressif.com/components/espressif/esp_lcd_touch_tt21100)| ^1<br/>^1 |
34-
|:heavy_check_mark:| :radio_button: BUTTONS | | [espressif/button](https://components.espressif.com/components/espressif/button) | ^4 |
35-
|:heavy_check_mark:| :musical_note: AUDIO | | [espressif/esp_codec_dev](https://components.espressif.com/components/espressif/esp_codec_dev) | ~1.3.1 |
36-
|:heavy_check_mark:| :speaker: AUDIO_SPEAKER| es8311 | | |
37-
|:heavy_check_mark:| :microphone: AUDIO_MIC | es7210 | | |
38-
|:heavy_check_mark:| :floppy_disk: SDCARD | | idf | >=5.3 |
39-
|:heavy_check_mark:| :video_game: IMU | | [espressif/icm42670](https://components.espressif.com/components/espressif/icm42670) | ^2.0.1 |
29+
| Available | Capability |Controller/Codec| Component | Version |
30+
|------------------|------------------------|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|
31+
|:heavy_check_mark:| :pager: DISPLAY | st7789, ili9341| [espressif/esp_lcd_ili9341](https://components.espressif.com/components/espressif/esp_lcd_ili9341)<br/>idf |^2.0.1<br/>>=5.3|
32+
|:heavy_check_mark:|:black_circle: LVGL_PORT| | [espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port) | ^2 |
33+
|:heavy_check_mark:| :point_up: TOUCH | tt21100, gt911 |[espressif/esp_lcd_touch_gt911](https://components.espressif.com/components/espressif/esp_lcd_touch_gt911)<br/>[espressif/esp_lcd_touch_tt21100](https://components.espressif.com/components/espressif/esp_lcd_touch_tt21100)| ^1<br/>^1 |
34+
|:heavy_check_mark:| :radio_button: BUTTONS | | [espressif/button](https://components.espressif.com/components/espressif/button) | ^4 |
35+
|:heavy_check_mark:| :musical_note: AUDIO | | [espressif/esp_codec_dev](https://components.espressif.com/components/espressif/esp_codec_dev) | ~1.3.1 |
36+
|:heavy_check_mark:| :speaker: AUDIO_SPEAKER| es8311 | | |
37+
|:heavy_check_mark:| :microphone: AUDIO_MIC | es7210 | | |
38+
|:heavy_check_mark:| :floppy_disk: SDCARD | | idf | >=5.3 |
39+
|:heavy_check_mark:| :video_game: IMU | | [espressif/icm42670](https://components.espressif.com/components/espressif/icm42670) | ^2.0.1 |
4040

4141
<!-- END_DEPENDENCIES -->
4242
</div>
@@ -61,30 +61,30 @@ ESP32-S3-BOX-3 also uses a Type-C USB connector that provides 5 V of power input
6161

6262
## LVGL Benchmark
6363

64-
**DATE:** 11.08.2025 02:49
64+
**DATE:** 19.08.2025 02:45
6565

6666
**LVGL version:** 9.3.0
6767

6868
| Name | Avg. CPU | Avg. FPS | Avg. time | render time | flush time |
6969
| ---- | :------: | :------: | :-------: | :---------: | :--------: |
70-
| Empty screen | 93% | 26 | 34 | 3 | 31 |
71-
| Moving wallpaper | 97% | 25 | 35 | 5 | 30 |
72-
| Single rectangle | 10% | 91 | 0 | 0 | 0 |
73-
| Multiple rectangles | 90% | 51 | 16 | 3 | 13 |
74-
| Multiple RGB images | 18% | 90 | 0 | 0 | 0 |
75-
| Multiple ARGB images | 20% | 87 | 3 | 2 | 1 |
76-
| Rotated ARGB images | 74% | 54 | 18 | 12 | 6 |
77-
| Multiple labels | 89% | 79 | 9 | 2 | 7 |
70+
| Empty screen | 93% | 26 | 33 | 3 | 30 |
71+
| Moving wallpaper | 95% | 26 | 35 | 5 | 30 |
72+
| Single rectangle | 10% | 92 | 0 | 0 | 0 |
73+
| Multiple rectangles | 90% | 52 | 15 | 2 | 13 |
74+
| Multiple RGB images | 7% | 88 | 0 | 0 | 0 |
75+
| Multiple ARGB images | 21% | 87 | 3 | 2 | 1 |
76+
| Rotated ARGB images | 81% | 57 | 17 | 12 | 5 |
77+
| Multiple labels | 87% | 79 | 9 | 3 | 6 |
7878
| Screen sized text | 98% | 15 | 59 | 28 | 31 |
79-
| Multiple arcs | 16% | 90 | 0 | 0 | 0 |
80-
| Containers | 33% | 72 | 16 | 4 | 12 |
81-
| Containers with overlay | 93% | 20 | 45 | 15 | 30 |
82-
| Containers with opa | 49% | 68 | 20 | 7 | 13 |
83-
| Containers with opa_layer | 61% | 53 | 29 | 16 | 13 |
79+
| Multiple arcs | 9% | 87 | 0 | 0 | 0 |
80+
| Containers | 37% | 74 | 15 | 4 | 11 |
81+
| Containers with overlay | 87% | 20 | 44 | 14 | 30 |
82+
| Containers with opa | 49% | 68 | 19 | 7 | 12 |
83+
| Containers with opa_layer | 59% | 54 | 27 | 15 | 12 |
8484
| Containers with scrolling | 95% | 21 | 44 | 13 | 31 |
85-
| Widgets demo | 96% | 25 | 25 | 11 | 14 |
86-
| All scenes avg. | 64% | 54 | 21 | 7 | 14 |
85+
| Widgets demo | 97% | 25 | 25 | 11 | 14 |
86+
| All scenes avg. | 63% | 54 | 21 | 7 | 14 |
8787

8888

8989

90-
<!-- END_BENCHMARK -->
90+
<!-- END_BENCHMARK -->

‎bsp/esp-box-3/esp-box-3.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand
568568
esp_lcd_panel_dev_config_t panel_config = {
569569
.reset_gpio_num = BSP_LCD_RST, // Shared with Touch reset
570570
.flags.reset_active_high = 1,
571-
.color_space = BSP_LCD_COLOR_SPACE,
571+
.rgb_ele_order = BSP_LCD_COLOR_SPACE,
572572
.bits_per_pixel = BSP_LCD_BITS_PER_PIXEL,
573573
};
574574

‎bsp/esp-box-3/idf_component.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
version: "3.0.1~2"
2+
version: "3.0.2"
33
description: Board Support Package (BSP) for ESP32-S3-BOX-3
44
url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp-box-3
55

@@ -13,7 +13,7 @@ dependencies:
1313
idf: ">=5.3" # We use I2C Driver-NG from IDF v5.2 but esp-codec-dev supports from v5.3
1414
esp_lcd_touch_tt21100: "^1"
1515
esp_lcd_touch_gt911: "^1"
16-
esp_lcd_ili9341: "^1"
16+
esp_lcd_ili9341: "^2.0.1"
1717

1818
espressif/esp_lvgl_port:
1919
version: "^2"

‎bsp/esp-box-3/include/bsp/display.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/* LCD display color bits */
3333
#define BSP_LCD_BITS_PER_PIXEL (16)
3434
/* LCD display color space */
35-
#define BSP_LCD_COLOR_SPACE (ESP_LCD_COLOR_SPACE_BGR)
35+
#define BSP_LCD_COLOR_SPACE (LCD_RGB_ELEMENT_ORDER_BGR)
3636
/* LCD definition */
3737
#define BSP_LCD_H_RES (320)
3838
#define BSP_LCD_V_RES (240)

‎bsp/esp32_c3_lcdkit/API.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ Below are some of the most relevant predefined constants:
584584
| define | [**BSP\_LCD\_BIGENDIAN**](#define-bsp_lcd_bigendian) (1)<br> |
585585
| define | [**BSP\_LCD\_BITS\_PER\_PIXEL**](#define-bsp_lcd_bits_per_pixel) (16)<br> |
586586
| define | [**BSP\_LCD\_COLOR\_FORMAT**](#define-bsp_lcd_color_format) (ESP\_LCD\_COLOR\_FORMAT\_RGB565)<br> |
587-
| define | [**BSP\_LCD\_COLOR\_SPACE**](#define-bsp_lcd_color_space) (ESP\_LCD\_COLOR\_SPACE\_BGR)<br> |
587+
| define | [**BSP\_LCD\_COLOR\_SPACE**](#define-bsp_lcd_color_space) (LCD\_RGB\_ELEMENT\_ORDER\_BGR)<br> |
588588
| define | [**BSP\_LCD\_CS**](#define-bsp_lcd_cs) (GPIO\_NUM\_7)<br> |
589589
| define | [**BSP\_LCD\_DATA0**](#define-bsp_lcd_data0) (GPIO\_NUM\_0)<br> |
590590
| define | [**BSP\_LCD\_DC**](#define-bsp_lcd_dc) (GPIO\_NUM\_2)<br> |

‎bsp/esp32_c3_lcdkit/README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ ESP32-C3-LCDkit also uses a Type-C USB connector that provides 5 V of power inpu
2626
<div align="center">
2727
<!-- START_DEPENDENCIES -->
2828

29-
| Available | Capability |Controller/Codec| Component | Version |
30-
|------------------|------------------------|----------------|--------------------------------------------------------------------------------------------------------|--------------|
31-
|:heavy_check_mark:| :pager: DISPLAY | gc9a01 |[espressif/esp_lcd_gc9a01](https://components.espressif.com/components/espressif/esp_lcd_gc9a01)<br/>idf|^1<br/>>=5.0.0|
32-
|:heavy_check_mark:|:black_circle: LVGL_PORT| | [espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port) | ^2 |
33-
| :x: | :point_up: TOUCH | | | |
34-
| :x: | :radio_button: BUTTONS | | | |
35-
|:heavy_check_mark:| :white_circle: KNOB | | [espressif/knob](https://components.espressif.com/components/espressif/knob) | ^0.1.3 |
36-
|:heavy_check_mark:| :musical_note: AUDIO | | [espressif/esp_codec_dev](https://components.espressif.com/components/espressif/esp_codec_dev) | ^1,<1.2 |
37-
|:heavy_check_mark:| :speaker: AUDIO_SPEAKER| | | |
38-
| :x: | :microphone: AUDIO_MIC | | | |
39-
|:heavy_check_mark:| :bulb: LED | | idf | >=5.0.0 |
40-
| :x: | :floppy_disk: SDCARD | | | |
41-
| :x: | :video_game: IMU | | | |
29+
| Available | Capability |Controller/Codec| Component | Version |
30+
|------------------|------------------------|----------------|--------------------------------------------------------------------------------------------------------|------------------|
31+
|:heavy_check_mark:| :pager: DISPLAY | gc9a01 |[espressif/esp_lcd_gc9a01](https://components.espressif.com/components/espressif/esp_lcd_gc9a01)<br/>idf|^2.0.3<br/>>=5.0.0|
32+
|:heavy_check_mark:|:black_circle: LVGL_PORT| | [espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port) | ^2 |
33+
| :x: | :point_up: TOUCH | | | |
34+
| :x: | :radio_button: BUTTONS | | | |
35+
|:heavy_check_mark:| :white_circle: KNOB | | [espressif/knob](https://components.espressif.com/components/espressif/knob) | ^0.1.3 |
36+
|:heavy_check_mark:| :musical_note: AUDIO | | [espressif/esp_codec_dev](https://components.espressif.com/components/espressif/esp_codec_dev) | ^1,<1.2 |
37+
|:heavy_check_mark:| :speaker: AUDIO_SPEAKER| | | |
38+
| :x: | :microphone: AUDIO_MIC | | | |
39+
|:heavy_check_mark:| :bulb: LED | | idf | >=5.0.0 |
40+
| :x: | :floppy_disk: SDCARD | | | |
41+
| :x: | :video_game: IMU | | | |
4242

4343
<!-- END_DEPENDENCIES -->
4444
</div>

0 commit comments

Comments
 (0)