Skip to content

Commit db78385

Browse files
authored
Merge branch 'espressif:master' into patch-1
2 parents 6ae09d5 + afb63ab commit db78385

File tree

185 files changed

+11421
-239
lines changed

Some content is hidden

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

185 files changed

+11421
-239
lines changed

.github/workflows/upload_component.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ jobs:
2929
components/bootloader_support_plus;
3030
components/button;
3131
components/display/lcd/esp_lcd_axs15231b;
32+
components/display/lcd/esp_lcd_co5300;
3233
components/display/lcd/esp_lcd_ek79007;
34+
components/display/lcd/esp_lcd_gc9107;
3335
components/display/lcd/esp_lcd_gc9b71;
36+
components/display/lcd/esp_lcd_gc9d01;
3437
components/display/lcd/esp_lcd_hx8399;
3538
components/display/lcd/esp_lcd_jd9165;
3639
components/display/lcd/esp_lcd_jd9365;
3740
components/display/lcd/esp_lcd_nv3022b;
41+
components/display/lcd/esp_lcd_nv3052;
3842
components/display/lcd/esp_lcd_panel_io_additions;
3943
components/display/lcd/esp_lcd_sh8601;
4044
components/display/lcd/esp_lcd_spd2010;
@@ -101,6 +105,7 @@ jobs:
101105
components/usb/iot_usbh_ecm;
102106
components/usb/usb_stream;
103107
components/utilities/adc_tp_calibration;
108+
components/utilities/log_router;
104109
components/utilities/xz;
105110
components/zero_detection;
106111
tools/cmake_utilities;

.gitlab/ci/build.yml

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,16 @@ build_example_check_pedestrian_flow:
394394
variables:
395395
EXAMPLE_DIR: examples/check_pedestrian_flow
396396

397+
build_example_display_lcd_hdmi_video_renderer:
398+
extends:
399+
- .build_examples_template
400+
- .rules:build:example_display_lcd_hdmi_video_renderer
401+
parallel:
402+
matrix:
403+
- IMAGE: espressif/idf:release-v5.4
404+
variables:
405+
EXAMPLE_DIR: examples/display/lcd/hdmi_video_renderer
406+
397407
build_example_display_lcd_lcd_layer_blending:
398408
extends:
399409
- .build_examples_template
@@ -1095,6 +1105,16 @@ build_components_display_lcd_esp_lcd_axs15231b_test_apps:
10951105
variables:
10961106
EXAMPLE_DIR: components/display/lcd/esp_lcd_axs15231b/test_apps
10971107

1108+
build_components_display_lcd_esp_lcd_co5300_test_apps:
1109+
extends:
1110+
- .build_examples_template
1111+
- .rules:build:components_display_lcd_esp_lcd_co5300_test_apps
1112+
parallel:
1113+
matrix:
1114+
- IMAGE: espressif/idf:release-v5.3
1115+
variables:
1116+
EXAMPLE_DIR: components/display/lcd/esp_lcd_co5300/test_apps
1117+
10981118
build_components_display_lcd_esp_lcd_ek79007_test_apps:
10991119
extends:
11001120
- .build_examples_template
@@ -1125,6 +1145,16 @@ build_components_display_lcd_esp_lcd_jd9365_test_apps:
11251145
variables:
11261146
EXAMPLE_DIR: components/display/lcd/esp_lcd_jd9365/test_apps
11271147

1148+
build_components_display_lcd_esp_lcd_gc9107_test_apps:
1149+
extends:
1150+
- .build_examples_template
1151+
- .rules:build:components_display_lcd_esp_lcd_gc9107_test_apps
1152+
parallel:
1153+
matrix:
1154+
- IMAGE: espressif/idf:release-v5.3
1155+
variables:
1156+
EXAMPLE_DIR: components/display/lcd/esp_lcd_gc9107/test_apps
1157+
11281158
build_components_display_lcd_esp_lcd_gc9b71_test_apps:
11291159
extends:
11301160
- .build_examples_template
@@ -1135,6 +1165,16 @@ build_components_display_lcd_esp_lcd_gc9b71_test_apps:
11351165
variables:
11361166
EXAMPLE_DIR: components/display/lcd/esp_lcd_gc9b71/test_apps
11371167

