Skip to content

[SL-UP] Fix Groupcast and Binding initialization in Zephyr all-devices-app #1288

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

Open
Matthew Albert (malbert-silabs) wants to merge 1 commit into
base: release_2.10-1.6.1
Choose a base branch
from
+15 −1
Open

[SL-UP] Fix Groupcast and Binding initialization in Zephyr all-devices-app #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ config CHIP_DATA_MODEL_CODEDRIVEN
this when the application registers clusters and endpoints at run time
instead of using the ZAP generated data model.

config CHIP_ENABLE_GROUPCAST
bool "Enable groupcast support"
help
Enables Groupcast and auxiliary access control support.

if OPENTHREAD

# See config/common/cmake/Kconfig for full definition
Expand Down
3 changes: 3 additions & 0 deletions examples/all-devices-app/zephyr/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ config CHIP_ENABLE_PAIRING_AUTOSTART
config CHIP_DATA_MODEL_CODEDRIVEN
default y

config CHIP_ENABLE_GROUPCAST
default y

config CHIP_OTA_REQUESTOR
default n
imply STREAM_FLASH
Expand Down
8 changes: 7 additions & 1 deletion examples/all-devices-app/zephyr/include/AppTaskBase.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ CHIP_ERROR AppTaskBase<Derived>::InitPersistence()
SetSafeAttributePersistenceProvider(&mSafeAttributePersistenceProvider);

mInitParams.groupDataProvider = &mGroupDataProvider;
mGroupDataProvider.SetGroupcastEnabled(CHIP_CONFIG_ENABLE_GROUPCAST);
mGroupDataProvider.SetStorageDelegate(mInitParams.persistentStorageDelegate);
mGroupDataProvider.SetSessionKeystore(mInitParams.sessionKeystore);
ReturnErrorOnFailure(mGroupDataProvider.Init());
Expand Down Expand Up @@ -278,7 +279,12 @@ CHIP_ERROR AppTaskBase<Derived>::RegisterDeviceCreators()
template <class Derived>
CHIP_ERROR AppTaskBase<Derived>::InitServer()
{
return Server::GetInstance().Init(mInitParams);
ReturnErrorOnFailure(Server::GetInstance().Init(mInitParams));
return Clusters::Binding::Manager::GetInstance().Init({
.mFabricTable = &Server::GetInstance().GetFabricTable(),
.mCASESessionManager = Server::GetInstance().GetCASESessionManager(),
.mStorage = mInitParams.persistentStorageDelegate,
});
}

template <class Derived>
Expand Down
Loading