Skip to content

Commit d3b747b

Browse files
authored
Merge branch 'master' into feature/closure_device_type_xml_generation
2 parents 5f59e1d + c82226b commit d3b747b

13 files changed

+25
-12
lines changed

.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
if: github.actor != 'restyled-io[bot]'
4242

4343
container:
44-
image: ghcr.io/project-chip/chip-build-efr32:112
44+
image: ghcr.io/project-chip/chip-build-efr32:115
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

.gitmodules

+3-3
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,17 @@
213213
[submodule "third_party/silabs/simplicity_sdk"]
214214
path = third_party/silabs/simplicity_sdk
215215
url = https://github.com/SiliconLabs/simplicity_sdk.git
216-
branch = v2024.6.2
216+
branch = v2024.12.1-0
217217
platforms = silabs
218218
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
219219
path = third_party/silabs/wiseconnect-wifi-bt-sdk
220220
url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
221-
branch = 2.10.3
221+
branch = 2.11.2
222222
platforms = silabs
223223
[submodule "third_party/silabs/wifi_sdk"]
224224
path = third_party/silabs/wifi_sdk
225225
url = https://github.com/SiliconLabs/wiseconnect.git
226-
branch = v3.3.3
226+
branch = v3.4.1
227227
platforms = silabs
228228
[submodule "editline"]
229229
path = third_party/editline/repo

config/common/cmake/chip_gn.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ macro(matter_build target)
133133
--root-target=${GN_ROOT_TARGET}
134134
--dotfile=${GN_ROOT_TARGET}/.gn
135135
--script-executable=${Python3_EXECUTABLE}
136-
gen --check --fail-on-unused-args ${CMAKE_CURRENT_BINARY_DIR}
136+
gen --check --fail-on-unused-args --add-export-compile-commands=*
137+
${CMAKE_CURRENT_BINARY_DIR}
137138
COMMAND ninja
138139
COMMAND ${CMAKE_COMMAND} -E echo "Matter library build complete"
139140
INSTALL_COMMAND ""

examples/chef/common/chef-operational-state-delegate-impl.h

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <app-common/zap-generated/cluster-objects.h>
2222
#include <app/clusters/operational-state-server/operational-state-server.h>
2323

24+
#include <app/util/attribute-metadata.h>
2425
#include <protocols/interaction_model/StatusCode.h>
2526

2627
#ifdef MATTER_DM_PLUGIN_OPERATIONAL_STATE_SERVER

examples/chef/common/chef-rvc-operational-state-delegate.h

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <app-common/zap-generated/cluster-objects.h>
2222
#include <app/clusters/operational-state-server/operational-state-server.h>
2323

24+
#include <app/util/attribute-metadata.h>
2425
#include <protocols/interaction_model/StatusCode.h>
2526

2627
#ifdef MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER

examples/platform/silabs/matter-platform.slcp

+2
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ configuration:
113113
- {name: SL_BT_RTOS_LINK_LAYER_TASK_STACK_SIZE, value: 1024}
114114
- {name: SL_BT_RTOS_HOST_STACK_TASK_STACK_SIZE, value: 2048}
115115
- {name: SL_BT_RTOS_EVENT_HANDLER_STACK_SIZE, value: 1536}
116+
- {name: SL_MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS, value: 1}
117+
- {name: SL_OPENTHREAD_ENABLE_SERIAL_TASK, value: 0}
116118

117119
template_contribution:
118120
- name: mbedtls_ssl_content_len_in_requirement

examples/platform/silabs/provision/ProvisionStorageFlash.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
#include <platform/silabs/multi-ota/OtaTlvEncryptionKey.h>
3030
#endif // SL_MATTER_ENABLE_OTA_ENCRYPTION
3131

32+
#if !SL_MATTER_GN_BUILD
33+
#include <sl_matter_provision_config.h>
34+
#endif
35+
3236
using namespace chip::Credentials;
3337

3438
#if SLI_SI91X_MCU_INTERFACE

src/setup_payload/tests/TestAdditionalDataPayload.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,12 @@ CHIP_ERROR ParseAdditionalDataPayload(const char * additionalDataPayload, size_t
9393
return CHIP_ERROR_INVALID_STRING_LENGTH;
9494
}
9595
size_t additionalDataPayloadBytesLength = additionalDataPayloadLength / 2;
96-
std::unique_ptr<uint8_t[]> additionalDataPayloadBytes(new uint8_t[additionalDataPayloadBytesLength]);
96+
97+
std::vector<uint8_t> additionalDataPayloadBytes;
98+
additionalDataPayloadBytes.resize(additionalDataPayloadBytesLength);
9799
size_t bufferSize = chip::Encoding::HexToBytes(additionalDataPayload, additionalDataPayloadLength,
98-
additionalDataPayloadBytes.get(), additionalDataPayloadBytesLength);
99-
return AdditionalDataPayloadParser(additionalDataPayloadBytes.get(), bufferSize).populatePayload(outPayload);
100+
additionalDataPayloadBytes.data(), additionalDataPayloadBytesLength);
101+
return AdditionalDataPayloadParser(additionalDataPayloadBytes.data(), bufferSize).populatePayload(outPayload);
100102
}
101103

102104
class TestAdditionalDataPayload : public ::testing::Test

third_party/silabs/efr32_sdk.gni

+2
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ template("efr32_sdk") {
172172
"${efr32_sdk_root}/platform/bootloader",
173173
"${efr32_sdk_root}/platform/bootloader/config",
174174
"${efr32_sdk_root}/platform/bootloader/config/btl_interface",
175+
"${efr32_sdk_root}/platform/bootloader/core/flash",
175176
"${efr32_sdk_root}/platform/bootloader/api",
176177
"${efr32_sdk_root}/platform/CMSIS/Core/Include",
177178
"${efr32_sdk_root}/platform/CMSIS/RTOS2/Include",
@@ -724,6 +725,7 @@ template("efr32_sdk") {
724725
"${efr32_sdk_root}/platform/CMSIS/RTOS2/Source/os_systick.c",
725726
"${efr32_sdk_root}/platform/bootloader/api/btl_interface.c",
726727
"${efr32_sdk_root}/platform/bootloader/api/btl_interface_storage.c",
728+
"${efr32_sdk_root}/platform/bootloader/core/flash/btl_internal_flash.c",
727729
"${efr32_sdk_root}/platform/bootloader/security/sha/crypto_sha.c",
728730
"${efr32_sdk_root}/platform/common/src/sl_core_cortexm.c",
729731
"${efr32_sdk_root}/platform/common/src/sl_slist.c",

third_party/silabs/matter_support

Submodule matter_support updated 195 files

third_party/silabs/simplicity_sdk

Submodule simplicity_sdk updated 6579 files

third_party/silabs/wifi_sdk

Submodule wifi_sdk updated 794 files

0 commit comments

Comments
 (0)