espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

submodule: update to 43aa98c2d3 to support ESP32-P4

Browse Source
This commit is contained in:
WanqQixiang
2024-12-11 15:51:13 +08:00
parent b2d92fdb13
commit 6f5da35df5
12 changed files with 272 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+2 -2
View File
@@ -25,7 +25,7 @@ variables:
IDF_CHECKOUT_REF: "v5.2.3"
# This variable represents the short hash of the connectedhomeip submodule.
# Note: Do change this short hash on submodule update MRs.
CHIP_SHORT_HASH: "9b008bc10d"
CHIP_SHORT_HASH: "43aa98c2d3"
DOCKER_IMAGE_NAME: "espressif/chip-idf"
.add_gitlab_ssh_key: &add_gitlab_ssh_key |
@@ -528,7 +528,7 @@ build_docs:
script:
- cd docs
- pip install -r requirements.txt
- build-docs -t esp32 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 -l en
- build-docs -t esp32 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 esp32p4 -l en
.deploy_docs_template:
stage: docs
README.md
+1 -1
View File
@@ -28,7 +28,7 @@ section in the ESP-Matter Programming Guide.
## Supported ESP-IDF and connectedhomeip versions
- This SDK currently works with commit [9b008bc10d](https://github.com/project-chip/connectedhomeip/tree/9b008bc10d) of connectedhomeip.
- This SDK currently works with commit [43aa98c2d3](https://github.com/project-chip/connectedhomeip/tree/43aa98c2d3) of connectedhomeip.
- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.3](https://github.com/espressif/esp-idf/tree/v5.2.3).
## Documentation
connectedhomeip/connectedhomeip
+1 -1
Submodule connectedhomeip/connectedhomeip updated: 9b008bc10d...43aa98c2d3
docs/_static/esp_sdk_matter_version.js
Vendored
+2 -1
View File
@@ -3,7 +3,7 @@ var DOCUMENTATION_VERSIONS = {
supported_targets: [ "esp32" ]
},
VERSIONS: [
{ name: "latest", has_targets: true, supported_targets: [ "esp32", "esp32c2", "esp32c3", "esp32c6", "esp32s3", "esp32h2" ] },
{ name: "latest", has_targets: true, supported_targets: [ "esp32", "esp32c2", "esp32c3", "esp32c6", "esp32s3", "esp32h2", "esp32p4" ] },
],
IDF_TARGETS: [
{ text: "ESP32", value: "esp32" },
@@ -12,5 +12,6 @@ var DOCUMENTATION_VERSIONS = {
{ text: "ESP32-C3", value: "esp32c3" },
{ text: "ESP32-C6", value: "esp32c6" },
{ text: "ESP32-H2", value: "esp32h2" },
{ text: "ESP32-P4", value: "esp32p4" },
]
};
docs/conf_common.py
+1 -1
View File
@@ -1,7 +1,7 @@
from esp_docs.conf_docs import * # noqa: F403,F401
languages = ['en']
idf_targets = ['esp32', 'esp32s3', 'esp32c2', 'esp32c3', 'esp32c6', 'esp32h2']
idf_targets = ['esp32', 'esp32s3', 'esp32c2', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32p4']
extensions += ['sphinx_copybutton',
# Needed as a trigger for running doxygen
docs/en/developing.rst
+23 -3
View File
@@ -262,6 +262,12 @@ Choose IDF target.
idf.py set-target esp32c6
.. only:: esp32p4
::
idf.py set-target esp32p4
- If IDF target has not been set explicitly, then ``esp32`` is
considered as default.
- The default device for ``esp32``/``esp32c3`` is
@@ -278,6 +284,20 @@ Choose IDF target.
- The configuration of the peripheral components can be found in
``$ESP_MATTER_DEVICE_PATH/esp_matter_device.cmake``.
.. only:: esp32p4
- Setup the slave device for ESP32-P4
It is possible to use Wi-Fi and BLE connection on ESP32-P4 that does not support native Wi-Fi and BLE peripherals, which requires another ESP target with native Wi-Fi support physically connected to the ESP32-P4.
This uses `esp_hosted <https://components.espressif.com/components/espressif/esp_hosted>`__ component, please refer to its documentation for more details.
We recommend to use `ESP32-P4 Function_EV_Board <https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32p4/esp32-p4-function-ev-board/index.html>`__ to build the examples for ESP32-P4. It is composed of an ESP32-P4 and an ESP32-C6.
After setting IDF target, the ``esp_hosted`` will be downloaded at managed_components directory, build and flash the slave device for ESP32-C6. Note that you need the `ESP-Prog Board <https://docs.espressif.com/projects/esp-iot-solution/en/latest/hw-reference/ESP-Prog_guide.html>`__ to flash the slave firmware to ESP32-C6.
::
idf.py -C managed_components/espressif__esp_hosted/slave/ -B build_slave set-target esp32c6
idf.py -C managed_components/espressif__esp_hosted/slave/ -B build_slave build flash monitor
.. only:: esp32c6
- ESP32-C6 supports both the Wi-Fi and IEEE 802.15.4 radio, so you can run Wi-Fi or Thread matter example on it.
@@ -333,7 +353,7 @@ Use ``chip-tool`` in interactive mode to commission the device:
chip-tool interactive start
.. only:: esp32 or esp32s3 or esp32c3 or esp32c2 or esp32c6
.. only:: esp32 or esp32s3 or esp32c3 or esp32c2 or esp32c6 or esp32p4
::
@@ -360,7 +380,7 @@ Above method commissions the device using setup passcode and discriminator. Devi
To Commission the device using manual pairing code 34970112332
.. only:: esp32 or esp32s3 or esp32c3 or esp32c2 or esp32c6
.. only:: esp32 or esp32s3 or esp32c3 or esp32c2 or esp32c6 or esp32p4
::
@@ -387,7 +407,7 @@ Above default manual pairing code contains following values:
To commission the device using QR code MT:Y.K9042C00KA0648G00
.. only:: esp32 or esp32s3 or esp32c3 or esp32c2 or esp32c6
.. only:: esp32 or esp32s3 or esp32c3 or esp32c2 or esp32c6 or esp32p4
::
examples/door_lock/sdkconfig.defaults.esp32p4
+40
View File
@@ -0,0 +1,40 @@
CONFIG_IDF_TARGET="esp32p4"
# Flash size and partition
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
# Enable BLE Host but use remote controller
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_TRANSPORT_UART=n
CONFIG_ESP_ENABLE_BT=y
# Increase main task stack size
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
# Disable Wi-Fi Soft AP
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
# LwIP
CONFIG_LWIP_IPV6_AUTOCONFIG=y
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
# mbedtls
CONFIG_MBEDTLS_HKDF_C=y
# Matter shell
CONFIG_ENABLE_CHIP_SHELL=y
# OTA requestor
CONFIG_ENABLE_OTA_REQUESTOR=y
# Do not deinit BLE after commissioning
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
# ESP32-P4 Function EV Board use ESP32C6 as slave device
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
# BSP button
CONFIG_BSP_BUTTON_1_GPIO=35
examples/generic_switch/sdkconfig.defaults.esp32p4
+40
View File
@@ -0,0 +1,40 @@
CONFIG_IDF_TARGET="esp32p4"
# Flash size and partition
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
# Enable BLE Host but use remote controller
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_TRANSPORT_UART=n
CONFIG_ESP_ENABLE_BT=y
# Increase main task stack size
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
# Disable Wi-Fi Soft AP
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
# LwIP
CONFIG_LWIP_IPV6_AUTOCONFIG=y
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
# mbedtls
CONFIG_MBEDTLS_HKDF_C=y
# Matter shell
CONFIG_ENABLE_CHIP_SHELL=y
# OTA requestor
CONFIG_ENABLE_OTA_REQUESTOR=y
# Do not deinit BLE after commissioning
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
# ESP32-P4 Function EV Board use ESP32C6 as slave device
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
# BSP button
CONFIG_BSP_BUTTON_1_GPIO=35
examples/light/sdkconfig.defaults.esp32p4
+40
View File
@@ -0,0 +1,40 @@
CONFIG_IDF_TARGET="esp32p4"
# Flash size and partition
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
# Enable BLE Host but use remote controller
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_TRANSPORT_UART=n
CONFIG_ESP_ENABLE_BT=y
# Increase main task stack size
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
# Disable Wi-Fi Soft AP
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
# LwIP
CONFIG_LWIP_IPV6_AUTOCONFIG=y
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
# mbedtls
CONFIG_MBEDTLS_HKDF_C=y
# Matter shell
CONFIG_ENABLE_CHIP_SHELL=y
# OTA requestor
CONFIG_ENABLE_OTA_REQUESTOR=y
# Do not deinit BLE after commissioning
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
# ESP32-P4 Function EV Board use ESP32C6 as slave device
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
# BSP button
CONFIG_BSP_BUTTON_1_GPIO=35
examples/light_switch/sdkconfig.defaults.esp32p4
+41
View File
@@ -0,0 +1,41 @@
CONFIG_IDF_TARGET="esp32p4"
# Flash size and partition
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
# Enable BLE Host but use remote controller
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_TRANSPORT_UART=n
CONFIG_ESP_ENABLE_BT=y
# Increase main task stack size
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
# Disable Wi-Fi Soft AP
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
# LwIP
CONFIG_LWIP_IPV6_AUTOCONFIG=y
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
# mbedtls
CONFIG_MBEDTLS_HKDF_C=y
# Matter shell
CONFIG_ENABLE_CHIP_SHELL=y
# OTA requestor
CONFIG_ENABLE_OTA_REQUESTOR=y
# Do not deinit BLE after commissioning
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
# ESP32-P4 Function EV Board use ESP32C6 as slave device
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
# BSP button
CONFIG_BSP_BUTTONS_NUM=1
CONFIG_BSP_BUTTON_1_GPIO=35
examples/multiple_on_off_plugin_units/sdkconfig.defaults.esp32p4
+40
View File
@@ -0,0 +1,40 @@
CONFIG_IDF_TARGET="esp32p4"
# Flash size and partition
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
# Enable BLE Host but use remote controller
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_TRANSPORT_UART=n
CONFIG_ESP_ENABLE_BT=y
# Increase main task stack size
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
# Disable Wi-Fi Soft AP
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
# LwIP
CONFIG_LWIP_IPV6_AUTOCONFIG=y
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
# mbedtls
CONFIG_MBEDTLS_HKDF_C=y
# Matter shell
CONFIG_ENABLE_CHIP_SHELL=y
# OTA requestor
CONFIG_ENABLE_OTA_REQUESTOR=y
# Do not deinit BLE after commissioning
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
# ESP32-P4 Function EV Board use ESP32C6 as slave device
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
# BSP button
CONFIG_BSP_BUTTON_1_GPIO=35
examples/refrigerator/sdkconfig.defaults.esp32p4
+41
View File
@@ -0,0 +1,41 @@
CONFIG_IDF_TARGET="esp32p4"
# Flash size and partition
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
# Enable BLE Host but use remote controller
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_TRANSPORT_UART=n
CONFIG_ESP_ENABLE_BT=y
# Increase main task stack size
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
# Disable Wi-Fi Soft AP
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
# LwIP
CONFIG_LWIP_IPV6_AUTOCONFIG=y
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
# mbedtls
CONFIG_MBEDTLS_HKDF_C=y
# Matter shell
CONFIG_ENABLE_CHIP_SHELL=y
# OTA requestor
CONFIG_ENABLE_OTA_REQUESTOR=y
# Do not deinit BLE after commissioning
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
# ESP32-P4 Function EV Board use ESP32C6 as slave device
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
# BSP button
CONFIG_BSP_BUTTONS_NUM=1
CONFIG_BSP_BUTTON_1_GPIO=35