Skip to content

Commit 60dd784

Browse files
andy31415andreilitvinbzbarsky-applerestyled-commits
authored
Have DataModel::Provider be an argument to Server Init parameters (project-chip#36558)
* Set a provider in server init * Restyle * Fix some include dependencies * Add back missing include * Undo change for nrf * Add import for android * Undo qpg change * Update examples/all-clusters-app/nrfconnect/main/AppTask.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/light-switch-app/qpg/src/AppTask.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/lock-app/nrfconnect/main/AppTask.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/lit-icd-app/nrfconnect/main/AppTask.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update src/controller/python/chip/server/ServerInit.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Help users update * Added comment * Restyled by prettier-markdown * Update examples/lock-app/qpg/src/AppTask.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/platform/infineon/cyw30739/matter_config.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/platform/telink/common/src/AppTaskCommon.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/pump-app/nrfconnect/main/AppTask.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/platform/openiotsdk/app/openiotsdk_platform.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Fix includes * Removed an include * Update examples/pump-controller-app/nrfconnect/main/AppTask.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/shell/shell_common/cmd_server.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/window-app/nrfconnect/main/AppTask.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Remove extra include * More comments updated * Remove unneeded dependency * Fix log * Update src/app/server/Server.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Remove double init --------- Co-authored-by: Andrei Litvin <andreilitvin@google.com> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 007f4d7 commit 60dd784

File tree

77 files changed

+186
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+186
-6
lines changed

‎docs/upgrading.md

+9
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,12 @@ Replacements for methods are:
9292
`chip::app::AttributeAccessInterfaceRegistry::Instance().UnregisterAllForEndpoint`
9393
- `chip::app::GetAttributeAccessOverride` replaced by
9494
`chip::app::AttributeAccessInterfaceRegistry::Instance().Get`
95+
96+
### `ServerInitParams::dataModelProvider` in `Server::Init`
97+
98+
Server initialization requires a set data model provider to work rather than
99+
auto-initializing ember-compatible code-generated data models.
100+
101+
To preserve `codegen/zap` generated logic, use
102+
`CodegenDataModelProviderInstance` (see changes in
103+
<https://github.com/project-chip/connectedhomeip/pull/36558>).

‎examples/air-purifier-app/ameba/main/chipinterface.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <air-purifier-manager.h>
3131
#include <app/clusters/identify-server/identify-server.h>
3232
#include <app/clusters/network-commissioning/network-commissioning.h>
33+
#include <app/codegen-data-model-provider/Instance.h>
3334
#include <app/server/OnboardingCodesUtil.h>
3435
#include <app/util/endpoint-config-api.h>
3536
#include <lib/core/ErrorStr.h>
@@ -134,6 +135,7 @@ static void InitServer(intptr_t context)
134135
// Init ZCL Data Model and CHIP App Server
135136
static chip::CommonCaseDeviceServerInitParams initParams;
136137
(void) initParams.InitializeStaticResourcesBeforeServerInit();
138+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
137139
#if CONFIG_ENABLE_AMEBA_CRYPTO
138140
ChipLogProgress(DeviceLayer, "platform crypto enabled!");
139141
static chip::AmebaPersistentStorageOperationalKeystore sAmebaPersistentStorageOpKeystore;

‎examples/air-purifier-app/cc32xx/main/AppTask.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <lib/support/CHIPPlatformMemory.h>
3939
#include <platform/CHIPDeviceLayer.h>
4040

41+
#include <app/codegen-data-model-provider/Instance.h>
4142
#include <app/server/Dnssd.h>
4243
#include <app/server/OnboardingCodesUtil.h>
4344

@@ -164,6 +165,7 @@ int AppTask::Init()
164165
PLAT_LOG("Initialize Server");
165166
static chip::CommonCaseDeviceServerInitParams initParams;
166167
(void) initParams.InitializeStaticResourcesBeforeServerInit();
168+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
167169
chip::Server::GetInstance().Init(initParams);
168170

169171
// Initialize device attestation config

‎examples/all-clusters-app/ameba/main/chipinterface.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
#include <app/clusters/identify-server/identify-server.h>
3333
#include <app/clusters/network-commissioning/network-commissioning.h>
34+
#include <app/codegen-data-model-provider/Instance.h>
3435
#include <app/server/OnboardingCodesUtil.h>
3536
#include <app/server/Server.h>
3637
#include <app/util/endpoint-config-api.h>
@@ -149,6 +150,7 @@ static void InitServer(intptr_t context)
149150
initParams.appDelegate = &sAmebaObserver;
150151

151152
initParams.InitializeStaticResourcesBeforeServerInit();
153+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
152154

153155
#if CONFIG_ENABLE_AMEBA_CRYPTO
154156
ChipLogProgress(DeviceLayer, "platform crypto enabled!");

‎examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "LEDWidget.h"
2626
#include <app-common/zap-generated/attributes/Accessors.h>
2727
#include <app-common/zap-generated/ids/Clusters.h>
28+
#include <app/codegen-data-model-provider/Instance.h>
2829
#include <app/server/Dnssd.h>
2930
#include <app/server/OnboardingCodesUtil.h>
3031
#include <app/server/Server.h>
@@ -129,6 +130,7 @@ static void InitServer(intptr_t context)
129130
// Init ZCL Data Model
130131
static chip::CommonCaseDeviceServerInitParams initParams;
131132
(void) initParams.InitializeStaticResourcesBeforeServerInit();
133+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
132134
chip::Server::GetInstance().Init(initParams);
133135

134136
// We only have network commissioning on endpoint 0.

‎examples/all-clusters-app/linux/fuzzing-main.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717

1818
#include "AppMain.h"
19+
#include <app/codegen-data-model-provider/Instance.h>
1920
#include <app/server/Server.h>
2021

2122
#include <CommissionableInit.h>
@@ -56,6 +57,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
5657
// ChipLinuxAppMainLoop blocks, and we don't want that here.
5758
static chip::CommonCaseDeviceServerInitParams initParams;
5859
(void) initParams.InitializeStaticResourcesBeforeServerInit();
60+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
5961
VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR);
6062

6163
ApplicationInit();

‎examples/all-clusters-app/mbed/main/AppTask.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ int AppTask::Init()
7272
// Init ZCL Data Model and start server
7373
static chip::CommonCaseDeviceServerInitParams initParams;
7474
(void) initParams.InitializeStaticResourcesBeforeServerInit();
75-
error = Server::GetInstance().Init(initParams);
75+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
76+
error = Server::GetInstance().Init(initParams);
7677
if (error != CHIP_NO_ERROR)
7778
{
7879
ChipLogError(NotSpecified, "Server initialization failed: %s", error.AsString());

‎examples/all-clusters-app/nrfconnect/main/AppTask.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <app/TestEventTriggerDelegate.h>
3131
#include <app/clusters/identify-server/identify-server.h>
3232
#include <app/clusters/ota-requestor/OTATestEventTriggerHandler.h>
33+
#include <app/codegen-data-model-provider/Instance.h>
3334
#include <app/util/attribute-storage.h>
3435
#include <app/util/endpoint-config-api.h>
3536

@@ -226,6 +227,7 @@ CHIP_ERROR AppTask::Init()
226227
initParams.operationalKeystore = &sPSAOperationalKeystore;
227228
#endif
228229
(void) initParams.InitializeStaticResourcesBeforeServerInit();
230+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
229231
initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
230232
ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
231233
AppFabricTableDelegate::Init();

‎examples/all-clusters-app/nxp/mw320/main.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <app-common/zap-generated/attributes/Accessors.h>
3333
#include <app-common/zap-generated/ids/Attributes.h>
3434
#include <app-common/zap-generated/ids/Clusters.h>
35+
#include <app/codegen-data-model-provider/Instance.h>
3536
#include <app/server/Dnssd.h>
3637
#include <app/server/Server.h>
3738
#include <app/util/af-types.h>
@@ -1068,6 +1069,7 @@ static void run_chip_srv(System::Layer * aSystemLayer, void * aAppState)
10681069

10691070
static chip::CommonCaseDeviceServerInitParams initParams;
10701071
(void) initParams.InitializeStaticResourcesBeforeServerInit();
1072+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
10711073
chip::Server::GetInstance().Init(initParams);
10721074
PRINTF("Done to call chip::Server() \r\n");
10731075
}

‎examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include <app/clusters/identify-server/identify-server.h>
2929
#include <app/clusters/network-commissioning/network-commissioning.h>
30+
#include <app/codegen-data-model-provider/Instance.h>
3031
#include <app/server/OnboardingCodesUtil.h>
3132
#include <app/server/Server.h>
3233
#include <app/util/endpoint-config-api.h>
@@ -158,8 +159,11 @@ static void InitServer(intptr_t context)
158159
// Init ZCL Data Model and CHIP App Server
159160
static chip::CommonCaseDeviceServerInitParams initParams;
160161
initParams.InitializeStaticResourcesBeforeServerInit();
162+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
163+
161164
static AmebaObserver sAmebaObserver;
162165
initParams.appDelegate = &sAmebaObserver;
166+
163167
chip::Server::GetInstance().Init(initParams);
164168

165169
// Initialize device attestation config

‎examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "LEDWidget.h"
2626
#include <app-common/zap-generated/attributes/Accessors.h>
2727
#include <app-common/zap-generated/ids/Clusters.h>
28+
#include <app/codegen-data-model-provider/Instance.h>
2829
#include <app/server/Dnssd.h>
2930
#include <app/server/OnboardingCodesUtil.h>
3031
#include <app/server/Server.h>
@@ -127,6 +128,7 @@ static void InitServer(intptr_t context)
127128
// Init ZCL Data Model
128129
static chip::CommonCaseDeviceServerInitParams initParams;
129130
(void) initParams.InitializeStaticResourcesBeforeServerInit();
131+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
130132
chip::Server::GetInstance().Init(initParams);
131133

132134
// We only have network commissioning on endpoint 0.

‎examples/all-clusters-minimal-app/linux/fuzzing-main.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717

1818
#include "AppMain.h"
19+
#include <app/codegen-data-model-provider/Instance.h>
1920
#include <app/server/Server.h>
2021

2122
using namespace chip;
@@ -43,6 +44,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
4344
// ChipLinuxAppMainLoop blocks, and we don't want that here.
4445
static chip::CommonCaseDeviceServerInitParams initParams;
4546
(void) initParams.InitializeStaticResourcesBeforeServerInit();
47+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
4648
VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR);
4749

