Skip to content

Commit 9343b39

Browse files
harunyharuny
authored
Merge pull request #2 from espressif/master
Merge back from master 2025-07-21
2 parents 4468ffe + 2a9b0d5 commit 9343b39

File tree

143 files changed

+7641
-375
lines changed

Some content is hidden

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

143 files changed

+7641
-375
lines changed

‎.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ include:
3232
- '.gitlab/ci/docs.yml'
3333
- '.gitlab/ci/deploy.yml'
3434
- '.gitlab/ci/target_test.yml'
35+
- '.gitlab/ci/publish_docs_to_cdp.yml'

‎.gitlab/ci/build.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
.build_examples_template: &build_examples_template
1414
<<: *build_template
15+
allow_failure: true # Temporarily disable build CI check, remove this line to restore strict checking after issues are fixed
1516
artifacts:
1617
when: always
1718
paths:
@@ -393,6 +394,16 @@ build_example_check_pedestrian_flow:
393394
variables:
394395
EXAMPLE_DIR: examples/check_pedestrian_flow
395396

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+
396407
build_example_display_lcd_lcd_layer_blending:
397408
extends:
398409
- .build_examples_template
@@ -956,6 +967,14 @@ build_example_usb_host_usb_cdc_basic:
956967
variables:
957968
EXAMPLE_DIR: examples/usb/host/usb_cdc_basic
958969

970+
build_example_usb_host_usb_host_msc_example:
971+
extends:
972+
- .build_examples_template
973+
- .rules:build:example_usb_host_usb_host_msc_example
974+
- .build_idf_version_greater_equal_v5_0
975+
variables:
976+
EXAMPLE_DIR: examples/usb/host/usb_host_msc_example
977+
959978
build_example_usb_host_usb_hub_dual_camera:
960979
extends:
961980
- .build_examples_template
@@ -1522,6 +1541,14 @@ build_components_sensors_imu_lis2dh12_test_apps:
15221541
variables:
15231542
EXAMPLE_DIR: components/sensors/imu/lis2dh12/test_apps
15241543

1544+
build_components_sensors_light_sensor_bh1750_test_apps:
1545+
extends:
1546+
- .build_examples_template
1547+
- .rules:build:components_sensors_light_sensor_bh1750_test_apps
1548+
- .build_idf_active_release_version
1549+
variables:
1550+
EXAMPLE_DIR: components/sensors/light_sensor/bh1750/test_apps
1551+
15251552
build_components_sensors_light_sensor_veml6040_test_apps:
15261553
extends:
15271554
- .build_examples_template

‎.gitlab/ci/publish_docs_to_cdp.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
.publish_to_cdp_template:
2+
stage: deploy
3+
image: $ESP_DOCS_ENV_IMAGE
4+
tags:
5+
- deploy_docs
6+
script:
7+
- git config --global credential.helper store
8+
# Pass GitLab credentials
9+
- echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@{CI_SERVER_HOST}:${CI_SERVER_PORT}/documentation" >> ~/.git-credentials
10+
- TOOLS_URL="${CI_SERVER_PROTOCOL}://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/documentation/documentation-tools.git"
11+
- echo $TOOLS_URL
12+
- git clone -b feature/add_dmf_tool $TOOLS_URL
13+
- ls -al # debugging
14+
# Read labels from MR
15+
- chmod +x ./documentation-tools/dmf-tool/parse_labels.sh
16+
- ./documentation-tools/dmf-tool/parse_labels.sh
17+
- cat parse_labels_output.txt
18+
# Read parsed PRODUCT_NAME
19+
- source parse_labels_output.txt
20+
# Skip if no product to publish
21+
- |
22+
if [ -z "$PRODUCT_NAME" ]; then
23+
echo "No product to publish, exiting job."
24+
exit 0
25+
fi
26+
# Generate DMFs
27+
- python documentation-tools/dmf-tool/generate-dmf.py -p . -t documentation-tools/dmf-tool/dmf-template.yml
28+
- mkdir -p logs
29+
- mv ESP*.yml logs/
30+
- |
31+
if [ -n "$CI_MERGE_REQUEST_IID" ]; then
32+
TRACKING_REF="$CI_PROJECT_URL/-/merge_requests/$CI_MERGE_REQUEST_IID"
33+
else
34+
TRACKING_REF="$CI_PROJECT_URL/-/pipelines/$CI_PIPELINE_ID"
35+
fi
36+
37+
for file in logs/*.yml; do
38+
echo "tracking_reference: $TRACKING_REF" >> "$file"
39+
echo "revision_date: $(date +%Y-%m-%d)" >> "$file"
40+
done
41+
42+
# Publish to CDP
43+
- chmod +x ./documentation-tools/dmf-tool/publish_cdp.sh
44+
- ./documentation-tools/dmf-tool/publish_cdp.sh
45+
artifacts:
46+
when: always
47+
paths:
48+
- 'logs/*.yml'
49+
expire_in: 1 week
50+
51+
publish_to_cdp_qa_with_dmf_files:
52+
needs:
53+
- deploy_docs_preview
54+
extends:
55+
- .publish_to_cdp_template
56+
- .rules:deploy:docs_preview
57+
variables:
58+
MR_BASE_URL: " $CI_MERGE_REQUEST_PROJECT_URL/-/merge_requests"
59+
CDP_API_ENDPOINT: "$CDP_API_ENDPOINT_QA"
60+
61+
publish_to_cdp_prod_with_dmf_files:
62+
needs:
63+
- deploy_docs_production
64+
extends:
65+
- .publish_to_cdp_template
66+
- .rules:deploy:docs_production
67+
variables:
68+
CDP_API_ENDPOINT: "$CDP_API_ENDPOINT_PROD"

‎.gitlab/ci/rules.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,9 @@
484484
.patterns-example_common_components_camera: &patterns-example_common_components_camera
485485
- "examples/common_components/camera/**/*"
486486

