[Silabs] Example cleanup (#28160)

* Move linker scripts to common place * Move Board_config * Move FreeRTOS Config * Move FreeRTOS config * Move Matter_config * Move MatterConfig * Move PW and uart header to common * Move Temperature Sensor * Delete init_efrplatform and init_ccpplatform * Move Base Application * Add missing lib * fix wifi
project-chip · Apr 16, 2024 · a5efd31 · a5efd31
1 parent ea9bd17
commit a5efd31
Show file tree

Hide file tree

Showing 50 changed files with 130 additions and 1,813 deletions.
diff --git a/config/efr32/lib/pw_rpc/BUILD.gn b/config/efr32/lib/pw_rpc/BUILD.gn
@@ -24,7 +24,7 @@ static_library("pw_rpc") {
   public_deps = [
     "$dir_pw_rpc:server",
     "$dir_pw_rpc/nanopb:echo_service",
-    "${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32",
+    "${chip_root}/examples/platform/silabs/pw_sys_io:pw_sys_io_silabs",
     "${dir_pigweed}/pw_hdlc:pw_rpc",
     dir_pw_assert,
     dir_pw_checksum,

diff --git a/config/efr32/lib/pw_rpc/pw_rpc.gni b/config/efr32/lib/pw_rpc/pw_rpc.gni
@@ -19,7 +19,7 @@ pw_log_BACKEND = "$dir_pw_log_basic"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
 pw_sys_io_BACKEND =
-    "${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32"
+    "${chip_root}/examples/platform/silabs/pw_sys_io:pw_sys_io_silabs"
 
 pw_build_LINK_DEPS = [
   "$dir_pw_assert:impl",

diff --git a/examples/chef/silabs/BUILD.gn b/examples/chef/silabs/BUILD.gn
@@ -56,7 +56,7 @@ chip_data_model("chef-common") {
 efr32_sdk("sdk") {
   sources = [
     "${efr32_project_dir}/include/CHIPProjectConfig.h",
-    "${examples_plat_dir}/FreeRTOSConfig.h",
+    "${examples_common_plat_dir}/FreeRTOSConfig.h",
   ]
 
   include_dirs = [
@@ -133,7 +133,7 @@ silabs_executable("chef_app") {
       "${chip_root}/examples/common/pigweed:lighting_service.nanopb_rpc",
       "${chip_root}/examples/common/pigweed:ot_cli_service.nanopb_rpc",
       "${chip_root}/examples/common/pigweed:thread_service.nanopb_rpc",
-      "${examples_plat_dir}/pw_sys_io:pw_sys_io_efr32",
+      "${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs",
     ]
 
     deps += pw_build_LINK_DEPS
@@ -144,7 +144,7 @@ silabs_executable("chef_app") {
     ]
   }
 
-  ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld"
+  ldscript = "${examples_common_plat_dir}/ldscripts/${silabs_family}.ld"
 
   inputs = [ ldscript ]
 

diff --git a/examples/light-switch-app/silabs/BUILD.gn b/examples/light-switch-app/silabs/BUILD.gn
@@ -52,7 +52,7 @@ declare_args() {
 if (wifi_soc) {
   siwx917_sdk("sdk") {
     sources = [
-      "${examples_plat_dir}/FreeRTOSConfig.h",
+      "${examples_common_plat_dir}/FreeRTOSConfig.h",
       "${silabs_project_dir}/include/CHIPProjectConfig.h",
     ]
 
@@ -75,7 +75,7 @@ if (wifi_soc) {
 } else {
   efr32_sdk("sdk") {
     sources = [
-      "${examples_plat_dir}/FreeRTOSConfig.h",
+      "${examples_common_plat_dir}/FreeRTOSConfig.h",
       "${silabs_project_dir}/include/CHIPProjectConfig.h",
     ]
 
@@ -170,7 +170,7 @@ silabs_executable("light_switch_app") {
     if (wifi_soc) {
       deps += [ "${examples_plat_dir}/pw_sys_io:pw_sys_io_siwx917" ]
     } else {
-      deps += [ "${examples_plat_dir}/pw_sys_io:pw_sys_io_efr32" ]
+      deps += [ "${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs" ]
     }
 
     deps += pw_build_LINK_DEPS
@@ -181,7 +181,7 @@ silabs_executable("light_switch_app") {
     ]
   }
 
-  ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld"
+  ldscript = "${examples_common_plat_dir}/ldscripts/${silabs_family}.ld"
 
   inputs = [ ldscript ]
 

diff --git a/examples/lighting-app/silabs/BUILD.gn b/examples/lighting-app/silabs/BUILD.gn
@@ -68,7 +68,7 @@ if (slc_generate) {
 if (wifi_soc) {
   siwx917_sdk("sdk") {
     sources = [
-      "${examples_plat_dir}/FreeRTOSConfig.h",
+      "${examples_common_plat_dir}/FreeRTOSConfig.h",
       "${silabs_project_dir}/include/CHIPProjectConfig.h",
     ]
 
@@ -91,7 +91,7 @@ if (wifi_soc) {
 } else {
   efr32_sdk("sdk") {
     sources = [
-      "${examples_plat_dir}/FreeRTOSConfig.h",
+      "${examples_common_plat_dir}/FreeRTOSConfig.h",
       "${silabs_project_dir}/include/CHIPProjectConfig.h",
     ]
 
@@ -191,7 +191,7 @@ silabs_executable("lighting_app") {
     if (wifi_soc) {
       deps += [ "${examples_plat_dir}/pw_sys_io:pw_sys_io_siwx917" ]
     } else {
-      deps += [ "${examples_plat_dir}/pw_sys_io:pw_sys_io_efr32" ]
+      deps += [ "${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs" ]
     }
 
     deps += pw_build_LINK_DEPS
@@ -202,7 +202,7 @@ silabs_executable("lighting_app") {
     ]
   }
 
-  ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld"
+  ldscript = "${examples_common_plat_dir}/ldscripts/${silabs_family}.ld"
 
   inputs = [ ldscript ]
 

diff --git a/examples/lock-app/silabs/BUILD.gn b/examples/lock-app/silabs/BUILD.gn
@@ -52,7 +52,7 @@ declare_args() {
 if (wifi_soc) {
   siwx917_sdk("sdk") {
     sources = [
-      "${examples_plat_dir}/FreeRTOSConfig.h",
+      "${examples_common_plat_dir}/FreeRTOSConfig.h",
       "${silabs_project_dir}/include/CHIPProjectConfig.h",
     ]
 
@@ -75,7 +75,7 @@ if (wifi_soc) {
 } else {
   efr32_sdk("sdk") {
     sources = [
-      "${examples_plat_dir}/FreeRTOSConfig.h",
+      "${examples_common_plat_dir}/FreeRTOSConfig.h",
       "${silabs_project_dir}/include/CHIPProjectConfig.h",
     ]
 
@@ -172,7 +172,7 @@ silabs_executable("lock_app") {
     if (wifi_soc) {
       deps += [ "${examples_plat_dir}/pw_sys_io:pw_sys_io_siwx917" ]
     } else {
-      deps += [ "${examples_plat_dir}/pw_sys_io:pw_sys_io_efr32" ]
+      deps += [ "${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs" ]
     }
 
     deps += pw_build_LINK_DEPS
@@ -183,7 +183,7 @@ silabs_executable("lock_app") {
     ]
   }
 
-  ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld"
+  ldscript = "${examples_common_plat_dir}/ldscripts/${silabs_family}.ld"
 
   inputs = [ ldscript ]
 

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/...es/platform/silabs/efr32/FreeRTOSConfig.h → examples/platform/silabs/FreeRTOSConfig.h b/...es/platform/silabs/efr32/FreeRTOSConfig.h → examples/platform/silabs/FreeRTOSConfig.h
diff --git a/...s/platform/silabs/efr32/matter_config.cpp → examples/platform/silabs/MatterConfig.cpp b/...s/platform/silabs/efr32/matter_config.cpp → examples/platform/silabs/MatterConfig.cpp
@@ -19,7 +19,7 @@
 
 #include "AppConfig.h"
 #include "OTAConfig.h"
-#include <matter_config.h>
+#include <MatterConfig.h>
 
 #include <FreeRTOS.h>
 
@@ -165,6 +165,12 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     SILABS_LOG("Init CHIP Stack");
     // 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
+    InitWiFi();
+#endif
+
     ReturnErrorOnFailure(PlatformMgr().InitChipStack());
 
     SetDeviceInstanceInfoProvider(&Silabs::SilabsDeviceDataProvider::GetDeviceDataProvider());
@@ -231,10 +237,6 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     SILABS_LOG("Starting Platform Manager Event Loop");
     ReturnErrorOnFailure(PlatformMgr().StartEventLoopTask());
 
-#ifdef SL_WIFI
-    InitWiFi();
-#endif
-
 #ifdef ENABLE_CHIP_SHELL
     chip::startShellTask();
 #endif
@@ -251,15 +253,14 @@ void SilabsMatterConfig::InitWiFi(void)
 #ifdef SL_WFX_USE_SECURE_LINK
     wfx_securelink_task_start(); // start securelink key renegotiation task
 #endif                           // SL_WFX_USE_SECURE_LINK
-#endif                           /* WF200_WIFI */
-
-#ifdef RS911X_WIFI
-    /*
-     * Start up any RSI interface stuff
-     * (Not required) - Note that wfx_wifi_start will deal with
-     * starting up a rsi task - which will initialize the SPI interface.
-     */
-#endif
+#elif defined(SIWX_917)
+    SILABS_LOG("Init RSI 917 Platform");
+    if (wfx_rsi_platform() != SL_STATUS_OK)
+    {
+        SILABS_LOG("RSI init failed");
+        return CHIP_ERROR_INTERNAL;
+    }
+#endif /* WF200_WIFI */
 }
 #endif // SL_WIFI
 

diff --git a/examples/platform/silabs/matter_config.h → examples/platform/silabs/MatterConfig.h b/examples/platform/silabs/matter_config.h → examples/platform/silabs/MatterConfig.h
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,11 +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",
-    "init_ccpPlatform.cpp",
-    "matter_config.cpp",
   ]
 
   if (chip_enable_pw_rpc || chip_build_libshell) {