1168+
build_components_display_lcd_esp_lcd_gc9d01_test_apps:
1169+
extends:
1170+
- .build_examples_template
1171+
- .rules:build:components_display_lcd_esp_lcd_gc9d01_test_apps
1172+
parallel:
1173+
matrix:
1174+
- IMAGE: espressif/idf:release-v5.3
1175+
variables:
1176+
EXAMPLE_DIR: components/display/lcd/esp_lcd_gc9d01/test_apps
1177+
11381178
build_components_display_lcd_esp_lcd_hx8399_test_apps:
11391179
extends:
11401180
- .build_examples_template
@@ -1167,6 +1207,16 @@ build_components_display_lcd_esp_lcd_nv3022b_test_apps:
11671207
variables:
11681208
EXAMPLE_DIR: components/display/lcd/esp_lcd_nv3022b/test_apps
11691209

1210+
build_components_display_lcd_esp_lcd_nv3052_test_apps:
1211+
extends:
1212+
- .build_examples_template
1213+
- .rules:build:components_display_lcd_esp_lcd_nv3052_test_apps
1214+
parallel:
1215+
matrix:
1216+
- IMAGE: espressif/idf:release-v5.3
1217+
variables:
1218+
EXAMPLE_DIR: components/display/lcd/esp_lcd_nv3052/test_apps
1219+
11701220
build_components_display_lcd_esp_lcd_sh8601_test_apps:
11711221
extends:
11721222
- .build_examples_template
@@ -1660,10 +1710,7 @@ build_components_usb_usb_stream_test_apps:
16601710
extends:
16611711
- .build_examples_template
16621712
- .rules:build:components_usb_usb_stream_test
1663-
parallel:
1664-
matrix:
1665-
- IMAGE: espressif/idf:release-v5.0
1666-
- IMAGE: espressif/idf:release-v5.4
1713+
- .build_idf_active_release_version
16671714
variables:
16681715
EXAMPLE_DIR: components/usb/usb_stream/test_apps
16691716

@@ -1795,6 +1842,14 @@ build_components_utilities_adc_tp_calibration_test_apps:
17951842
variables:
17961843
EXAMPLE_DIR: components/utilities/adc_tp_calibration/test_apps
17971844

1845+
build_components_utilities_log_router_test_apps:
1846+
extends:
1847+
- .build_examples_template
1848+
- .rules:build:components_utilities_log_router_test_apps
1849+
- .build_idf_version_greater_equal_v5_0
1850+
variables:
1851+
EXAMPLE_DIR: components/utilities/log_router/test_apps
1852+
17981853
build_components_zero_detection_test_apps:
17991854
extends:
18001855
- .build_examples_template

.gitlab/ci/rules.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676
.patterns-components_display_lcd_esp_lcd_axs15231b: &patterns-components_display_lcd_esp_lcd_axs15231b
7777
- "components/display/lcd/esp_lcd_axs15231b/**/*"
7878

79+
.patterns-components_display_lcd_esp_lcd_co5300: &patterns-components_display_lcd_esp_lcd_co5300
80+
- "components/display/lcd/esp_lcd_co5300/**/*"
81+
7982
.patterns-components_display_lcd_esp_lcd_ek79007: &patterns-components_display_lcd_esp_lcd_ek79007
8083
- "components/display/lcd/esp_lcd_ek79007/**/*"
8184

@@ -85,9 +88,15 @@
8588
.patterns-components_display_lcd_esp_lcd_jd9365: &patterns-components_display_lcd_esp_lcd_jd9365
8689
- "components/display/lcd/esp_lcd_jd9365/**/*"
8790

91+
.patterns-components_display_lcd_esp_lcd_gc9107: &patterns-components_display_lcd_esp_lcd_gc9107
92+
- "components/display/lcd/esp_lcd_gc9107/**/*"
93+
8894
.patterns-components_display_lcd_esp_lcd_gc9b71: &patterns-components_display_lcd_esp_lcd_gc9b71
8995
- "components/display/lcd/esp_lcd_gc9b71/**/*"
9096