487+
.patterns-example_display_lcd_hdmi_video_renderer: &patterns-example_display_lcd_hdmi_video_renderer
488+
- "examples/display/lcd/hdmi_video_renderer/**/*"
489+
487490
.patterns-example_display_lcd_lcd_layer_blending: &patterns-example_display_lcd_lcd_layer_blending
488491
- "examples/display/lcd/lcd_layer_blending/**/*"
489492

@@ -649,6 +652,9 @@
649652
.patterns-example_usb_host_usb_cdc_basic: &patterns-example_usb_host_usb_cdc_basic
650653
- "examples/usb/host/usb_cdc_basic/**/*"
651654

655+
.patterns-example_usb_host_usb_host_msc_example: &patterns-example_usb_host_usb_host_msc_example
656+
- "examples/usb/host/usb_host_msc_example/**/*"
657+
652658
.patterns-example_usb_host_usb_hub_dual_camera: &patterns-example_usb_host_usb_hub_dual_camera
653659
- "examples/usb/host/usb_hub_dual_camera/**/*"
654660

@@ -906,6 +912,12 @@
906912
- <<: *if-dev-push
907913
changes: *patterns-example_check_pedestrian_flow
908914

915+
.rules:build:example_display_lcd_hdmi_video_renderer:
916+
rules:
917+
- <<: *if-protected
918+
- <<: *if-label-build
919+
- <<: *if-trigger-job
920+
909921
.rules:build:example_display_lcd_lcd_layer_blending:
910922
rules:
911923
- <<: *if-protected
@@ -1621,6 +1633,18 @@
16211633
- <<: *if-dev-push
16221634
changes: *patterns-example_usb_host_usb_cdc_basic
16231635

1636+
.rules:build:example_usb_host_usb_host_msc_example:
1637+
rules:
1638+
- <<: *if-protected
1639+
- <<: *if-label-build
1640+
- <<: *if-trigger-job
1641+
- <<: *if-dev-push
1642+
changes: *patterns-build_system
1643+
- <<: *if-dev-push
1644+
changes: *patterns-example_usb_host_usb_host_msc_example
1645+
- <<: *if-dev-push
1646+
changes: *patterns-components_usb_esp_msc_ota
1647+
16241648
.rules:build:example_usb_host_usb_hub_dual_camera:
16251649
rules:
16261650
- <<: *if-protected
@@ -2404,7 +2428,7 @@
24042428
- <<: *if-dev-push
24052429
changes: *patterns-components_sensors_imu_mpu6050
24062430

2407-
.rules:build:components_sensors_light_sensor_bh1750_test:
2431+
.rules:build:components_sensors_light_sensor_bh1750_test_apps:
24082432
rules:
24092433
- <<: *if-protected
24102434
- <<: *if-label-build
@@ -2414,6 +2438,8 @@
24142438
changes: *patterns-build_system
24152439
- <<: *if-dev-push
24162440
changes: *patterns-components_sensors_light_sensor_bh1750
2441+
- <<: *if-dev-push
2442+
changes: *patterns-components_i2c_bus
24172443

