Adding FactoryDataProvider class to QPG platform

project-chip · Sep 30, 2022 · 16df929 · 16df929
1 parent 2a1f9ef
commit 16df929
Show file tree

Hide file tree

Showing 12 changed files with 482 additions and 7 deletions.
diff --git a/examples/lighting-app/qpg/BUILD.gn b/examples/lighting-app/qpg/BUILD.gn
@@ -62,6 +62,7 @@ qpg_executable("lighting_app") {
   ]
 
   deps = [
+    ":factorydata_lib",
     ":sdk",
     "${chip_root}/examples/lighting-app/lighting-common",
     "${chip_root}/examples/lighting-app/lighting-common:color-format",
@@ -153,3 +154,15 @@ group("qpg") {
 group("default") {
   deps = [ ":qpg" ]
 }
+
+static_library("factorydata_lib") {
+  libs = [ "${qpg_sdk_root}/Binaries/FactoryData/FactoryData_example/FactoryData_example.a" ]
+  public_configs = [ ":qpg_retain_factorydata" ]
+}
+
+config("qpg_retain_factorydata") {
+  ldflags = [
+    "-Wl,-u_binary_factory_data_bin_start",
+    "-Wl,-u_binary_factory_data_start",
+  ]
+}
diff --git a/examples/lighting-app/qpg/include/AppTask.h b/examples/lighting-app/qpg/include/AppTask.h
@@ -29,6 +29,8 @@
 #include "timers.h" // provides FreeRTOS timer support
 #include <platform/CHIPDeviceLayer.h>
 
+#include <platform/qpg/FactoryDataProvider.h>
+
 #define APP_NAME "Lighting-app"
 
 class AppTask
@@ -78,6 +80,8 @@ class AppTask
     bool mFunctionTimerActive;
     bool mSyncClusterToButtonAction;
 
+    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
+
     static AppTask sAppTask;
 };
 

diff --git a/examples/lighting-app/qpg/include/CHIPProjectConfig.h b/examples/lighting-app/qpg/include/CHIPProjectConfig.h
@@ -50,7 +50,7 @@
  * 0xFFF1: Test Vendor.
  */
 #ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x10D0
 #endif // CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
 
 /**

diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp
@@ -254,8 +254,11 @@ CHIP_ERROR AppTask::Init()
     // Init ZCL Data Model and start server
     PlatformMgr().ScheduleWork(InitServer, 0);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    ReturnErrorOnFailure(mFactoryDataProvider.Init());
+    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
+    SetCommissionableDataProvider(&mFactoryDataProvider);
+
+    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
 
     // Setup light
     err = LightingMgr().Init();

diff --git a/examples/lock-app/qpg/BUILD.gn b/examples/lock-app/qpg/BUILD.gn
@@ -61,6 +61,7 @@ qpg_executable("lock_app") {
   ]
 
   deps = [
+    ":factorydata_lib",
     ":sdk",
     "${chip_root}/examples/lock-app/lock-common",
     "${chip_root}/examples/providers:device_info_provider",
@@ -151,3 +152,15 @@ group("qpg") {
 group("default") {
   deps = [ ":qpg" ]
 }
+
+static_library("factorydata_lib") {
+  libs = [ "${qpg_sdk_root}/Binaries/FactoryData/FactoryData_example/FactoryData_example.a" ]
+  public_configs = [ ":qpg_retain_factorydata" ]
+}
+
+config("qpg_retain_factorydata") {
+  ldflags = [
+    "-Wl,-u_binary_factory_data_bin_start",
+    "-Wl,-u_binary_factory_data_start",
+  ]
+}
diff --git a/examples/lock-app/qpg/include/AppTask.h b/examples/lock-app/qpg/include/AppTask.h
@@ -31,6 +31,8 @@
 #include <lib/core/CHIPError.h>
 #include <platform/CHIPDeviceLayer.h>
 
+#include <platform/qpg/FactoryDataProvider.h>
+
 // Application-defined error codes in the CHIP_ERROR space.
 #define APP_ERROR_CREATE_TIMER_FAILED CHIP_APPLICATION_ERROR(0x01)
 
@@ -82,6 +84,8 @@ class AppTask
     bool mFunctionTimerActive;
     bool mSyncClusterToButtonAction;
 
+    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
+
     static AppTask sAppTask;
 };
 

diff --git a/examples/lock-app/qpg/include/CHIPProjectConfig.h b/examples/lock-app/qpg/include/CHIPProjectConfig.h
@@ -48,7 +48,7 @@
  * 0xFFF1: Test vendor.
  */
 #ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x10D0
 #endif // CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
 
 /**

diff --git a/examples/lock-app/qpg/src/AppTask.cpp b/examples/lock-app/qpg/src/AppTask.cpp
@@ -140,8 +140,11 @@ CHIP_ERROR AppTask::Init()
     // Init ZCL Data Model and start server
     PlatformMgr().ScheduleWork(InitServer, 0);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    ReturnErrorOnFailure(mFactoryDataProvider.Init());
+    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
+    SetCommissionableDataProvider(&mFactoryDataProvider);
+
+    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
 
     // Setup Bolt
     err = BoltLockMgr().Init();

diff --git a/src/platform/qpg/BUILD.gn b/src/platform/qpg/BUILD.gn
@@ -40,6 +40,8 @@ static_library("qpg") {
     "DeviceNetworkProvisioningDelegateImpl.h",
     "DiagnosticDataProviderImpl.cpp",
     "DiagnosticDataProviderImpl.h",
+    "FactoryDataProvider.cpp",
+    "FactoryDataProvider.h",
     "InetPlatformConfig.h",
     "Logging.cpp",
     "OTAImageProcessorImpl.cpp",
@@ -52,6 +54,8 @@ static_library("qpg") {
 
   deps = []
 
+  public = [ "${chip_root}/src/credentials/DeviceAttestationCredsProvider.h" ]
+
   public_deps = [ "${chip_root}/src/platform:platform_base" ]
 
   public_configs = []