97+
.patterns-components_display_lcd_esp_lcd_gc9d01: &patterns-components_display_lcd_esp_lcd_gc9d01
98+
- "components/display/lcd/esp_lcd_gc9d01/**/*"
99+
91100
.patterns-components_display_lcd_esp_lcd_hx8399: &patterns-components_display_lcd_esp_lcd_hx8399
92101
- "components/display/lcd/esp_lcd_hx8399/**/*"
93102

@@ -97,6 +106,9 @@
97106
.patterns-components_display_lcd_esp_lcd_nv3022b: &patterns-components_display_lcd_esp_lcd_nv3022b
98107
- "components/display/lcd/esp_lcd_nv3022b/**/*"
99108

109+
.patterns-components_display_lcd_esp_lcd_nv3052: &patterns-components_display_lcd_esp_lcd_nv3052
110+
- "components/display/lcd/esp_lcd_nv3052/**/*"
111+
100112
.patterns-components_display_lcd_esp_lcd_sh8601: &patterns-components_display_lcd_esp_lcd_sh8601
101113
- "components/display/lcd/esp_lcd_sh8601/**/*"
102114

@@ -371,6 +383,10 @@
371383
- "components/utilities/adc_tp_calibration/**/*"
372384
- "tools/cmake_utilities/package_manager.cmake"
373385

386+
.patterns-components_utilities_log_router: &patterns-components_utilities_log_router
387+
- "components/utilities/log_router/**/*"
388+
- "tools/cmake_utilities/package_manager.cmake"
389+
374390
# examples folder, in the alphabetic order
375391
.patterns-docs: &patterns-docs
376392
- "docs/**/*"
@@ -484,6 +500,9 @@
484500
.patterns-example_common_components_camera: &patterns-example_common_components_camera
485501
- "examples/common_components/camera/**/*"
486502

503+
.patterns-example_display_lcd_hdmi_video_renderer: &patterns-example_display_lcd_hdmi_video_renderer
504+
- "examples/display/lcd/hdmi_video_renderer/**/*"
505+
487506
.patterns-example_display_lcd_lcd_layer_blending: &patterns-example_display_lcd_lcd_layer_blending
488507
- "examples/display/lcd/lcd_layer_blending/**/*"
489508

@@ -909,6 +928,12 @@
909928
- <<: *if-dev-push
910929
changes: *patterns-example_check_pedestrian_flow
911930

931+
.rules:build:example_display_lcd_hdmi_video_renderer:
932+
rules:
933+
- <<: *if-protected
934+
- <<: *if-label-build
935+
- <<: *if-trigger-job
936+
912937
.rules:build:example_display_lcd_lcd_layer_blending:
913938
rules:
914939
- <<: *if-protected
@@ -1901,6 +1926,17 @@
19011926
- <<: *if-dev-push
19021927
changes: *patterns-components_display_lcd_esp_lcd_axs15231b
19031928

1929+
.rules:build:components_display_lcd_esp_lcd_co5300_test_apps:
1930+
rules:
1931+
- <<: *if-protected
1932+
- <<: *if-label-build
1933+
- <<: *if-label-target_test
1934+
- <<: *if-trigger-job
1935+
- <<: *if-dev-push
1936+
changes: *patterns-build_system
1937+
- <<: *if-dev-push
1938+
changes: *patterns-components_display_lcd_esp_lcd_co5300
1939+
19041940
.rules:build:components_display_lcd_esp_lcd_ek79007_test_apps:
19051941
rules:
19061942
- <<: *if-protected
@@ -1934,6 +1970,17 @@
19341970
- <<: *if-dev-push
19351971
changes: *patterns-components_display_lcd_esp_lcd_jd9365
19361972

