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

update connectedhomeip to 13ab158f10 to fix some issue

Browse Source
This commit is contained in:
liyashuai
2024-05-07 10:51:46 +08:00
parent 3fe308ff1e
commit 95cbad99aa
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+4 -4
View File
@@ -25,7 +25,7 @@ variables:
IDF_CHECKOUT_REF: "v5.2.1" IDF_CHECKOUT_REF: "v5.2.1"
# This variable represents the short hash of the connectedhomeip submodule. # This variable represents the short hash of the connectedhomeip submodule.
# Note: Do change this short hash on submodule update MRs. # Note: Do change this short hash on submodule update MRs.
CHIP_SHORT_HASH: "5bb5c9e2" CHIP_SHORT_HASH: "13ab158f10"
DOCKER_IMAGE_NAME: "espressif/chip-idf" DOCKER_IMAGE_NAME: "espressif/chip-idf"
.add_gitlab_ssh_key: &add_gitlab_ssh_key | .add_gitlab_ssh_key: &add_gitlab_ssh_key |
@@ -167,7 +167,7 @@ build_image:
echo "Differences detected. The docker image with ${TAG} is not present on docker hub. Triggering docker build due to submdoule update or idf version change in CI." echo "Differences detected. The docker image with ${TAG} is not present on docker hub. Triggering docker build due to submdoule update or idf version change in CI."
cd ${ESP_MATTER_PATH}/tools/docker/chip_idf cd ${ESP_MATTER_PATH}/tools/docker/chip_idf
docker build --build-arg CHIP_CHECKOUT_REF=${chip_head_commit} --build-arg IDF_CHECKOUT_REF=${IDF_VERSION} --tag ${DOCKER_IMAGE_NAME}:${TAG} . docker build --build-arg CHIP_CHECKOUT_REF=${chip_head_commit} --build-arg IDF_CHECKOUT_REF=${IDF_VERSION} --tag ${DOCKER_IMAGE_NAME}:${TAG} .
docker push ${DOCKER_IMAGE_NAME}:${TAG} . docker push ${DOCKER_IMAGE_NAME}:${TAG}
fi fi
parallel: parallel:
matrix: matrix:
@@ -180,7 +180,7 @@ build_image:
stage: build stage: build
image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF} image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF}
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push" || $CI_COMMIT_BRANCH == "main" - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push" || $CI_COMMIT_BRANCH == "main"
tags: tags:
- build - build
# runner: `sudo mkdir -p /cache/matter_build/` # runner: `sudo mkdir -p /cache/matter_build/`
@@ -381,7 +381,7 @@ pytest_esp32c6_esp_matter_dut:
stage: target_test stage: target_test
image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF} image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF}
rules: rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push"
needs: needs:
- build_esp_matter_examples_pytest_C6_idf_v5_1 - build_esp_matter_examples_pytest_C6_idf_v5_1
script: script:
README.md
+1 -1
View File
@@ -28,7 +28,7 @@ section in the ESP-Matter Programming Guide.
## Supported ESP-IDF and connectedhomeip versions ## Supported ESP-IDF and connectedhomeip versions
- This SDK currently works with commit [5bb5c9e23d](https://github.com/project-chip/connectedhomeip/tree/d38a6496c3) of connectedhomeip. - This SDK currently works with commit [13ab158f10](https://github.com/project-chip/connectedhomeip/tree/13ab158f10) of connectedhomeip.
- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.1](https://github.com/espressif/esp-idf/tree/v5.2.1). - For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.1](https://github.com/espressif/esp-idf/tree/v5.2.1).
components/esp_matter/esp_matter.h
-2
View File
@@ -131,8 +131,6 @@ enum
/** Signals that operational credentials are changed, which may not be persistent. /** Signals that operational credentials are changed, which may not be persistent.
Can be used to affect what is needed for UpdateNOC prior to commit */ Can be used to affect what is needed for UpdateNOC prior to commit */
kFabricUpdated, kFabricUpdated,
/** Signals that BLE is deinitialized and heap memory is reclaimed */
kBLEDeinitialized,
}; };
} // DeviceEventType } // DeviceEventType
connectedhomeip/connectedhomeip
+1 -1
Submodule connectedhomeip/connectedhomeip updated: 5bb5c9e23d...13ab158f10
examples/controller/sdkconfig.defaults.otbr
+1 -1
View File
@@ -84,7 +84,7 @@ CONFIG_SPIRAM=y
CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_SPEED_80M=y
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=512 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=512
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192
CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=n
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
# Enable HKDF for mbedtls # Enable HKDF for mbedtls