Move Base Application

project-chip · Jul 26, 2023 · 6a66d79 · 6a66d79
1 parent 44a9d92
commit 6a66d79
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 866 deletions.
diff --git a/...platform/silabs/efr32/BaseApplication.cpp → examples/platform/silabs/BaseApplication.cpp b/...platform/silabs/efr32/BaseApplication.cpp → examples/platform/silabs/BaseApplication.cpp
@@ -242,7 +242,12 @@ CHIP_ERROR BaseApplication::Init()
     }
 
     PlatformMgr().AddEventHandler(OnPlatformEvent, 0);
+#ifdef SL_WIFI
+    sIsProvisioned = ConnectivityMgr().IsWiFiStationProvisioned();
+#endif /* SL_WIFI */
+#if CHIP_ENABLE_OPENTHREAD
     sIsProvisioned = ConnectivityMgr().IsThreadProvisioned();
+#endif
 
     return err;
 }

diff --git a/...s/platform/silabs/efr32/BaseApplication.h → examples/platform/silabs/BaseApplication.h b/...s/platform/silabs/efr32/BaseApplication.h → examples/platform/silabs/BaseApplication.h
@@ -29,6 +29,7 @@
 #include "AppEvent.h"
 #include "FreeRTOS.h"
 #include "timers.h" // provides FreeRTOS timer support
+#include <app/clusters/identify-server/identify-server.h>
 #include <app/util/config.h>
 #include <ble/BLEEndPoint.h>
 #include <lib/core/CHIPError.h>
@@ -47,10 +48,6 @@
 #endif // QR_CODE_ENABLED
 #endif // DISPLAY_ENABLED
 
-#ifndef SL_STATUS_LED
-#define SL_STATUS_LED 1
-#endif
-
 /**********************************************************
  * Defines
  *********************************************************/

diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
@@ -166,10 +166,10 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     // Init Chip memory management before the stack
     ReturnErrorOnFailure(chip::Platform::MemoryInit());
 
-    // WiFi needs to be initialized after Memory Init for some reason
-    #ifdef SL_WIFI
+// WiFi needs to be initialized after Memory Init for some reason
+#ifdef SL_WIFI
     InitWiFi();
-    #endif
+#endif
 
     ReturnErrorOnFailure(PlatformMgr().InitChipStack());
 
@@ -260,8 +260,7 @@ void SilabsMatterConfig::InitWiFi(void)
         SILABS_LOG("RSI init failed");
         return CHIP_ERROR_INTERNAL;
     }
-#endif                           /* WF200_WIFI */
-
+#endif /* WF200_WIFI */
 }
 #endif // SL_WIFI
 

diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -247,7 +247,9 @@ source_set("siwx917-common") {
   ]
 
   sources = [
+    "${silabs_common_plat_dir}/BaseApplication.cpp",
     "${silabs_common_plat_dir}/LEDWidget.cpp",
+    "${silabs_common_plat_dir}/MatterConfig.cpp",
     "${silabs_common_plat_dir}/SoftwareFaultReports.cpp",
     "${silabs_common_plat_dir}/heap_4_silabs.c",
     "${silabs_common_plat_dir}/silabs_utils.cpp",
@@ -256,10 +258,8 @@ source_set("siwx917-common") {
     "${wifi_sdk_dir}/ethernetif.cpp",
     "${wifi_sdk_dir}/lwip_netif.cpp",
     "${wifi_sdk_dir}/wfx_notify.cpp",
-    "BaseApplication.cpp",
     "SiWx917/rsi_if.c",
     "SiWx917/wfx_rsi_host.c",
-    "${silabs_common_plat_dir}/MatterConfig.cpp",
   ]
 
   if (chip_enable_pw_rpc || chip_build_libshell) {