1973+
.rules:build:components_display_lcd_esp_lcd_gc9107_test_apps:
1974+
rules:
1975+
- <<: *if-protected
1976+
- <<: *if-label-build
1977+
- <<: *if-label-target_test
1978+
- <<: *if-trigger-job
1979+
- <<: *if-dev-push
1980+
changes: *patterns-build_system
1981+
- <<: *if-dev-push
1982+
changes: *patterns-components_display_lcd_esp_lcd_gc9107
1983+
19371984
.rules:build:components_display_lcd_esp_lcd_gc9b71_test_apps:
19381985
rules:
19391986
- <<: *if-protected
@@ -1945,6 +1992,17 @@
19451992
- <<: *if-dev-push
19461993
changes: *patterns-components_display_lcd_esp_lcd_gc9b71
19471994

1995+
.rules:build:components_display_lcd_esp_lcd_gc9d01_test_apps:
1996+
rules:
1997+
- <<: *if-protected
1998+
- <<: *if-label-build
1999+
- <<: *if-label-target_test
2000+
- <<: *if-trigger-job
2001+
- <<: *if-dev-push
2002+
changes: *patterns-build_system
2003+
- <<: *if-dev-push
2004+
changes: *patterns-components_display_lcd_esp_lcd_gc9d01
2005+
19482006
.rules:build:components_display_lcd_esp_lcd_hx8399_test_apps:
19492007
rules:
19502008
- <<: *if-protected
@@ -1978,6 +2036,17 @@
19782036
- <<: *if-dev-push
19792037
changes: *patterns-components_display_lcd_esp_lcd_nv3022b
19802038

2039+
.rules:build:components_display_lcd_esp_lcd_nv3052_test_apps:
2040+
rules:
2041+
- <<: *if-protected
2042+
- <<: *if-label-build
2043+
- <<: *if-label-target_test
2044+
- <<: *if-trigger-job
2045+
- <<: *if-dev-push
2046+
changes: *patterns-build_system
2047+
- <<: *if-dev-push
2048+
changes: *patterns-components_display_lcd_esp_lcd_nv3052
2049+
19812050
.rules:build:components_display_lcd_esp_lcd_sh8601_test_apps:
19822051
rules:
19832052
- <<: *if-protected
@@ -2672,6 +2741,17 @@
26722741
- <<: *if-dev-push
26732742
changes: *patterns-components_utilities_adc_tp_calibration
26742743

2744+
.rules:build:components_utilities_log_router_test_apps:
2745+
rules:
2746+
- <<: *if-protected
2747+
- <<: *if-label-build
2748+
- <<: *if-label-target_test
2749+
- <<: *if-trigger-job
2750+
- <<: *if-dev-push
2751+
changes: *patterns-build_system
2752+
- <<: *if-dev-push
2753+
changes: *patterns-components_utilities_log_router
2754+
26752755
.rules:build:components_sensors_humiture_aht20_test_apps:
26762756
rules:
26772757
- <<: *if-protected

