Skip to content

Sync csa branch with main#884

Merged
sarthak shaha (Sarthak-Shaha) merged 5 commits intomainfrom
automation/update_main
Mar 19, 2026
Merged

Sync csa branch with main#884
sarthak shaha (Sarthak-Shaha) merged 5 commits intomainfrom
automation/update_main

Conversation

@silabs-matter-ci-bot
Copy link
Copy Markdown
Contributor

This PR syncs the csa branch with the main branch.

PR MUST BE MERGED WITH MERGE COMMIT - ADMIN MUST ENABLE THE OPTION

* [Realtek] Add support for color control

* [Realtek] Apply suggestions from code review

* [Realtek] Update zap

* [Realtek] Add few log

* [Realtek] Add size validation for color action parameters

* [Realtek] Update .matter
* [Telink] fix for CNET 4.12

This commit aimed to fix Thread network switch (7+ step of the test)

* [Telink] modified non-concurrent commissioning path

Now it accomplishes all the steps of CNET 4.12.

* Restyled by clang-format

* [Telink] addressed review issues

removed obsolete calls and added comments

* [Telink] moved config definition to common Zephyr config

If you need to use it in your platform, override default

---------

Co-authored-by: Restyled.io <commits@restyled.io>
* Set the 1.6 DM files base from 1.5.1

- Using the alchemy v1.6.8 (used for 1.5.1)

* Update the "base" of 1.6 DM files using the latest alchemy

- Using the alchemy v1.6.9

* Generate 1.6 DM files

* Update ZAP files for Group Key Management cluster

* Update TestSpecParsing* tests for 1.6

* Update spec version references

* Manual modification on GroupKeySetStruct

* Remove only fabric scoping

* Update yaml test

* Fix tests involving GroupKeySetStruct

* Restyled by whitespace

* Restyled by prettier-yaml

* Update include list

* Update spec version in TestBasicInformation

* Update ZAPs for General Diagnostics missing attribute

* Update ZAPs for GroupKeyManagement missing feature map

* Regenerate zap

* Update ZAPs for Root Node Device Revision + Zap regen

* Fix ZAPs for GroupKeyManagement missing feature map + Zap Regen

* Revert Zap GroupKeyManagement feature + Zap regen

* Set Group Key Management feature map in implementation

* Support Group Key Management Attribute 0x04

* Disable attribute test for Group Key Management

* Restyled by whitespace

* Restyled by clang-format

* Update device type revisions + read attribute for group key management

* fix shadowed variable

* Update device revisions

* Update General Diagnostics feature map in implementation

* Fix typo

* Restyled by whitespace

* Create 1.6 Data Model files

* Update BUILD

* Ignore GeneralDiagnostics feature mask 0x02

+ Ignore BasicInformation Attribute 0x0018

* Update Groupcast provisionality

* Regenerate ZAP

* Fix missing revision summaries

* Fix merge issue on RootNodeDevice.cpp

* Update Occupancy Sensing and Thermostat

* Update NetworkInfraManager revision summary

* Rerun alchemy and remove unnamed reserved enum items

* Rerun Alchemy

---------

Co-authored-by: Restyled.io <commits@restyled.io>
@silabs-matter-ci-bot silabs-matter-ci-bot bot added changing-git-submodules-on-purpose sl-require-admin-action This TAG indicates that an admin must take action. labels Mar 19, 2026
@silabs-matter-ci-bot silabs-matter-ci-bot bot requested a review from a team as a code owner March 19, 2026 00:42
@silabs-matter-ci-bot silabs-matter-ci-bot bot added changing-git-submodules-on-purpose sl-require-admin-action This TAG indicates that an admin must take action. labels Mar 19, 2026
@github-actions
Copy link
Copy Markdown
Contributor

The check for sl-require-admin-action label CI failure for this job is normal. An admin must do the merge.

@Sarthak-Shaha sarthak shaha (Sarthak-Shaha) merged commit c73fd90 into main Mar 19, 2026
91 of 96 checks passed
@Sarthak-Shaha sarthak shaha (Sarthak-Shaha) deleted the automation/update_main branch March 19, 2026 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changing-git-submodules-on-purpose sl-require-admin-action This TAG indicates that an admin must take action.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants