Skip to content

Commit f681901

Browse files
committed
Merge branch 'submodule-update-v-1-4' into 'main'
connectedhomeip: update submodule to v1.4-branch and change to fix CI builds See merge request app-frameworks/esp-matter!946
2 parents a3dbd43 + 0f45214 commit f681901

File tree

7 files changed

+5
-20
lines changed

7 files changed

+5
-20
lines changed

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ variables:
2525
IDF_CHECKOUT_REF: "v5.2.3"
2626
# This variable represents the short hash of the connectedhomeip submodule.
2727
# Note: Do change this short hash on submodule update MRs.
28-
CHIP_SHORT_HASH: "17b1a38e90"
28+
CHIP_SHORT_HASH: "ce0101d2e2"
2929
DOCKER_IMAGE_NAME: "espressif/chip-idf"
3030

3131
.add_gitlab_ssh_key: &add_gitlab_ssh_key |

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ section in the ESP-Matter Programming Guide.
2828

2929
## Supported ESP-IDF and connectedhomeip versions
3030

31-
- This SDK currently works with commit [17b1a38e90](https://github.com/project-chip/connectedhomeip/tree/17b1a38e90) of connectedhomeip.
31+
- This SDK currently works with commit [ce0101d2e2](https://github.com/project-chip/connectedhomeip/tree/ce0101d2e2) of connectedhomeip.
3232
- 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).
3333

3434
## Documentation

components/esp_matter/esp_matter_core.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ using chip::DeviceLayer::ThreadStackMgr;
5959

6060
#define ESP_MATTER_NVS_PART_NAME CONFIG_ESP_MATTER_NVS_PART_NAME
6161
#define ESP_MATTER_MAX_DEVICE_TYPE_COUNT CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT
62-
63-
// TODO: replace 4 with CONFIG_MAX_GROUPS_PER_FABRIC_PER_ENDPOINT
64-
// This will be fixed in https://github.com/project-chip/connectedhomeip/pull/35394
65-
#define MAX_GROUPS_PER_FABRIC_PER_ENDPOINT 4
62+
#define MAX_GROUPS_PER_FABRIC_PER_ENDPOINT CONFIG_MAX_GROUPS_PER_FABRIC_PER_ENDPOINT
6663

6764
static const char *TAG = "esp_matter_core";
6865
static bool esp_matter_started = false;

components/esp_matter/idf_component.yml

-10
This file was deleted.

components/esp_matter_ota_provider/src/esp_matter_ota_bdx_sender.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ void OtaBdxSender::HandleTransferSessionOutput(TransferSession::OutputEvent &eve
170170
break;
171171
case TransferSession::OutputEventType::kAckEOFReceived: {
172172
ESP_LOGD(TAG, "Transfer completed, got AckEOF");
173-
mStopPolling = true; // Stop polling the TransferSession only after receiving BlockAckEOF
174173
Reset();
175174
break;
176175
}
@@ -205,7 +204,7 @@ void OtaBdxSender::Reset()
205204
{
206205
mFabricIndex.ClearValue();
207206
mNodeId.ClearValue();
208-
mTransfer.Reset();
207+
ResetTransfer();
209208
if (mExchangeCtx != nullptr) {
210209
mExchangeCtx->Close();
211210
mExchangeCtx = nullptr;

connectedhomeip/connectedhomeip

Submodule connectedhomeip updated 1742 files

examples/zap_light/main/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ idf_component_register(SRC_DIRS "."
1616
"${MATTER_SDK_PATH}/src/app/clusters/level-control"
1717
"${MATTER_SDK_PATH}/src/app/clusters/localization-configuration-server"
1818
"${MATTER_SDK_PATH}/src/app/clusters/network-commissioning"
19-
"${MATTER_SDK_PATH}/src/app/clusters/occupancy-sensor-server"
2019
"${MATTER_SDK_PATH}/src/app/clusters/on-off-server"
2120
"${MATTER_SDK_PATH}/src/app/clusters/operational-credentials-server"
2221
"${MATTER_SDK_PATH}/src/app/clusters/ota-requestor"

0 commit comments

Comments
 (0)