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.

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

Merge v1.4-branch into release_2.4-1.4 #51

Merged
merged 7 commits into from
Oct 15, 2024
Merged

Conversation

mykrupp
Copy link
Contributor

@mykrupp mykrupp commented Oct 15, 2024

release_2.4-1.4 was created off of main, based on latest matter_sdk/main commit a0845c8.

This PR merges the latest commits cherry-picked to v1.4-branch in release_2.4-1.4.

No conflicts

mkardous-silabs and others added 7 commits October 8, 2024 12:58
…Time ICDs (#35956) (#35960)

* Remove optional spec check

* Add static_assert for the slow poll config for SIT ICDs

* Add missing include

* fix restyler error

* fix spacing

* Remove client build flag since it is not used
* Add missing feature map bit

* Generation

Co-authored-by: Andrei Litvin <[email protected]>
* Refactor Sensor and LCD code

* Address review comments
* [Android] Add StayActive support during commission flow for LIT (#35959)

* Fix crash when handling jStayActiveMsec (#35997)
…36031)

* Attempt to fix ESP32 builds by not compiling insights at all. This breaks insights, but should make CI pass

* Fix typo

* Another better fix: pull in the other dependency too

---------

Co-authored-by: Andrei Litvin <[email protected]>
* Improve ICDClientStorage

-- when DeleteAllEntries is triggered, and all fabric are removed, we need remove
ICDFabricList from persistent storage, if there is at least 1 fabric in
table, we would update fabricList vector and persistent storage.
-- when fabric does not exist, storeEntry needs to return invalid fabric
error, and deleteEntry or deleteAllEntries needs to return no error.
-- Add multiple unit tests to cover
DeleteAllEntries/StoreEntry/CheckInHandling for
multiple fabrics

* Update DefaultICDClientStorage.cpp



* Update DefaultICDClientStorage.cpp



* Update DefaultICDClientStorage.cpp



* Update DefaultICDClientStorage.cpp



* Update DefaultICDClientStorage.cpp



* address comments

* Restyled by whitespace

* Restyled by clang-format

* address comments

* address comments and add more tests

* Restyled by whitespace

* Restyled by clang-format

---------

Co-authored-by: mkardous-silabs <[email protected]>
Co-authored-by: Restyled.io <[email protected]>
@mykrupp mykrupp merged commit 7a983c7 into release_2.4-1.4 Oct 15, 2024
22 of 23 checks passed
@mykrupp mykrupp deleted the v1.4-branch branch October 15, 2024 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants