Skip to content

Commit c4da332

Browse files
authored
Merge branch 'espressif:master' into master
2 parents 0c24f96 + 800f141 commit c4da332

File tree

1,027 files changed

+17921
-29500
lines changed

Some content is hidden

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

1,027 files changed

+17921
-29500
lines changed

.github/ISSUE_TEMPLATE/02_runtime_bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ body:
2626
id: chip_revision
2727
attributes:
2828
label: Espressif SoC revision.
29-
description: On which Espressif SoC revision does your application run on? Run `esptool chip_id` to find it.
29+
description: On which Espressif SoC revision does your application run on? Run `esptool chip-id` to find it.
3030
placeholder: ex. ESP32-C3 (QFN32) (revision v0.3)
3131
validations:
3232
required: true

.gitlab/CODEOWNERS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@
162162
/components/usb/ @esp-idf-codeowners/peripherals/usb
163163
/components/vfs/ @esp-idf-codeowners/storage
164164
/components/wear_levelling/ @esp-idf-codeowners/storage
165-
/components/wifi_provisioning/ @esp-idf-codeowners/app-utilities/provisioning
166165
/components/wpa_supplicant/ @esp-idf-codeowners/wifi @esp-idf-codeowners/app-utilities/mbedtls
167166
/components/xtensa/ @esp-idf-codeowners/system
168167

@@ -204,7 +203,6 @@
204203
/examples/peripherals/usb/ @esp-idf-codeowners/peripherals @esp-idf-codeowners/peripherals/usb
205204
/examples/phy/ @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
206205
/examples/protocols/ @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
207-
/examples/provisioning/ @esp-idf-codeowners/app-utilities/provisioning
208206
/examples/security/ @esp-idf-codeowners/security
209207
/examples/storage/ @esp-idf-codeowners/storage
210208
/examples/system/ @esp-idf-codeowners/system
@@ -219,7 +217,6 @@
219217
/tools/cmake/ @esp-idf-codeowners/build-config
220218
/tools/cmake/toolchain-*.cmake @esp-idf-codeowners/toolchain
221219
/tools/esp_app_trace/ @esp-idf-codeowners/debugging
222-
/tools/esp_prov/ @esp-idf-codeowners/app-utilities
223220
/tools/gdb_panic_server.py @esp-idf-codeowners/debugging
224221
/tools/kconfig*/ @esp-idf-codeowners/build-config
225222
/tools/ldgen/ @esp-idf-codeowners/build-config
@@ -234,7 +231,6 @@
234231
/tools/test_apps/components/test_utils/ @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
235232
/tools/test_apps/configs/ @esp-idf-codeowners/system
236233
/tools/test_apps/linux_compatible/ @esp-idf-codeowners/system
237-
/tools/test_apps/peripherals/ @esp-idf-codeowners/peripherals
238234
/tools/test_apps/phy/ @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
239235
/tools/test_apps/protocols/ @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
240236
/tools/test_apps/security/ @esp-idf-codeowners/security

.gitlab/ci/host-test.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -188,20 +188,21 @@ test_tools:
188188
INSTALL_EXTRA_TOOLS: "qemu-xtensa qemu-riscv32" # for test_idf_qemu.py
189189
script:
190190
- stat=0
191+
- run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
191192
- cd ${IDF_PATH}/tools/ci/test_autocomplete
192-
- pytest --noconftest test_autocomplete.py --junitxml=${IDF_PATH}/XUNIT_AUTOCOMP.xml || stat=1
193+
- run_cmd pytest --noconftest test_autocomplete.py --junitxml=${IDF_PATH}/XUNIT_AUTOCOMP.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME} || stat=1
193194
- cd ${IDF_PATH}/tools/test_idf_py
194-
- pytest --noconftest test_idf_py.py --junitxml=${IDF_PATH}/XUNIT_IDF_PY.xml || stat=1
195-
- pytest --noconftest test_hints.py --junitxml=${IDF_PATH}/XUNIT_HINTS.xml || stat=1
196-
- pytest --noconftest test_idf_qemu.py --junitxml=${IDF_PATH}/XUNIT_IDF_PY_QEMU.xml || stat=1
195+
- run_cmd pytest --noconftest test_idf_py.py --junitxml=${IDF_PATH}/XUNIT_IDF_PY.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME} || stat=1
196+
- run_cmd pytest --noconftest test_hints.py --junitxml=${IDF_PATH}/XUNIT_HINTS.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME} || stat=1
197+
- run_cmd pytest --noconftest test_idf_qemu.py --junitxml=${IDF_PATH}/XUNIT_IDF_PY_QEMU.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME} || stat=1
197198
- cd ${IDF_PATH}/tools/test_bsasm
198-
- pytest --noconftest test_bsasm.py --junitxml=${IDF_PATH}/XUNIT_BSASM.xml || stat=1
199+
- run_cmd pytest --noconftest test_bsasm.py --junitxml=${IDF_PATH}/XUNIT_BSASM.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME} || stat=1
199200
- cd ${IDF_PATH}/tools/test_mkdfu
200-
- pytest --noconftest test_mkdfu.py --junitxml=${IDF_PATH}/XUNIT_MKDFU.xml || stat=1
201+
- run_cmd pytest --noconftest test_mkdfu.py --junitxml=${IDF_PATH}/XUNIT_MKDFU.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME} || stat=1
201202
- cd ${IDF_PATH}/tools/test_idf_size
202-
- pytest --noconftest test_idf_size.py --junitxml=${IDF_PATH}/XUNIT_IDF_SIZE.xml || stat=1
203+
- run_cmd pytest --noconftest test_idf_size.py --junitxml=${IDF_PATH}/XUNIT_IDF_SIZE.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME} || stat=1
203204
- cd ${IDF_PATH}/tools/test_idf_diag
204-
- pytest --noconftest test_idf_diag.py --junitxml=${IDF_PATH}/XUNIT_IDF_DIAG.xml || stat=1
205+
- run_cmd pytest --noconftest test_idf_diag.py --junitxml=${IDF_PATH}/XUNIT_IDF_DIAG.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME} || stat=1
205206
- cd ${IDF_PATH}
206207
- shellcheck -s sh tools/detect_python.sh || stat=1
207208
- shellcheck -s bash tools/detect_python.sh || stat=1
@@ -218,13 +219,6 @@ test_split_path_by_spaces:
218219
- cd ${IDF_PATH}/tools
219220
- python -m unittest split_paths_by_spaces.py
220221

221-
test_mqtt_on_host:
222-
extends: .host_test_template
223-
script:
224-
- cd ${IDF_PATH}/components/mqtt/esp-mqtt/host_test
225-
- idf.py build
226-
- LSAN_OPTIONS=verbosity=1:log_threads=1 build/host_mqtt_client_test.elf
227-
228222
test_transport_on_host:
229223
extends: .host_test_template
230224
allow_failure: true # IDFCI-2781 [v5.5, v5.4] test_transport_on_host fails on ubuntu 24.04

.gitlab/ci/test-win.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ test_tools_win:
6565
- .\export.ps1
6666
- python "${SUBMODULE_FETCH_TOOL}" -s "all"
6767
- cd ${IDF_PATH}/tools/test_idf_py
68-
- pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${IDF_PATH}/XUNIT_RESULT.xml
68+
- idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
69+
- pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${IDF_PATH}/XUNIT_RESULT.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
6970

7071
# Build tests
7172
.test_build_system_template_win:
@@ -82,7 +83,8 @@ test_tools_win:
8283
- . .\export.ps1
8384
- python "${SUBMODULE_FETCH_TOOL}" -s "all"
8485
- cd ${IDF_PATH}\tools\test_build_system
85-
- pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml
86+
- idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
87+
- pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
8688

8789
pytest_build_system_win:
8890
extends:
@@ -129,4 +131,5 @@ pytest_build_system_win_minimal_cmake:
129131
}
130132
- python "${SUBMODULE_FETCH_TOOL}" -s "all"
131133
- cd ${IDF_PATH}\tools\test_build_system
132-
- pytest -k cmake --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml
134+
- idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
135+
- pytest -k cmake --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}

COMPATIBILITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ NOTE: This document on release branches may be out-of-date. Check the [Compatibi
1010

1111
See [Compatibility Advisory for Chip Revision Numbering Scheme](https://www.espressif.com/sites/default/files/advisory_downloads/AR2022-005%20Compatibility%20Advisory%20for%20Chip%20Revision%20Numbering%20%20Scheme.pdf) on the versioning of Espressif SoC revisions.
1212

13-
You can run `esptool chip_id` to detect the series and revision of an SoC. See [SoC Errata](https://www.espressif.com/en/support/documents/technical-documents?keys=errata) for more on how to distinguish between chip revisions, and the improvements provided by chip revisions. And run `idf.py --version` to know the version of current ESP-IDF.
13+
You can run `esptool chip-id` to detect the series and revision of an SoC. See [SoC Errata](https://www.espressif.com/en/support/documents/technical-documents?keys=errata) for more on how to distinguish between chip revisions, and the improvements provided by chip revisions. And run `idf.py --version` to know the version of current ESP-IDF.
1414

1515
## ESP-IDF Support for Different Chip Revisions
1616

COMPATIBILITY_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
有关乐鑫芯片版本的编码方式,请参考 [关于芯片版本 (Chip Revision) 编码方式的兼容性公告](https://www.espressif.com/sites/default/files/advisory_downloads/AR2022-005%20%E5%85%B3%E4%BA%8E%E8%8A%AF%E7%89%87%E7%89%88%E6%9C%AC%E7%BC%96%E7%A0%81%E6%96%B9%E5%BC%8F%20%28Chip%20Revision%29%20%E7%9A%84%E5%85%BC%E5%AE%B9%E6%80%A7%E5%85%AC%E5%91%8A.pdf)
1212

13-
运行 `esptool chip_id` 可查看芯片系列及其版本。有关区分芯片版本及版本改进内容的更多信息,请参考 [芯片勘误表](https://www.espressif.com.cn/zh-hans/support/documents/technical-documents?keys=%E5%8B%98%E8%AF%AF%E8%A1%A8)。运行 `idf.py --version` 可查看当前的 ESP-IDF 版本。
13+
运行 `esptool chip-id` 可查看芯片系列及其版本。有关区分芯片版本及版本改进内容的更多信息,请参考 [芯片勘误表](https://www.espressif.com.cn/zh-hans/support/documents/technical-documents?keys=%E5%8B%98%E8%AF%AF%E8%A1%A8)。运行 `idf.py --version` 可查看当前的 ESP-IDF 版本。
1414

1515
## ESP-IDF 对各芯片版本的支持
1616

Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ mainmenu "Espressif IoT Development Framework Configuration"
219219

220220
When loading the BIN with UART, the ROM will jump to ram and run the app after finishing the ROM
221221
startup code, so there's no additional startup initialization required. You can use the
222-
`load_ram` in esptool.py to load the generated .bin file into ram and execute.
222+
`load-ram` in esptool to load the generated .bin file into ram and execute.
223223

224224
Example:
225-
esptool.py --chip {chip} -p {port} -b {baud} --no-stub load_ram {app.bin}
225+
esptool --chip {chip} -p {port} -b {baud} --no-stub load-ram {app.bin}
226226

227227
Recommended sdkconfig.defaults for building loadable ELF files is as follows.
228228
CONFIG_APP_BUILD_TYPE_RAM is required, other options help reduce application
@@ -575,7 +575,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
575575

576576
config COMPILER_DISABLE_DEFAULT_ERRORS
577577
bool "Disable errors for default warnings"
578-
default "y"
578+
default "n"
579579
help
580580
Enable this option if you do not want default warnings to be considered as errors,
581581
especially when updating IDF.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ See the Getting Started guide links above for a detailed setup guide. This is a
8383

8484
## Flashing the Project
8585

86-
When the build finishes, it will print a command line to use esptool.py to flash the chip. However you can also do this automatically by running:
86+
When the build finishes, it will print a command line to use `esptool` to flash the chip. However you can also do this automatically by running:
8787

8888
`idf.py -p PORT flash`
8989

README_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ESP-IDF 中的子模块采用相对路径([详见 .gitmodules 文件](.gitmodu
8383

8484
## 烧写项目
8585

86-
当构建结束,终端会打印出一条命令行,告知如何使用 esptool.py 工具烧写项目到芯片中。但你也可以运行下面这条命令来自动烧写:
86+
当构建结束,终端会打印出一条命令行,告知如何使用 `esptool` 工具烧写项目到芯片中。但你也可以运行下面这条命令来自动烧写:
8787

8888
`idf.py -p PORT flash`
8989

0 commit comments

Comments
 (0)