EFR32 Network Commissioning WiFi Driver (#15356)

* Fix light-app wifi builds. Fix efr32_sdk submodule that was brought back by mistake I assume * Implement NetworkCommissioning Wifi Driver and add suport for the wifi examples. Set efr32 examples setupPinCode to match the certs expected value * Update submodule to support wifi scanning + clean/fix build.gn issue Fix wifi provisionning issue, add ScanNetwork behaviour, fix factory reset for config keys - Restyle Fix scan for ssid update efr32 submodule hash
project-chip · Nov 15, 2023 · 6031071 · 6031071
1 parent 38bab7f
commit 6031071
Show file tree

Hide file tree

Showing 21 changed files with 597 additions and 157 deletions.
diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -39,7 +39,7 @@ declare_args() {
   chip_print_memory_usage = false
 
   # PIN code for PASE session establishment.
-  setupPinCode = 73141520
+  setupPinCode = 20202021
   setupDiscriminator = 3840
 
   # Monitor & log memory usage at runtime.
@@ -53,7 +53,7 @@ declare_args() {
   use_rs911x = false
   use_rs911x_sockets = false
   sl_wfx_config_softap = false
-  sl_wfx_config_scan = false
+  sl_wfx_config_scan = true
 }
 
 show_qr_code = true
@@ -114,9 +114,8 @@ efr32_sdk("sdk") {
   } else if (use_wf200) {
     defines += wf200_defs
     include_dirs += wf200_plat_incs
-  } else {
-    defines += [ "SL_HEAP_SIZE=20480" ]
   }
+
   if (use_rs911x_sockets) {
     include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ]
     defines += rs911x_sock_defs
@@ -126,11 +125,14 @@ efr32_sdk("sdk") {
     #
     defines += efr32_lwip_defs
   }
-  if (sl_wfx_config_softap) {
-    defines += "SL_WFX_CONFIG_SOFTAP"
-  }
-  if (sl_wfx_config_scan) {
-    defines += "SL_WFX_CONFIG_SCAN"
+
+  if (use_rs911x || use_wf200) {
+    if (sl_wfx_config_softap) {
+      defines += [ "SL_WFX_CONFIG_SOFTAP" ]
+    }
+    if (sl_wfx_config_scan) {
+      defines += [ "SL_WFX_CONFIG_SCAN" ]
+    }
   }
 }
 

diff --git a/examples/light-switch-app/efr32/src/AppTask.cpp b/examples/light-switch-app/efr32/src/AppTask.cpp
@@ -53,6 +53,8 @@
 #endif
 #ifdef SL_WIFI
 #include "wfx_host_events.h"
+#include <app/clusters/network-commissioning/network-commissioning.h>
+#include <platform/EFR32/NetworkCommissioningWiFiDriver.h>
 #endif /* SL_WIFI */
 
 #define FACTORY_RESET_TRIGGER_TIMEOUT 3000
@@ -67,6 +69,9 @@
 #define APP_FUNCTION_BUTTON &sl_button_btn0
 #define APP_LIGHT_SWITCH &sl_button_btn1
 
+using namespace chip;
+using namespace ::chip::DeviceLayer;
+
 namespace {
 TimerHandle_t sFunctionTimer; // FreeRTOS app sw timer.
 
@@ -79,6 +84,9 @@ LEDWidget sStatusLED;
 bool sIsWiFiProvisioned = false;
 bool sIsWiFiEnabled     = false;
 bool sIsWiFiAttached    = false;
+
+app::Clusters::NetworkCommissioning::Instance
+    sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::SlWiFiDriver::GetInstance()));
 #endif /* SL_WIFI */
 
 #if CHIP_ENABLE_OPENTHREAD
@@ -178,6 +186,8 @@ CHIP_ERROR AppTask::Init()
     }
     EFR32_LOG("APP: Done WiFi Init");
     /* We will init server when we get IP */
+
+    sWiFiNetworkCommissioningInstance.Init();
 #endif
     // Init ZCL Data Model
     chip::Server::GetInstance().Init();

diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -39,7 +39,7 @@ declare_args() {
   chip_print_memory_usage = false
 
   # PIN code for PASE session establishment.
-  setupPinCode = 73141520
+  setupPinCode = 20202021
   setupDiscriminator = 3840
 
   # Monitor & log memory usage at runtime.
@@ -53,7 +53,7 @@ declare_args() {
   use_rs911x = false
   use_rs911x_sockets = false
   sl_wfx_config_softap = false
-  sl_wfx_config_scan = false
+  sl_wfx_config_scan = true
 }
 
 show_qr_code = true
@@ -114,9 +114,8 @@ efr32_sdk("sdk") {
   } else if (use_wf200) {
     defines += wf200_defs
     include_dirs += wf200_plat_incs
-  } else {
-    defines += [ "SL_HEAP_SIZE=20480" ]
   }
+
   if (use_rs911x_sockets) {
     include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ]
     defines += rs911x_sock_defs
@@ -126,11 +125,13 @@ efr32_sdk("sdk") {
     #
     defines += efr32_lwip_defs
   }
-  if (sl_wfx_config_softap) {
-    defines += "SL_WFX_CONFIG_SOFTAP"
-  }
-  if (sl_wfx_config_scan) {
-    defines += "SL_WFX_CONFIG_SCAN"
+  if (use_rs911x || use_wf200) {
+    if (sl_wfx_config_softap) {
+      defines += [ "SL_WFX_CONFIG_SOFTAP" ]
+    }
+    if (sl_wfx_config_scan) {
+      defines += [ "SL_WFX_CONFIG_SCAN" ]
+    }
   }
 }
 

diff --git a/examples/lighting-app/efr32/build_for_wifi_gnfile.gn b/examples/lighting-app/efr32/build_for_wifi_gnfile.gn
@@ -23,6 +23,6 @@ check_system_includes = true
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"
-  use_thread = false
+  chip_enable_wifi = true
   import("//build_for_wifi_args.gni")
 }
diff --git a/examples/lighting-app/efr32/src/AppTask.cpp b/examples/lighting-app/efr32/src/AppTask.cpp
@@ -53,6 +53,8 @@
 #endif
 #ifdef SL_WIFI
 #include "wfx_host_events.h"
+#include <app/clusters/network-commissioning/network-commissioning.h>
+#include <platform/EFR32/NetworkCommissioningWiFiDriver.h>
 #endif /* SL_WIFI */
 
 #define FACTORY_RESET_TRIGGER_TIMEOUT 3000
@@ -67,6 +69,9 @@
 #define APP_FUNCTION_BUTTON &sl_button_btn0
 #define APP_LIGHT_SWITCH &sl_button_btn1
 
+using namespace chip;
+using namespace ::chip::DeviceLayer;
+
 namespace {
 TimerHandle_t sFunctionTimer; // FreeRTOS app sw timer.
 
@@ -80,6 +85,9 @@ LEDWidget sLightLED;
 bool sIsWiFiProvisioned = false;
 bool sIsWiFiEnabled     = false;
 bool sIsWiFiAttached    = false;
+
+app::Clusters::NetworkCommissioning::Instance
+    sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::SlWiFiDriver::GetInstance()));
 #endif /* SL_WIFI */
 
 #if CHIP_ENABLE_OPENTHREAD
@@ -231,6 +239,8 @@ CHIP_ERROR AppTask::Init()
     }
     EFR32_LOG("APP: Done WiFi Init");
     /* We will init server when we get IP */
+
+    sWiFiNetworkCommissioningInstance.Init();
 #endif
     // Init ZCL Data Model
     chip::Server::GetInstance().Init();

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -39,7 +39,7 @@ declare_args() {
   chip_print_memory_usage = false
 
   # PIN code for PASE session establishment.
-  setupPinCode = 73141520
+  setupPinCode = 20202021
 
   # Monitor & log memory usage at runtime.
   enable_heap_monitoring = false
@@ -52,7 +52,7 @@ declare_args() {
   use_rs911x = false
   use_rs911x_sockets = false
   sl_wfx_config_softap = false
-  sl_wfx_config_scan = false
+  sl_wfx_config_scan = true
 }
 
 show_qr_code = true
@@ -112,9 +112,8 @@ efr32_sdk("sdk") {
   } else if (use_wf200) {
     defines += wf200_defs
     include_dirs += wf200_plat_incs
-  } else {
-    defines += [ "SL_HEAP_SIZE=20480" ]
   }
+
   if (use_rs911x_sockets) {
     include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ]
     defines += rs911x_sock_defs
@@ -124,11 +123,13 @@ efr32_sdk("sdk") {
     #
     defines += efr32_lwip_defs
   }
-  if (sl_wfx_config_softap) {
-    defines += "SL_WFX_CONFIG_SOFTAP"
-  }
-  if (sl_wfx_config_scan) {
-    defines += "SL_WFX_CONFIG_SCAN"
+  if (use_rs911x || use_wf200) {
+    if (sl_wfx_config_softap) {
+      defines += [ "SL_WFX_CONFIG_SOFTAP" ]
+    }
+    if (sl_wfx_config_scan) {
+      defines += [ "SL_WFX_CONFIG_SCAN" ]
+    }
   }
 }
 

diff --git a/examples/lock-app/efr32/include/FreeRTOSConfig.h b/examples/lock-app/efr32/include/FreeRTOSConfig.h
@@ -193,7 +193,11 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
 #define configENABLE_BACKWARD_COMPATIBILITY (1)
 #define configSUPPORT_STATIC_ALLOCATION (1)
 #define configSUPPORT_DYNAMIC_ALLOCATION (1)
+#ifdef SL_WIFI
+#define configTOTAL_HEAP_SIZE ((size_t)(28 * 1024))
+#else
 #define configTOTAL_HEAP_SIZE ((size_t)(20 * 1024))
+#endif
 
 /* Optional functions - most linkers will remove unused functions anyway. */
 #define INCLUDE_vTaskPrioritySet (1)

diff --git a/examples/lock-app/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp
@@ -49,6 +49,8 @@
 #endif
 #ifdef SL_WIFI
 #include "wfx_host_events.h"
+#include <app/clusters/network-commissioning/network-commissioning.h>
+#include <platform/EFR32/NetworkCommissioningWiFiDriver.h>
 #endif
 
 #define FACTORY_RESET_TRIGGER_TIMEOUT 3000
@@ -62,6 +64,11 @@
 #define APP_FUNCTION_BUTTON &sl_button_btn0
 #define APP_LOCK_BUTTON &sl_button_btn1
 
+using namespace chip;
+using namespace chip::TLV;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+
 namespace {
 TimerHandle_t sFunctionTimer; // FreeRTOS app sw timer.
 
@@ -75,6 +82,9 @@ LEDWidget sLockLED;
 bool sIsWiFiProvisioned = false;
 bool sIsWiFiEnabled     = false;
 bool sIsWiFiAttached    = false;
+
+app::Clusters::NetworkCommissioning::Instance
+    sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::SlWiFiDriver::GetInstance()));
 #endif
 
 #if CHIP_ENABLE_OPENTHREAD