.gitlab/ci/target_test.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -799,12 +799,13 @@ components_test_zero_detection:
799799
- IDF_TARGET: esp32s3
800800
IDF_VERSION: "5.1"
801801
ENV_TAG: zero_detection
802-
- IDF_TARGET: esp32c3
803-
IDF_VERSION: "5.0"
804-
ENV_TAG: zero_detection
805-
- IDF_TARGET: esp32c3
806-
IDF_VERSION: "5.1"
807-
ENV_TAG: zero_detection
802+
# - IDF_TARGET: esp32c3
803+
# IDF_VERSION: "5.0"
804+
# ENV_TAG: zero_detection
805+
# - IDF_TARGET: esp32c3
806+
# IDF_VERSION: "5.1"
807+
# ENV_TAG: zero_detection
808+
# Due to memory issues, the ESP32-C3 test case is temporarily skipped and will be restored after the problem is resolved. AEG-2602
808809
tags:
809810
- ${IDF_TARGET}
810811
- ${ENV_TAG}

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,16 @@ The registered components in ESP-IoT-Solution are listed below:
7878
| [drv10987](https://components.espressif.com/components/espressif/drv10987) | [![Component Registry](https://components.espressif.com/components/espressif/drv10987/badge.svg)](https://components.espressif.com/components/espressif/drv10987) |
7979
| [elf_loader](https://components.espressif.com/components/espressif/elf_loader) | [![Component Registry](https://components.espressif.com/components/espressif/elf_loader/badge.svg)](https://components.espressif.com/components/espressif/elf_loader) |
8080
| [esp_lcd_axs15231b](https://components.espressif.com/components/espressif/esp_lcd_axs15231b) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_axs15231b/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_axs15231b) |
81+
| [esp_lcd_co5300](https://components.espressif.com/components/espressif/esp_lcd_co5300) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_co5300/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_co5300) |
8182
| [esp_lcd_ek79007](https://components.espressif.com/components/espressif/esp_lcd_ek79007) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_ek79007/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_ek79007) |
83+
| [esp_lcd_gc9107](https://components.espressif.com/components/espressif/esp_lcd_gc9107) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_gc9107/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_gc9107) |
8284
| [esp_lcd_gc9b71](https://components.espressif.com/components/espressif/esp_lcd_gc9b71) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_gc9b71/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_gc9b71) |
85+
| [esp_lcd_gc9d01](https://components.espressif.com/components/espressif/esp_lcd_gc9d01) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_gc9d01/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_gc9d01) |
8386
| [esp_lcd_hx8399](https://components.espressif.com/components/espressif/esp_lcd_hx8399) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_hx8399/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_hx8399) |
8487
| [esp_lcd_jd9165](https://components.espressif.com/components/espressif/esp_lcd_jd9165) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_jd9165/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_jd9165) |
8588
| [esp_lcd_jd9365](https://components.espressif.com/components/espressif/esp_lcd_jd9365) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_jd9365/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_jd9365) |
8689
| [esp_lcd_nv3022b](https://components.espressif.com/components/espressif/esp_lcd_nv3022b) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_nv3022b/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_nv3022b) |
90+
| [esp_lcd_nv3052](https://components.espressif.com/components/espressif/esp_lcd_nv3052) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_nv3052/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_nv3052) |
8791
| [esp_lcd_panel_io_additions](https://components.espressif.com/components/espressif/esp_lcd_panel_io_additions) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_panel_io_additions/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_panel_io_additions) |
8892
| [esp_lcd_sh8601](https://components.espressif.com/components/espressif/esp_lcd_sh8601) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_sh8601/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_sh8601) |
8993
| [esp_lcd_spd2010](https://components.espressif.com/components/espressif/esp_lcd_spd2010) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_spd2010/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_spd2010) |
@@ -121,6 +125,7 @@ The registered components in ESP-IoT-Solution are listed below:
121125
| [led_indicator](https://components.espressif.com/components/espressif/led_indicator) | [![Component Registry](https://components.espressif.com/components/espressif/led_indicator/badge.svg)](https://components.espressif.com/components/espressif/led_indicator) |
122126
| [lightbulb_driver](https://components.espressif.com/components/espressif/lightbulb_driver) | [![Component Registry](https://components.espressif.com/components/espressif/lightbulb_driver/badge.svg)](https://components.espressif.com/components/espressif/lightbulb_driver) |
123127
| [lis2dh12](https://components.espressif.com/components/espressif/lis2dh12) | [![Component Registry](https://components.espressif.com/components/espressif/lis2dh12/badge.svg)](https://components.espressif.com/components/espressif/lis2dh12) |
128+
| [log_router](https://components.espressif.com/components/espressif/log_router) | [![Component Registry](https://components.espressif.com/components/espressif/log_router/badge.svg)](https://components.espressif.com/components/espressif/log_router) |
124129
| [max17048](https://components.espressif.com/components/espressif/max17048) | [![Component Registry](https://components.espressif.com/components/espressif/max17048/badge.svg)](https://components.espressif.com/components/espressif/max17048) |
125130
| [mcp23017](https://components.espressif.com/components/espressif/mcp23017) | [![Component Registry](https://components.espressif.com/components/espressif/mcp23017/badge.svg)](https://components.espressif.com/components/espressif/mcp23017) |
126131
| [mcp3201](https://components.espressif.com/components/espressif/mcp3201) | [![Component Registry](https://components.espressif.com/components/espressif/mcp3201/badge.svg)](https://components.espressif.com/components/espressif/mcp3201) |

0 commit comments

Comments
 (0)