@@ -131,6 +131,7 @@ static void InitServer(intptr_t context)
131
131
initParams.InitializeStaticResourcesBeforeServerInit ();
132
132
chip::Server::GetInstance ().Init (initParams);
133
133
gExampleDeviceInfoProvider .SetStorageDelegate (&Server::GetInstance ().GetPersistentStorage ());
134
+ // TODO: Use our own DeviceInfoProvider
134
135
chip::DeviceLayer::SetDeviceInfoProvider (&gExampleDeviceInfoProvider );
135
136
136
137
NetWorkCommissioningInstInit ();
@@ -157,22 +158,23 @@ extern "C" void ChipTest(void)
157
158
158
159
initPref ();
159
160
160
- // Initialize device attestation, commissionable data and device instance info
161
- // TODO: Use our own DeviceInstanceInfoProvider
162
- // SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
161
+ mFactoryDataProvider .Init ();
163
162
SetCommissionableDataProvider (&mFactoryDataProvider );
164
163
SetDeviceAttestationCredentialsProvider (&mFactoryDataProvider );
164
+
165
165
CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance ();
166
166
167
167
err = deviceMgr.Init (&EchoCallbacks);
168
168
if (err != CHIP_NO_ERROR)
169
169
{
170
170
ChipLogError (DeviceLayer, " DeviceManagerInit() - ERROR!\r\n " );
171
171
}
172
- else
173
- {
174
- ChipLogProgress (DeviceLayer, " DeviceManagerInit() - OK\r\n " );
175
- }
172
+
173
+ // Set DeviceInstanceInfoProvider after CHIPDeviceManager init
174
+ // CHIPDeviceManager init will set GenericDeviceInsanceInfoProvider first
175
+ #if CONFIG_ENABLE_AMEBA_FACTORY_DATA
176
+ SetDeviceInstanceInfoProvider (&mFactoryDataProvider );
177
+ #endif
176
178
177
179
chip::DeviceLayer::PlatformMgr ().ScheduleWork (InitServer, 0 );
178
180
0 commit comments