@@ -87,10 +97,6 @@ StackType_t appStack[APP_TASK_STACK_SIZE / sizeof(StackType_t)];
 StaticTask_t appTaskStruct;
 } // namespace
 
-using namespace chip::TLV;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-
 AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::StartAppTask()
@@ -120,6 +126,8 @@ CHIP_ERROR AppTask::Init()
     }
     EFR32_LOG("APP: Done WiFi Init");
     /* We will init server when we get IP */
+
+    sWiFiNetworkCommissioningInstance.Init();
 #endif
     // Init ZCL Data Model
     chip::Server::GetInstance().Init();

diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
@@ -33,7 +33,7 @@ declare_args() {
   chip_print_memory_usage = false
 
   # PIN code for PASE session establishment.
-  setupPinCode = 73141520
+  setupPinCode = 20202021
 
   # Monitor & log memory usage at runtime.
   enable_heap_monitoring = false
@@ -46,7 +46,7 @@ declare_args() {
   use_rs911x = false
   use_rs911x_sockets = false
   sl_wfx_config_softap = false
-  sl_wfx_config_scan = false
+  sl_wfx_config_scan = true
 }
 
 show_qr_code = true
@@ -99,9 +99,8 @@ efr32_sdk("sdk") {
   } else if (use_wf200) {
     defines += wf200_defs
     include_dirs += wf200_plat_incs
-  } else {
-    defines += [ "SL_HEAP_SIZE=20480" ]
   }
+
   if (use_rs911x_sockets) {
     include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ]
     defines += rs911x_sock_defs
@@ -111,11 +110,13 @@ efr32_sdk("sdk") {
     #
     defines += efr32_lwip_defs
   }
-  if (sl_wfx_config_softap) {
-    defines += "SL_WFX_CONFIG_SOFTAP"
-  }
-  if (sl_wfx_config_scan) {
-    defines += "SL_WFX_CONFIG_SCAN"
+  if (use_rs911x || use_wf200) {
+    if (sl_wfx_config_softap) {
+      defines += [ "SL_WFX_CONFIG_SOFTAP" ]
+    }
+    if (sl_wfx_config_scan) {
+      defines += [ "SL_WFX_CONFIG_SCAN" ]
+    }
   }
 }
 

diff --git a/examples/window-app/efr32/include/CHIPProjectConfig.h b/examples/window-app/efr32/include/CHIPProjectConfig.h
@@ -30,7 +30,7 @@
 
 // Use a default pairing code if one hasn't been provisioned in flash.
 #ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 12345678
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
 #endif
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
 

diff --git a/src/platform/EFR32/BUILD.gn b/src/platform/EFR32/BUILD.gn
@@ -100,8 +100,8 @@ static_library("EFR32") {
   if (chip_enable_wifi) {
     sources += [
       "ConnectivityManagerImpl_WIFI.cpp",
-      "ServiceProvisioning.cpp",
-      "ServiceProvisioning.h",
+      "NetworkCommissioningWiFiDriver.cpp",
+      "NetworkCommissioningWiFiDriver.h",
     ]
   }
 }