diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2e9d7ef0..0aca70b46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ variables: IDF_CHECKOUT_REF: "v5.2.1" # This variable represents the short hash of the connectedhomeip submodule. # Note: Do change this short hash on submodule update MRs. - CHIP_SHORT_HASH: "5bb5c9e2" + CHIP_SHORT_HASH: "13ab158f10" DOCKER_IMAGE_NAME: "espressif/chip-idf" .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." 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 push ${DOCKER_IMAGE_NAME}:${TAG} . + docker push ${DOCKER_IMAGE_NAME}:${TAG} fi parallel: matrix: @@ -180,7 +180,7 @@ build_image: stage: build image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF} 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: - build # runner: `sudo mkdir -p /cache/matter_build/` @@ -381,7 +381,7 @@ pytest_esp32c6_esp_matter_dut: stage: target_test image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF} 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: - build_esp_matter_examples_pytest_C6_idf_v5_1 script: diff --git a/README.md b/README.md index 64c1b2756..7b84575f1 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ section in the ESP-Matter Programming Guide. ## 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). diff --git a/components/esp_matter/esp_matter.h b/components/esp_matter/esp_matter.h index ae21253a4..56536bd44 100644 --- a/components/esp_matter/esp_matter.h +++ b/components/esp_matter/esp_matter.h @@ -131,8 +131,6 @@ enum /** Signals that operational credentials are changed, which may not be persistent. Can be used to affect what is needed for UpdateNOC prior to commit */ kFabricUpdated, - /** Signals that BLE is deinitialized and heap memory is reclaimed */ - kBLEDeinitialized, }; } // DeviceEventType diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip index 5bb5c9e23..13ab158f1 160000 --- a/connectedhomeip/connectedhomeip +++ b/connectedhomeip/connectedhomeip @@ -1 +1 @@ -Subproject commit 5bb5c9e23d532cea40476fc0bd1d3008522792ba +Subproject commit 13ab158f107c06ad9d4a2591aba438d212500b2d diff --git a/examples/controller/sdkconfig.defaults.otbr b/examples/controller/sdkconfig.defaults.otbr index bc343f567..25ed99205 100644 --- a/examples/controller/sdkconfig.defaults.otbr +++ b/examples/controller/sdkconfig.defaults.otbr @@ -84,7 +84,7 @@ CONFIG_SPIRAM=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=512 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 # Enable HKDF for mbedtls