Skip to content
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

Jump to bottom

Sync csa branch with main #292

Merged
merged 26 commits into from
Feb 19, 2025
Merged

Sync csa branch with main #292

merged 26 commits into from
Feb 19, 2025

Conversation

github-actions[bot]
Copy link

This PR syncs the csa branch with the main branch.

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

jmartinez-silabs and others added 2 commits February 17, 2025 23:58
@jmartinez-silabs
Rename CLUSTER_MASK_ and ATTIBUTE_MASK defines to differentiate with …
dd9bb34 
…… (#37618)

* Rename CLUSTER_MASK_ and ATTIBUTE_MASK defines to differentiate with the zigbee ones. Cleanup some scene defines and delete the now empty head att-storage.h

* Address comment, replace _BITMAP_ by _FLAG_
@woody-apple @restyled-commits
Only register XPC interest when a delegate exists (#37623)
ee341ad 
* Only registering when a delegate is added

* Restyled by whitespace

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <commits@restyled.io>
@github-actions github-actions bot requested a review from a team as a code owner February 18, 2025 00:22
@github-actions GitHub Actions
Copy link
Author

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

jtung-apple and others added 22 commits February 18, 2025 01:29
@jtung-apple
[Darwin] MTRDevice resub logic should reset backoff as needed (#37624)
9920a7f 
* [Darwin] MTRDevice resub logic should reset backoff as needed

* Improved code comment, per PR review
@bzbarsky-apple
Pass the arg of GetPrimaryOrFallbackMACAddress by reference. (#37609)
0ed1d14 
* Pass the arg of GetPrimaryOrFallbackMACAddress by reference.

Implementations want to resize it to the size of the data they actually put in it.

* Fix TestConfigurationMgr to have correct expectations.
@kkasperczyk-no
Add missing Mounted On/Off control device to matter-devices.xml (#37615)
e9502eb 
Files were generated using alchemy with the following command:

`alchemy zap --attribute="in-progress" --sdkRoot=../connectedhomeip/
--specRoot=../connectedhomeip-spec/
../connectedhomeip-spec/src/device_types/MountedOnOffControl.adoc`
@fuxiaoming-lumi
Add Thermostat Controller Device Type (#37514)
9943a32 
* Add Thermostat Controller New Device Type

* Rename Matter Thermostat Controller to Thermostat Controller

* Remove unnecessary fields "requireAttribute"
@senthilku @restyled-commits @sabollim-silabs
Closures: Closure Control cluster XML generation with Alchemy (#37555)
fe5f367 
* closure control cluster XML genartion with alchemy

* closure control cluster zap generated code

* Restyled by prettier-json

* removing FeatureMap

* removing FeatureMap in zcl

* generate zap with removed FeatureMap

* Added manual description for closure control

---------

Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: sabollim-silabs <158290810+sabollim-silabs@users.noreply.github.com>
@dependabot
Bump third_party/lwip/repo from 84fde1e to 554e104 (#37606)
272b16c 
Bumps [third_party/lwip/repo](https://github.com/lwip-tcpip/lwip) from `84fde1e` to `554e104`.
- [Commits](lwip-tcpip/lwip@84fde1e...554e104)

---
updated-dependencies:
- dependency-name: third_party/lwip/repo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump third_party/imgui/repo from 3c435c0 to 2860d7b (#37605)
e25c3a3 
Bumps [third_party/imgui/repo](https://github.com/ocornut/imgui) from `3c435c0` to `2860d7b`.
- [Release notes](https://github.com/ocornut/imgui/releases)
- [Commits](ocornut/imgui@3c435c0...2860d7b)

---
updated-dependencies:
- dependency-name: third_party/imgui/repo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump third_party/editline/repo from 4255848 to 50bde4b (#37604)
6ae1d4d 
Bumps [third_party/editline/repo](https://github.com/troglobit/editline) from `4255848` to `50bde4b`.
- [Release notes](https://github.com/troglobit/editline/releases)
- [Commits](troglobit/editline@4255848...50bde4b)

---
updated-dependencies:
- dependency-name: third_party/editline/repo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump third_party/jsoncpp/repo from 69098a1 to ba00447 (#37603)
20b7637 
Bumps [third_party/jsoncpp/repo](https://github.com/open-source-parsers/jsoncpp) from `69098a1` to `ba00447`.
- [Release notes](https://github.com/open-source-parsers/jsoncpp/releases)
- [Commits](open-source-parsers/jsoncpp@69098a1...ba00447)

---
updated-dependencies:
- dependency-name: third_party/jsoncpp/repo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump rojopolis/spellcheck-github-actions from 0.36.0 to 0.47.0 (#37602)
33e4b2f 
Bumps [rojopolis/spellcheck-github-actions](https://github.com/rojopolis/spellcheck-github-actions) from 0.36.0 to 0.47.0.
- [Release notes](https://github.com/rojopolis/spellcheck-github-actions/releases)
- [Changelog](https://github.com/rojopolis/spellcheck-github-actions/blob/master/CHANGELOG.md)
- [Commits](rojopolis/spellcheck-github-actions@0.36.0...0.47.0)

---
updated-dependencies:
- dependency-name: rojopolis/spellcheck-github-actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump third_party/libdatachannel/repo from 6fa7cff to 173d97a (#37…
5fdca74 
…607)

Bumps [third_party/libdatachannel/repo](https://github.com/paullouisageneau/libdatachannel) from `6fa7cff` to `173d97a`.
- [Release notes](https://github.com/paullouisageneau/libdatachannel/releases)
- [Commits](paullouisageneau/libdatachannel@6fa7cff...173d97a)

---
updated-dependencies:
- dependency-name: third_party/libdatachannel/repo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump third_party/mbedtls/repo from 5bc604f to 0834c59 (#37608)
69e18ec 
Bumps [third_party/mbedtls/repo](https://github.com/ARMmbed/mbedtls) from `5bc604f` to `0834c59`.
- [Release notes](https://github.com/ARMmbed/mbedtls/releases)
- [Commits](Mbed-TLS/mbedtls@5bc604f...0834c59)

---
updated-dependencies:
- dependency-name: third_party/mbedtls/repo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump carloscastrojumo/github-cherry-pick-action from 1.0.9 to 1.0.10 …
d157275 
…(#37600)

Bumps [carloscastrojumo/github-cherry-pick-action](https://github.com/carloscastrojumo/github-cherry-pick-action) from 1.0.9 to 1.0.10.
- [Release notes](https://github.com/carloscastrojumo/github-cherry-pick-action/releases)
- [Commits](carloscastrojumo/github-cherry-pick-action@v1.0.9...v1.0.10)

---
updated-dependencies:
- dependency-name: carloscastrojumo/github-cherry-pick-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Wandalen/wretry.action from 1.4.5 to 3.8.0 (#37598)
43846f5 
Bumps [Wandalen/wretry.action](https://github.com/wandalen/wretry.action) from 1.4.5 to 3.8.0.
- [Release notes](https://github.com/wandalen/wretry.action/releases)
- [Commits](Wandalen/wretry.action@v1.4.5...v3.8.0)

---
updated-dependencies:
- dependency-name: Wandalen/wretry.action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump natiginfo/action-detekt-all from 1.23.6 to 1.23.7 (#37597)
985ff8b 
Bumps [natiginfo/action-detekt-all](https://github.com/natiginfo/action-detekt-all) from 1.23.6 to 1.23.7.
- [Release notes](https://github.com/natiginfo/action-detekt-all/releases)
- [Commits](natiginfo/action-detekt-all@1.23.6...1.23.7)

---
updated-dependencies:
- dependency-name: natiginfo/action-detekt-all
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump peter-evans/create-pull-request from 6 to 7 (#37596)
5536ee5 
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@v6...v7)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump peaceiris/actions-gh-pages from 3 to 4 (#37601)
7ede78a 
Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4.
- [Release notes](https://github.com/peaceiris/actions-gh-pages/releases)
- [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md)
- [Commits](peaceiris/actions-gh-pages@v3...v4)

---
updated-dependencies:
- dependency-name: peaceiris/actions-gh-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump test-room-7/action-update-file from 1 to 2 (#37599)
4014e44 
Bumps [test-room-7/action-update-file](https://github.com/test-room-7/action-update-file) from 1 to 2.
- [Release notes](https://github.com/test-room-7/action-update-file/releases)
- [Commits](test-room-7/action-update-file@v1...v2)

---
updated-dependencies:
- dependency-name: test-room-7/action-update-file
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@erwinpan1
Fix Chef compilation failure on Mac due to #35429 (#37631)
126c125
@adigie
Remove ICD server sources from chip_data_model.cmake (#37513)
abd2e1d 
* Remove ICD server sources from chip_data_model.cmake

ICD server sources are built by gn, there is no need to compile them
twice.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

* Fix ICD dependencies

Don't depend on ICD if it's not enabled.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

* Fix gn include warnings

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

* iOS TVCasting app: Add missing chip_project_config_include

`chip_project_config_include` has to be set to get correct include order
of configuration files in `CHIPDeviceConfig.h` and prevent macro
redefined warnings coming from overriding defines already defined by
`CHIPConfig.h`.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

---------

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
@arun-silabs @restyled-commits
[Silabs] Rename BLE flags (#37628)
08535fd 
* Rename BLE flags

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <commits@restyled.io>
@marius-preda @chapongatien
[Inet] fix UDP bind with OT stack sha 473af53 and newer (#37579)
409ad66 
Testing:
Tested build on NXP K32W1 with Openthread commit 473af53.

Signed-off-by: Marius Preda <marius.preda@nxp.com>
Co-authored-by: Gatien Chapon <43855183+chapongatien@users.noreply.github.com>
kkasperczyk-no and others added 2 commits February 18, 2025 18:47
@kkasperczyk-no
[nrfconnect] Moved NFC mgr impl from Zephyr to nrfconnect (#37629)
5621ff6 
The NFCOnboardingPayloadManagerImpl that is currently located
in Zephyr is actually nrfconnect specific implementation,
as it includes nrf internal headers that are not available
for any other platform. It seems it was accidentally added
to Zephyr in the past, so it should be moved to nrfconnect.
@lpbeliveau-silabs
[SL-UP] Added a function that can empty the uart in a blocking manner…
33aec35 
… for ins… (#281) (#37638)
@mkardous-silabs mkardous-silabs merged commit 1a9d6d1 into main Feb 19, 2025
59 of 60 checks passed
@mkardous-silabs mkardous-silabs deleted the automation/update_main branch February 19, 2025 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmartinez-silabs jmartinez-silabs jmartinez-silabs approved these changes

@rcasallas-silabs rcasallas-silabs rcasallas-silabs approved these changes

@mkardous-silabs mkardous-silabs mkardous-silabs approved these changes

Assignees
No one assigned
Labels
changing-submodules-on-purpose sl-require-admin-action
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.