Skip to content

Commit 101bb17

Browse files
authored
Merge branch 'master' into granbery/power_topology_test_scripts
2 parents f8f2877 + 573511d commit 101bb17

File tree

65 files changed

+3493
-677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3493
-677
lines changed

.github/workflows/examples-efr32.yaml

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

4040
container:
41-
image: ghcr.io/project-chip/chip-build-efr32:35
41+
image: ghcr.io/project-chip/chip-build-efr32:36
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-latest
6969

7070
container:
71-
image: ghcr.io/project-chip/chip-build-efr32:35
71+
image: ghcr.io/project-chip/chip-build-efr32:36
7272
steps:
7373
- name: Checkout
7474
uses: actions/checkout@v4

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
[submodule "third_party/silabs/gecko_sdk"]
240240
path = third_party/silabs/gecko_sdk
241241
url = https://github.com/SiliconLabs/gecko_sdk.git
242-
branch = v4.4.0
242+
branch = v4.4.1
243243
platforms = silabs
244244
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
245245
path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -249,7 +249,7 @@
249249
[submodule "third_party/silabs/wifi_sdk"]
250250
path = third_party/silabs/wifi_sdk
251251
url = https://github.com/SiliconLabs/wiseconnect.git
252-
branch = v3.1.1
252+
branch = v3.1.3
253253
platforms = silabs
254254
[submodule "editline"]
255255
path = third_party/editline/repo

docs/guides/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
## Development Guides
3535

3636
- [Access Control](./access-control-guide.md)
37-
- [IP Commissioning](./ip_commissioning.md)
3837

3938
## Setup Guides
4039

docs/guides/index.md

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ ti/ti_platform_overview
5555
## Development Guides
5656

5757
- [Access Control](./access-control-guide.md)
58-
- [IP Commissioning](./ip_commissioning.md)
5958
- [Matter IDL tooling and validation](./matter_idl_tooling.md)
6059

6160
## Setup Guides

docs/guides/ip_commissioning.md

-82
This file was deleted.

examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,7 @@ cluster Thermostat = 513 {
15951595
}
15961596

15971597
/** An interface for controlling a fan in a heating/cooling system. */
1598-
provisional cluster FanControl = 514 {
1598+
cluster FanControl = 514 {
15991599
revision 4;
16001600

16011601
enum AirflowDirectionEnum : enum8 {

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -5268,7 +5268,7 @@ cluster Thermostat = 513 {
52685268
}
52695269

52705270
/** An interface for controlling a fan in a heating/cooling system. */
5271-
provisional cluster FanControl = 514 {
5271+
cluster FanControl = 514 {
52725272
revision 4;
52735273

52745274
enum AirflowDirectionEnum : enum8 {

examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -3861,7 +3861,7 @@ cluster Thermostat = 513 {
38613861
}
38623862

38633863
/** An interface for controlling a fan in a heating/cooling system. */
3864-
provisional cluster FanControl = 514 {
3864+
cluster FanControl = 514 {
38653865
revision 4;
38663866

38673867
enum AirflowDirectionEnum : enum8 {

examples/chef/chef.py

+1
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,7 @@ def main() -> int:
801801
'import("${chip_root}/config/standalone/args.gni")',
802802
'chip_shell_cmd_server = false',
803803
'chip_build_libshell = true',
804+
'chip_enable_openthread = false',
804805
'chip_config_network_layer_ble = false',
805806
'chip_device_project_config_include = "<CHIPProjectAppConfig.h>"',
806807
'chip_project_config_include = "<CHIPProjectAppConfig.h>"',

examples/chef/common/chef-channel-manager.cpp

-226
This file was deleted.

0 commit comments

Comments
 (0)