fix: added initialization to platform wifi network commissioning inst…

…ance (project-chip#17983) Change-Id: I03b6b523d4c4557ab6cc432216e48b6d6b2b6964
cpagravel · Jun 13, 2022 · 1255e3f · 1255e3f
1 parent ba214c7
commit 1255e3f
Show file tree

Hide file tree

Showing 29 changed files with 11,217 additions and 2,436 deletions.
diff --git a/examples/chef/devices/lighting-app-thread.zap b/examples/chef/devices/lighting-app-thread.zap
diff --git a/examples/chef/devices/lighting-app.zap → examples/chef/devices/lighting-app-wifi.zap b/examples/chef/devices/lighting-app.zap → examples/chef/devices/lighting-app-wifi.zap
diff --git a/examples/chef/esp32/main/main.cpp b/examples/chef/esp32/main/main.cpp
@@ -29,11 +29,13 @@
 #include <lib/support/CHIPMem.h>
 #include <platform/CHIPDeviceLayer.h>
 
+#include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <platform/ESP32/NetworkCommissioningDriver.h>
 
 #include <app-common/zap-generated/att-storage.h>
 #include <app-common/zap-generated/attribute-id.h>
@@ -161,6 +163,9 @@ void printQRCode()
 }
 #endif // CONFIG_HAVE_DISPLAY
 
+app::Clusters::NetworkCommissioning::Instance
+    sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::ESPWiFiDriver::GetInstance()));
+
 void InitServer(intptr_t)
 {
     // Start IM server
@@ -170,6 +175,7 @@ void InitServer(intptr_t)
 
     // Device Attestation & Onboarding codes
     chip::Credentials::SetDeviceAttestationCredentialsProvider(chip::Credentials::Examples::GetExampleDACProvider());
+    sWiFiNetworkCommissioningInstance.Init();
     chip::DeviceLayer::ConfigurationMgr().LogDeviceConfig();
 
     if (chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() != CHIP_NO_ERROR)

diff --git a/examples/chef/zzz_generated/lighting-app-thread/INPUTMD5.txt b/examples/chef/zzz_generated/lighting-app-thread/INPUTMD5.txt
@@ -0,0 +1 @@
+ca2c6dcd45363e2c5139925ef341ae18
diff --git a/...hef/zzz_generated/lighting-app/ZAPSHA.txt → ..._generated/lighting-app-thread/ZAPSHA.txt b/...hef/zzz_generated/lighting-app/ZAPSHA.txt → ..._generated/lighting-app-thread/ZAPSHA.txt
diff --git a/examples/chef/zzz_generated/lighting-app-thread/zap-generated/CHIPClientCallbacks.h b/examples/chef/zzz_generated/lighting-app-thread/zap-generated/CHIPClientCallbacks.h
diff --git a/...lighting-app/zap-generated/CHIPClusters.h → ...g-app-thread/zap-generated/CHIPClusters.h b/...lighting-app/zap-generated/CHIPClusters.h → ...g-app-thread/zap-generated/CHIPClusters.h