4850
ApplicationInit();

‎examples/all-clusters-minimal-app/mbed/main/AppTask.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
#include "AppTask.h"
2020
#include "LEDWidget.h"
2121
#include <DFUManager.h>
22-
#include <app/server/OnboardingCodesUtil.h>
2322

23+
#include <app/codegen-data-model-provider/Instance.h>
2424
#include <app/server/Dnssd.h>
25+
#include <app/server/OnboardingCodesUtil.h>
2526
#include <app/server/Server.h>
2627
#include <credentials/DeviceAttestationCredsProvider.h>
2728
#include <credentials/examples/DeviceAttestationCredsExample.h>
@@ -67,7 +68,8 @@ int AppTask::Init()
6768
// Init ZCL Data Model and start server
6869
static chip::CommonCaseDeviceServerInitParams initParams;
6970
(void) initParams.InitializeStaticResourcesBeforeServerInit();
70-
error = Server::GetInstance().Init(initParams);
71+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
72+
error = Server::GetInstance().Init(initParams);
7173
if (error != CHIP_NO_ERROR)
7274
{
7375
ChipLogError(NotSpecified, "Server initialization failed: %s", error.AsString());

‎examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "LEDUtil.h"
2323
#include "binding-handler.h"
2424

25+
#include <app/codegen-data-model-provider/Instance.h>
2526
#include <app/server/OnboardingCodesUtil.h>
2627
#include <app/server/Server.h>
2728

@@ -173,6 +174,7 @@ CHIP_ERROR AppTask::Init()
173174
initParams.operationalKeystore = &sPSAOperationalKeystore;
174175
#endif
175176
(void) initParams.InitializeStaticResourcesBeforeServerInit();
177+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
176178
ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
177179
AppFabricTableDelegate::Init();
178180

‎examples/chef/ameba/main/chipinterface.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#include <app/clusters/identify-server/identify-server.h>
3030
#include <app/clusters/network-commissioning/network-commissioning.h>
31+
#include <app/codegen-data-model-provider/Instance.h>
3132
#include <app/server/OnboardingCodesUtil.h>
3233
#include <app/server/Server.h>
3334
#include <app/util/endpoint-config-api.h>
@@ -105,9 +106,13 @@ static void InitServer(intptr_t context)
105106
// Init ZCL Data Model and CHIP App Server
106107
static chip::CommonCaseDeviceServerInitParams initParams;
107108
initParams.InitializeStaticResourcesBeforeServerInit();
109+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
110+
108111
static AmebaObserver sAmebaObserver;
109112
initParams.appDelegate = &sAmebaObserver;
113+
110114
chip::Server::GetInstance().Init(initParams);
115+
111116
gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
112117
chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
113118

‎examples/chef/esp32/main/main.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <platform/CHIPDeviceLayer.h>
3131

3232
#include <app/clusters/network-commissioning/network-commissioning.h>
33+
#include <app/codegen-data-model-provider/Instance.h>
3334
#include <app/server/OnboardingCodesUtil.h>
3435
#include <app/server/Server.h>
3536

@@ -159,6 +160,7 @@ void InitServer(intptr_t)
159160
// Start IM server
160161
static chip::CommonCaseDeviceServerInitParams initParams;
161162
(void) initParams.InitializeStaticResourcesBeforeServerInit();
163+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
162164
chip::Server::GetInstance().Init(initParams);
163165

164166
// Device Attestation & Onboarding codes

‎examples/chef/nrfconnect/main.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <lib/support/CHIPMem.h>
2626
#include <platform/CHIPDeviceLayer.h>
2727

28+
#include <app/codegen-data-model-provider/Instance.h>
2829
#include <app/server/OnboardingCodesUtil.h>
2930
#include <app/server/Server.h>
3031

@@ -125,7 +126,8 @@ int main()
125126
initParams.operationalKeystore = &sPSAOperationalKeystore;
126127
#endif
127128
(void) initParams.InitializeStaticResourcesBeforeServerInit();
128-
err = chip::Server::GetInstance().Init(initParams);
129+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
130+
err = chip::Server::GetInstance().Init(initParams);
129131
if (err != CHIP_NO_ERROR)
130132
{
131133
return 1;

‎examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
#include "AppTask.h"
2020
#include "AppEvent.h"
21+
#include <app/codegen-data-model-provider/Instance.h>
2122
#include <app/server/OnboardingCodesUtil.h>
2223
#include <app/server/Server.h>
2324
#include <lib/core/ErrorStr.h>
@@ -298,6 +299,7 @@ void AppTask::InitServer(intptr_t arg)
298299
{
299300
static chip::CommonCaseDeviceServerInitParams initParams;
300301
(void) initParams.InitializeStaticResourcesBeforeServerInit();
302+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
301303

302304
auto & infoProvider = chip::DeviceLayer::DeviceInfoProviderImpl::GetDefaultInstance();
303305
infoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);

‎examples/light-switch-app/ameba/main/chipinterface.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
#include <app/clusters/identify-server/identify-server.h>
3131
#include <app/clusters/network-commissioning/network-commissioning.h>
32+
#include <app/codegen-data-model-provider/Instance.h>
3233
#include <app/server/OnboardingCodesUtil.h>
3334
#include <app/server/Server.h>
3435
#include <app/util/endpoint-config-api.h>
@@ -104,6 +105,7 @@ static void InitServer(intptr_t context)
104105
// Init ZCL Data Model and CHIP App Server
105106
static chip::CommonCaseDeviceServerInitParams initParams;
106107
initParams.InitializeStaticResourcesBeforeServerInit();
108+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
107109
#if CONFIG_ENABLE_AMEBA_CRYPTO
108110
ChipLogProgress(DeviceLayer, "platform crypto enabled!");
109111
static chip::AmebaPersistentStorageOperationalKeystore sAmebaPersistentStorageOpKeystore;

‎examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
#include "FreeRTOS.h"
2626

27+
#include <app/codegen-data-model-provider/Instance.h>
2728
#include <credentials/DeviceAttestationCredsProvider.h>
2829
#include <credentials/examples/DeviceAttestationCredsExample.h>
2930
#include <examples/platform/cc13x4_26x4/CC13X4_26X4DeviceAttestationCreds.h>
@@ -324,6 +325,7 @@ int AppTask::Init()
324325
static DefaultTestEventTriggerDelegate sTestEventTriggerDelegate{ ByteSpan(sTestEventTriggerEnableKey) };
325326
initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
326327
(void) initParams.InitializeStaticResourcesBeforeServerInit();
328+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
327329

328330
// Initialize info provider
329331
sExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);

‎examples/light-switch-app/genio/src/AppTask.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include <app/clusters/identify-server/identify-server.h>
2929
#include <app/clusters/network-commissioning/network-commissioning.h>
30+
#include <app/codegen-data-model-provider/Instance.h>
3031
#include <app/server/OnboardingCodesUtil.h>
3132
#include <app/server/Server.h>
3233
#include <app/util/attribute-storage.h>
@@ -124,6 +125,7 @@ CHIP_ERROR AppTask::Init()
124125
// Init ZCL Data Model and start server
125126
static chip::CommonCaseDeviceServerInitParams initParams;
126127
(void) initParams.InitializeStaticResourcesBeforeServerInit();
128+
initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance();
127129
chip::Server::GetInstance().Init(initParams);
128130

129131
// Initialize device attestation config

‎examples/light-switch-app/nrfconnect/main/AppTask.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <app/TestEventTriggerDelegate.h>
2828
#include <app/clusters/identify-server/identify-server.h>
2929
#include <app/clusters/ota-requestor/OTATestEventTriggerHandler.h>
30+
#include <app/codegen-data-model-provider/Instance.h>
3031
#include <app/server/OnboardingCodesUtil.h>
3132
#include <app/server/Server.h>
3233
#include <credentials/DeviceAttestationCredsProvider.h>
@@ -235,6 +236,7 @@ CHIP_ERROR AppTask::Init()
235236
initParams.operationalKeystore = &sPSAOperationalKeystore;
236237
#endif
237238
(void) initParams.InitializeStaticResourcesBeforeServerInit();
239+
initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance();
238240
initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
239241
ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
240242
AppFabricTableDelegate::Init();

‎examples/light-switch-app/qpg/src/AppTask.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ using namespace ::chip;
3535
#include <app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerHandler.h>
3636
#include <app/clusters/general-diagnostics-server/general-diagnostics-server.h>
3737
#include <app/clusters/identify-server/identify-server.h>
38+
#include <app/codegen-data-model-provider/Instance.h>
3839
#include <app/server/Dnssd.h>
3940
#include <app/server/Server.h>
4041
#include <app/util/attribute-storage.h>
@@ -203,7 +204,6 @@ CHIP_ERROR AppTask::StartAppTask()
203204
void AppTask::InitServer(intptr_t arg)
204205
{
205206
static chip::CommonCaseDeviceServerInitParams initParams;
206-
(void) initParams.InitializeStaticResourcesBeforeServerInit();
207207

208208
gExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
209209
chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
@@ -220,6 +220,7 @@ void AppTask::InitServer(intptr_t arg)
220220
VerifyOrDie(sTestEventTriggerDelegate.Init(ByteSpan(sTestEventTriggerEnableKey)) == CHIP_NO_ERROR);
221221
VerifyOrDie(sTestEventTriggerDelegate.AddHandler(&sFaultTestEventTriggerHandler) == CHIP_NO_ERROR);
222222
(void) initParams.InitializeStaticResourcesBeforeServerInit();
223+
initParams.dataModelProvider = CodegenDataModelProviderInstance();
223224
initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
224225

225226
chip::Server::GetInstance().Init(initParams);

0 commit comments

Comments
 (0)