Skip to content

Merge main branch to release 2.9-1.6 branch #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Rohan Sahay (rosahay-silabs) wants to merge 7 commits into from
Closed

Merge main branch to release 2.9-1.6 branch #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c92b65
[main] Update matter_sdk submodule to 805db3479d (#639)
silabs-matter-ci-bot[bot] Apr 24, 2026
78aa44f
NOJIRA: run compatibility branch (#659)
silabs-ArghyaD Apr 24, 2026
c8a6e02
MATTER-5911: Standardize app naming per spec (#599)
miduggan24 Apr 28, 2026
9d79a23
Bump third_party/matter_support from `9bbda32` to `6803ba5` (#665)
dependabot[bot] Apr 28, 2026
13b475c
MATTER-5912: Standardize app README files per spec (#618)
miduggan24 Apr 29, 2026
37f9471
Update matter_sdk (805db3479d808609c0540a4aa8b34cdc71a5a134)
rosahay-silabs Apr 30, 2026
8f28475
Merge remote-tracking branch 'origin/main' into merge_main_to_release…
rosahay-silabs Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/silabs-builds-917-ncp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
]
},
"custom-sqa": {
"lock-app": [
"lock_app": [
{
"boards": ["brd4187c"],
"arguments": ["--output_suffix ota-2", "-pids application",
Expand Down
2 changes: 1 addition & 1 deletion .github/silabs-builds-mg24-ota.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"standard": {
"window-app": [
"window_app": [
{
"boards": ["brd4337a"],
"arguments": [
Expand Down
24 changes: 12 additions & 12 deletions .github/silabs-builds-mg24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"arguments": ["--output_suffix copy-sources", "--copy-sources"]
}
],
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd4187c"],
"arguments": ["--output_suffix sequential","--with_app matter_zigbee_sequential"]
Expand All @@ -21,7 +21,7 @@
"arguments": ["--output_suffix sequential-copy-sources","--with_app matter_zigbee_sequential", "--copy-sources"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4187c"],
"arguments": ["--output_suffix peripherals","--with_app matter_peripherals"]
Expand Down Expand Up @@ -49,7 +49,7 @@
"arguments": ["--output_suffix copy-sources", "--copy-sources"]
}
],
"lighting-app": [
"lighting_app": [
{
"boards": ["brd4187c"],
"arguments": ["--output_suffix lto", "--with_app matter_no_debug,toolchain_gcc_lto", "--without_app matter_shell,matter_qr_code,matter_lcd", "-pids application"]
Expand All @@ -59,13 +59,13 @@
"arguments": ["--output_suffix multipan","--with_app matter_multipan_internal"]
}
],
"lock-app": [
"lock_app": [
{
"boards": ["brd4187c"],
"arguments": ["--output_suffix lto", "--with_app matter_no_debug,toolchain_gcc_lto", "--without_app matter_shell,matter_qr_code,matter_lcd", "-pids application"]
}
],
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd4186c", "brd4187c", "brd2601b"],
"arguments": ["--output_suffix sequential","--with_app matter_zigbee_sequential"]
Expand All @@ -79,7 +79,7 @@
"arguments": ["--output_suffix lto", "--with_app matter_no_debug,toolchain_gcc_lto", "--without_app matter_shell,matter_qr_code,matter_lcd", "-pids application"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4187c"],
"arguments": ["--output_suffix peripherals","--with_app matter_peripherals"]
Expand All @@ -105,7 +105,7 @@
]
},
"custom-sqa": {
"lock-app" :[
"lock_app" :[
{
"boards": ["brd4186c"],
"arguments": ["--output_suffix low-power",
Expand Down Expand Up @@ -150,7 +150,7 @@
"--with_app matter_multi_image_ota,matter_multi_image_ota_encryption,matter_multi_image_custom_processor"]
}
],
"lighting-app": [
"lighting_app": [
{
"boards": ["brd4187c"],
"arguments": ["--output_suffix ota-2", "-pids application",
Expand Down Expand Up @@ -179,7 +179,7 @@
"--with_app matter_multi_image_ota,matter_multi_image_ota_encryption,matter_multi_image_custom_processor"]
}
],
"light-switch-app": [
"light_switch_app": [
{
"boards": ["brd4186c"],
"arguments": ["--output_suffix low-power",
Expand Down Expand Up @@ -207,7 +207,7 @@
"'--configuration CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\"2\"'"]
}
],
"multi-sensor-app": [
"multi_sensor_app": [
{
"boards": ["brd4186c"],
"arguments": ["--output_suffix low-power",
Expand All @@ -230,7 +230,7 @@
"'--configuration CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\"2\"'"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4187c"],
"arguments": ["--output_suffix peripherals-ota-2","--with_app matter_peripherals", "-pids application",
Expand All @@ -242,7 +242,7 @@
"'--configuration CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:3,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\"3\"'"]
}
],
"closure-app": [
"closure_app": [
{
"boards": ["brd4187c"],
"arguments": ["--output_suffix ota-2", "-pids application",
Expand Down
6 changes: 3 additions & 3 deletions .github/silabs-builds-mg26-internal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"arguments": ["--output_suffix copy-sources", "--copy-sources"]
}
],
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd2709a"],
"arguments": ["--output_suffix sequential","--with_app matter_zigbee_sequential"]
Expand All @@ -33,7 +33,7 @@
"arguments": ["--output_suffix sequential-copy-sources","--with_app matter_zigbee_sequential", "--copy-sources"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd2709a"],
"arguments": ["--output_suffix peripherals","--with_app matter_peripherals"]
Expand All @@ -49,7 +49,7 @@
]
},
"custom-sqa": {
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd2709a"],
"arguments": ["--output_suffix cmp-concurrent-ota-2", "-pids application", "--with_app matter_zigbee_concurrent",
Expand Down
4 changes: 2 additions & 2 deletions .github/silabs-builds-mg26-ota.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"standard": {
"lighting-app": [
"lighting_app": [
{
"boards": ["brd4116a"],
"arguments": [""]
}
],
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd4116a"],
"arguments": [
Expand Down
18 changes: 9 additions & 9 deletions .github/silabs-builds-mg26.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"arguments": ["--output_suffix copy-sources", "--copy-sources"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4116a"],
"arguments": ["--output_suffix peripherals-icd","--with_app matter_peripherals,matter_icd_core"]
Expand All @@ -36,7 +36,7 @@
"arguments": ["--output_suffix copy-sources", "--copy-sources"]
}
],
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd4116a", "brd4117a", "brd4118a", "brd2608a", "brd4120a", "brd4121a"],
"arguments": ["--output_suffix sequential","--with_app matter_zigbee_sequential"]
Expand All @@ -46,7 +46,7 @@
"arguments": ["--output_suffix sequential-copy-sources","--with_app matter_zigbee_sequential", "--copy-sources"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4116a"],
"arguments": ["--output_suffix peripherals", "--with_app matter_peripherals"]
Expand All @@ -72,7 +72,7 @@
]
},
"custom-sqa": {
"lighting-app": [
"lighting_app": [
{
"boards": ["brd4116a"],
"arguments": ["--output_suffix ota-2", "-pids application",
Expand All @@ -96,7 +96,7 @@
"--with_app matter_multi_image_ota,matter_multi_image_ota_encryption,matter_multi_image_custom_processor"]
}
],
"lock-app": [
"lock_app": [
{
"boards": ["brd4116a"],
"arguments": ["--output_suffix ota-2", "-pids application",
Expand All @@ -120,14 +120,14 @@
"--with_app matter_multi_image_ota,matter_multi_image_ota_encryption,matter_multi_image_custom_processor"]
}
],
"light-switch-app": [
"light_switch_app": [
{
"boards": ["brd4116a"],
"arguments": ["--output_suffix ota-2", "-pids application",
"'--configuration CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\"2\"'"]
}
],
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd4116a"],
"arguments": ["--output_suffix sequential-ota-2", "-pids application",
Expand Down Expand Up @@ -181,14 +181,14 @@
"--with_app matter_internal_ble_side_channel,matter_ble_dmp_test,matter_zigbee_concurrent"]
}
],
"closure-app": [
"closure_app": [
{
"boards": ["brd4116a"],
"arguments": ["--output_suffix ota-2", "-pids application",
"'--configuration CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\"2\"'"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4116a"],
"arguments": ["--output_suffix peripherals-icd-ota-2", "--with_app matter_peripherals,matter_icd_core", "--without_app matter_log_rtt", "-pids application",
Expand Down
4 changes: 2 additions & 2 deletions .github/silabs-builds-mgm24-internal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"arguments": ["--output_suffix copy-sources", "--copy-sources"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4337a"],
"arguments": ["--output_suffix peripherals","--with_app matter_peripherals"]
Expand All @@ -39,7 +39,7 @@
]
},
"custom-sqa": {
"window-app" :[
"window_app" :[
{
"boards": ["brd4337a"],
"arguments": ["--output_suffix lto-ota-2", "--with_app toolchain_gcc_lto", "-pids application",
Expand Down
8 changes: 4 additions & 4 deletions .github/silabs-builds-mgm24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"arguments": ["--output_suffix copy-sources", "--copy-sources"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4316a"],
"arguments": ["--output_suffix peripherals-icd","--with_app matter_peripherals,matter_icd_core"]
Expand All @@ -29,7 +29,7 @@
"arguments": ["--output_suffix copy-sources", "--copy-sources"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4316a"],
"arguments": ["--output_suffix peripherals","--with_app matter_peripherals"]
Expand All @@ -45,7 +45,7 @@
]
},
"custom-sqa": {
"lighting-app": [
"lighting_app": [
{
"boards": ["brd4316a"],
"arguments": ["--output_suffix ota-2", "-pids application",
Expand All @@ -62,7 +62,7 @@
"'--configuration CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\"2\"'"]
}
],
"lock-app": [
"lock_app": [
{
"boards": ["brd4316a"],
"arguments": ["--output_suffix ota-2", "-pids application",
Expand Down
6 changes: 3 additions & 3 deletions .github/silabs-builds-mgm26-internal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"arguments": ["--output_suffix copy-sources", "--copy-sources"]
}
],
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd4350a", "brd4351a", "brd4350a_a02","brd4351a_a02"],
"arguments": ["--output_suffix sequential","--with_app matter_zigbee_sequential"]
Expand All @@ -32,7 +32,7 @@
"arguments": ["--output_suffix sequential-copy-sources","--with_app matter_zigbee_sequential", "--copy-sources"]
}
],
"platform-template": [
"platform_template": [
{
"boards": ["brd4351a_a02"],
"arguments": ["--output_suffix peripherals","--with_app matter_peripherals"]
Expand All @@ -48,7 +48,7 @@
]
},
"custom-sqa": {
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd4351a_a02"],
"arguments": ["--output_suffix sequential-ota-2", "--with_app matter_zigbee_sequential", "-pids application",
Expand Down
2 changes: 1 addition & 1 deletion .github/silabs-builds-mgm26-ota.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"standard": {
"zigbee-matter-light": [
"zigbee_light": [
{
"boards": ["brd4351a_a02"],
"arguments": [
Expand Down
1 change: 0 additions & 1 deletion .github/silabs-builds-series-3-bootloader.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@
]
}
}

Loading
Loading