24182444
.rules:build:components_sensors_light_sensor_veml6040_test_apps:
24192445
rules:

‎.gitlab/ci/target_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ variables:
22
# There is no target-test-env-v4.4
33
DOCKER_TARGET_TEST_v5_0_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.0:3"
44
DOCKER_TARGET_TEST_v5_1_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.1:1"
5-
DOCKER_TARGET_TEST_v5_4_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.4:1"
5+
DOCKER_TARGET_TEST_v5_4_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.4:2"
66

77
.test_template: &test_template
88
image: DOCKER_TARGET_TEST_v5_0_ENV_IMAGE

‎.lbcf.yml

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
####################################
2+
# Shared Configuration
3+
####################################
4+
5+
#syntax_version: version of this YMAL file. This configuration is shared by all documents in one project.
6+
syntax_version: v0.62
7+
8+
9+
######################################
10+
# Document-specific Configuration
11+
######################################
12+
13+
documents:
14+
#######################################################
15+
# 1. ESP-IoT-Solution Programming Guide, SDK latest
16+
#######################################################
17+
18+
- document_name: ESP-IoT-Solution Programming Guide, SDK latest
19+
doc_id: 9063
20+
translation_docid: 9065
21+
chip_series: all
22+
product_name:
23+
- ESP-IoT-Solution latest
24+
product_name_old_website:
25+
- ESP32-C5
26+
- ESP32-C6
27+
- ESP32-C3
28+
- ESP32-H2
29+
- ESP32
30+
- ESP8684
31+
- ESP32-S2
32+
- ESP32-S3
33+
- ESP32-P4
34+
soc_series_base_filter: all
35+
document_type: guide # or errata, datasheet, reference, book, guide, application note
36+
document_type_old_website: guide
37+
document_status: active
38+
version: Latest # or specific version number
39+
revision_date:
40+
language: en # or cn
41+
document_storage: docs
42+
document_link: https://docs.espressif.com/projects/esp-iot-solution/en/latest/index.html
43+
document_summary: This is the documentation for ESP-IoT-Solution Development Framework.
44+
notify_subscribers: false
45+
visibility_on_website: show # or hide
46+
scheduled_release_date:
47+
document_classification: public
48+
#############################################
49+
# 2. ESP-IoT-Solution 编程指南，SDK latest
50+
#############################################
51+
52+
- document_name: ESP-IoT-Solution 编程指南, SDK latest
53+
doc_id: 9065
54+
translation_docid: 9063
55+
chip_series: all
56+
product_name:
57+
- ESP-IoT-Solution latest
58+
product_name_old_website:
59+
- ESP32-C5
60+
- ESP32-C6
61+
- ESP32-C3
62+
- ESP32-H2
63+
- ESP32
64+
- ESP8684
65+
- ESP32-S2
66+
- ESP32-S3
67+
- ESP32-P4
68+
soc_series_base_filter: all
69+
document_type: guide # or errata, datasheet, reference, book, guide, application note
70+
document_type_old_website: guide
71+
document_status: active
72+
version: Latest # or specific version number
73+
revision_date:
74+
language: cn # or cn
75+
document_storage: docs
76+
document_link: https://docs.espressif.com/projects/esp-iot-solution/zh_CN/latest/index.html
77+
document_summary: 这里是乐鑫 ESP-IoT-Solution 开发框架的文档中心。
78+
notify_subscribers: false
79+
visibility_on_website: show # or hide
80+
scheduled_release_date:
81+
document_classification: public

‎CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ We welcome contributions to the esp-iot-solution project!
66
How to Contribute
77
--------------------
88

9-
Contributions to esp-iot-solution - fixing bugs, adding features, adding documentation - are welcome. We accept contributions via `Github Pull Requests <https://help.github.com/articles/about-pull-requests>`_.
9+
Contributions to esp-iot-solution - fixing bugs, adding features, adding documentation - are welcome. We accept contributions via `GitHub Pull Requests <https://help.github.com/articles/about-pull-requests>`_.
1010

1111
Before Contributing
1212
----------------------

‎components/avi_player/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ChangeLog
22

3+
## v2.0.0 - 2025-06-09
4+
5+
* Support multiple instances.
6+
37
## v1.0.0 - 2024-8-15
48

59
* publish official version

0 commit comments

Comments
 (0)