[factorydata] dont use exampledacprovider (#26382)

- set fallback within factorydataprovider itself
project-chip · Jun 21, 2023 · 1223234 · 1223234
1 parent 6ca0e7b
commit 1223234
Show file tree

Hide file tree

Showing 6 changed files with 386 additions and 340 deletions.
diff --git a/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp b/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp
@@ -68,17 +68,14 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
     SuccessOrExit(err);
 
     err = mFactoryDataProvider.Init();
-    if (err == CHIP_NO_ERROR)
+    if (err != CHIP_NO_ERROR)
     {
-        SetCommissionableDataProvider(&mFactoryDataProvider);
-        SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-        SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    }
-    else
-    {
-        ChipLogProgress(DeviceLayer, "Using example DAC provider");
-        SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+        ChipLogError(DeviceLayer, "Error initializing FactoryData!");
+        ChipLogError(DeviceLayer, "Check if you have flashed it correctly!");
     }
+    SetCommissionableDataProvider(&mFactoryDataProvider);
+    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
+    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
 
     if (CONFIG_NETWORK_LAYER_BLE)
     {

diff --git a/examples/light-switch-app/ameba/main/CHIPDeviceManager.cpp b/examples/light-switch-app/ameba/main/CHIPDeviceManager.cpp
@@ -68,17 +68,14 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
     SuccessOrExit(err);
 
     err = mFactoryDataProvider.Init();
-    if (err == CHIP_NO_ERROR)
+    if (err != CHIP_NO_ERROR)
     {
-        SetCommissionableDataProvider(&mFactoryDataProvider);
-        SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-        SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    }
-    else
-    {
-        ChipLogProgress(DeviceLayer, "Using example DAC provider");
-        SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+        ChipLogError(DeviceLayer, "Error initializing FactoryData!");
+        ChipLogError(DeviceLayer, "Check if you have flashed it correctly!");
     }
+    SetCommissionableDataProvider(&mFactoryDataProvider);
+    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
+    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
 
     if (CONFIG_NETWORK_LAYER_BLE)
     {

diff --git a/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp b/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp
@@ -75,17 +75,14 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
     SuccessOrExit(err);
 
     err = mFactoryDataProvider.Init();
-    if (err == CHIP_NO_ERROR)
+    if (err != CHIP_NO_ERROR)
     {
-        SetCommissionableDataProvider(&mFactoryDataProvider);
-        SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-        SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    }
-    else
-    {
-        ChipLogProgress(DeviceLayer, "Using example DAC provider");
-        SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+        ChipLogError(DeviceLayer, "Error initializing FactoryData!");
+        ChipLogError(DeviceLayer, "Check if you have flashed it correctly!");
     }
+    SetCommissionableDataProvider(&mFactoryDataProvider);
+    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
+    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
 
     if (CONFIG_NETWORK_LAYER_BLE)
     {

diff --git a/examples/ota-requestor-app/ameba/main/CHIPDeviceManager.cpp b/examples/ota-requestor-app/ameba/main/CHIPDeviceManager.cpp
@@ -68,17 +68,14 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
     SuccessOrExit(err);
 
     err = mFactoryDataProvider.Init();
-    if (err == CHIP_NO_ERROR)
+    if (err != CHIP_NO_ERROR)
     {
-        SetCommissionableDataProvider(&mFactoryDataProvider);
-        SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-        SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    }
-    else
-    {
-        ChipLogProgress(DeviceLayer, "Using example DAC provider");
-        SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+        ChipLogError(DeviceLayer, "Error initializing FactoryData!");
+        ChipLogError(DeviceLayer, "Check if you have flashed it correctly!");
     }
+    SetCommissionableDataProvider(&mFactoryDataProvider);
+    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
+    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
 
     if (CONFIG_NETWORK_LAYER_BLE)
     {