Pull request #65: RC3 cherrypicks + point to matter_support/workswith

Merge in WMN_TOOLS/matter from rc3_cherrypicks to RC_0.3.0 Squashed commit of the following: commit bbfbb9c82faae045a2f47453f9e589065ea50edd Author: Junior Martinez <[email protected]> Date: Fri Sep 2 13:24:15 2022 -0400 re-enable BRD4162A for wifi builds as it is support with the workswith branch of matter_support commit 1509b4aa5f9ebaf6c6f727a893160dd086893912 Author: Junior Martinez <[email protected]> Date: Fri Sep 2 13:22:21 2022 -0400 Change matter_support submodule to point to the workswith branch commit 46c630d083cf305e1f33351180449ea500ac8690 Author: jmartinez-silabs <[email protected]> Date: Wed Aug 31 00:24:32 2022 -0400 Add openthread lib with coap api enabled (project-chip#22276) commit 0e3839fdc48e7373000705f8bea1a993dd27b5a4 Author: Jean-Francois Penven <[email protected]> Date: Thu Sep 1 17:42:34 2022 -0400 Fix wf200 openthread include (project-chip#22347) commit 439b376dba33d43ca213434f5d0473ebe2c1d3bb Author: mkardous-silabs <[email protected]> Date: Thu Sep 1 16:26:49 2022 -0400 Fix thermostat build (project-chip#22346)
SiliconLabs · Sep 8, 2022 · 2d55b46 · 2d55b46
1 parent 4e373a5
commit 2d55b46
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 12 deletions.
diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn
@@ -82,6 +82,7 @@ assert(!(use_rs911x && chip_enable_openthread))
 assert(!(use_wf200 && chip_enable_openthread))
 if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
+  enable_openthread_cli = false
 }
 
 chip_data_model("chef-common") {
@@ -192,7 +193,8 @@ efr32_executable("chef_app") {
     "src/main.cpp",
   ]
 
-  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
+  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
+      use_wf200) {
     sources += [ "${examples_plat_dir}/uart.cpp" ]
   }
 

diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -82,6 +82,7 @@ assert(!(use_rs911x && chip_enable_openthread))
 assert(!(use_wf200 && chip_enable_openthread))
 if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
+  enable_openthread_cli = false
 }
 
 # ThunderBoards and Explorer Kit (No LCD)
@@ -185,7 +186,8 @@ efr32_executable("light_switch_app") {
     "src/main.cpp",
   ]
 
-  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
+  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
+      use_wf200) {
     sources += [ "${examples_plat_dir}/uart.cpp" ]
   }
 

diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -82,6 +82,7 @@ assert(!(use_rs911x && chip_enable_openthread))
 assert(!(use_wf200 && chip_enable_openthread))
 if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
+  enable_openthread_cli = false
 }
 
 # ThunderBoards and Explorer Kit (No LCD)
@@ -190,7 +191,8 @@ efr32_executable("lighting_app") {
     "src/main.cpp",
   ]
 
-  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
+  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
+      use_wf200) {
     sources += [ "${examples_plat_dir}/uart.cpp" ]
   }
 

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -82,6 +82,7 @@ assert(!(use_rs911x && chip_enable_openthread))
 assert(!(use_wf200 && chip_enable_openthread))
 if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
+  enable_openthread_cli = false
 }
 
 # ThunderBoards and Explorer Kit (No LCD)
@@ -184,7 +185,8 @@ efr32_executable("lock_app") {
     "src/main.cpp",
   ]
 
-  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
+  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
+      use_wf200) {
     sources += [ "${examples_plat_dir}/uart.cpp" ]
   }
 

diff --git a/examples/platform/efr32/BaseApplication.cpp b/examples/platform/efr32/BaseApplication.cpp
@@ -156,7 +156,7 @@ CHIP_ERROR BaseApplication::Init(Identify * identifyObj)
 
     if (identifyObj == nullptr)
     {
-        EFR32_LOG("funct timer create failed");
+        EFR32_LOG("Invalid Identify Object!");
         appError(CHIP_ERROR_INVALID_ARGUMENT);
     }
 

diff --git a/examples/shell/efr32/BUILD.gn b/examples/shell/efr32/BUILD.gn
@@ -61,7 +61,8 @@ efr32_executable("shell_app") {
     "src/main.cpp",
   ]
 
-  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
+  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
+      use_wf200) {
     sources += [ "${examples_plat_dir}/uart.cpp" ]
   }
 

diff --git a/examples/thermostat/efr32/BUILD.gn b/examples/thermostat/efr32/BUILD.gn
@@ -79,6 +79,7 @@ assert(!(use_rs911x && chip_enable_openthread))
 assert(!(use_wf200 && chip_enable_openthread))
 if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
+  enable_openthread_cli = false
 }
 
 # ThunderBoards and Explorer Kit (No LCD)
@@ -181,7 +182,8 @@ efr32_executable("thermostat_app") {
     "src/main.cpp",
   ]
 
-  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
+  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
+      use_wf200) {
     sources += [ "${examples_plat_dir}/uart.cpp" ]
   }
 

diff --git a/examples/thermostat/efr32/args.gni b/examples/thermostat/efr32/args.gni
@@ -24,3 +24,6 @@ pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 chip_enable_openthread = true
 pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
+
+openthread_external_platform =
+    "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
diff --git a/examples/thermostat/efr32/src/AppTask.cpp b/examples/thermostat/efr32/src/AppTask.cpp
@@ -140,6 +140,10 @@ CHIP_ERROR AppTask::Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
+#ifdef DISPLAY_ENABLED
+    GetLCD().Init((uint8_t *) "Thermostat-App");
+#endif
+
     err = BaseApplication::Init(&gIdentify);
     if (err != CHIP_NO_ERROR)
     {

diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
@@ -75,6 +75,7 @@ assert(!(use_rs911x && chip_enable_openthread))
 assert(!(use_wf200 && chip_enable_openthread))
 if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
+  enable_openthread_cli = false
 }
 
 # ThunderBoards and Explorer Kit (No LCD)
@@ -178,7 +179,7 @@ efr32_executable("window_app") {
     "src/main.cpp",
   ]
 
-  if (chip_build_libshell || enable_openthread_cli || enable_openthread_cli) {
+  if (chip_build_libshell || enable_openthread_cli || use_wf200) {
     sources += [ "${examples_plat_dir}/uart.cpp" ]
   }
 

diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_efr32_example.sh
@@ -156,6 +156,10 @@ else
                 optArgs+="use_silabs_thread_lib=true chip_openthread_target=$SILABS_THREAD_TARGET openthread_external_platform=\"""\" "
                 shift
                 ;;
+            --use_ot_coap_lib)
+                optArgs+="use_silabs_thread_lib=true chip_openthread_target=$SILABS_THREAD_TARGET openthread_external_platform=\"""\" use_thread_coap_lib=true "
+                shift
+                ;;
             *)
                 if [ "$1" =~ *"use_rs911x=true"* ] || [ "$1" =~ *"use_wf200=true"* ]; then
                     USE_WIFI=true

diff --git a/third_party/openthread/ot-efr32 b/third_party/openthread/ot-efr32
diff --git a/third_party/silabs/BUILD.gn b/third_party/silabs/BUILD.gn
@@ -23,6 +23,7 @@ declare_args() {
   efr32_sdk_target = ""
   sl_ot_efr32_root = "${chip_root}/third_party/openthread/ot-efr32"
   sl_openthread_root = "${chip_root}/third_party/openthread/ot-efr32/openthread"
+  use_thread_coap_lib = false
 }
 
 assert(efr32_sdk_target != "", "efr32_sdk_target must be specified")
@@ -131,7 +132,7 @@ if (use_silabs_thread_lib) {
       ":libopenthread-platform",
       ":openthread_core_config_efr32",
       "${segger_rtt_root}:segger_rtt",
-      "${sl_openthread_root}/include/openthread:openthread-platform",
+      "${sl_openthread_root}/include/openthread:openthread",
       "${sl_openthread_root}/src/core/:libopenthread_core_headers",
     ]
 
@@ -143,10 +144,16 @@ if (use_silabs_thread_lib) {
       XTD = "mtd"
     }
 
+    # Use silabs openthread library stack with or without coap api enabled
+    COAP_API = ""
+    if (use_thread_coap_lib) {
+      COAP_API = "coap_"
+    }
+
     public_configs += [ "${sl_openthread_root}:openthread_${XTD}_config" ]
 
     libs = [
-      "${sl_ot_efr32_root}/libs/libsl_ot_stack_${XTD}_${efr32_family}_gcc.a",
+      "${sl_ot_efr32_root}/libs/libsl_ot_stack_${XTD}_${COAP_API}${efr32_family}_gcc.a",
       "${sl_ot_efr32_root}/libs/libsl_platform_${XTD}_dmp_${efr32_family}_gcc.a",
     ]
   }

diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -208,6 +208,7 @@ template("efr32_sdk") {
     # USART include files
     if ((defined(invoker.chip_enable_pw_rpc) && invoker.chip_enable_pw_rpc) ||
         chip_build_libshell || enable_openthread_cli ||
+        (defined(invoker.use_wf200) && invoker.use_wf200) ||
         (defined(invoker.show_qr_code) && invoker.show_qr_code) ||
         (defined(invoker.disable_lcd) && !invoker.disable_lcd) ||
         (defined(invoker.use_external_flash) && use_external_flash)) {
@@ -532,6 +533,7 @@ template("efr32_sdk") {
     # USART sources files
     if ((defined(invoker.chip_enable_pw_rpc) && invoker.chip_enable_pw_rpc) ||
         chip_build_libshell || enable_openthread_cli ||
+        (defined(invoker.use_wf200) && invoker.use_wf200) ||
         (defined(invoker.show_qr_code) && invoker.show_qr_code) ||
         (defined(invoker.disable_lcd) && !invoker.disable_lcd) ||
         (defined(invoker.use_external_flash) && use_external_flash)) {

diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
+1 −1		.github/workflows/build.yml
+3 −3		CMakeLists.txt
+ −		libs/libsl_ot_stack_ftd_coap_efr32mg12_gcc.a
+ −		libs/libsl_ot_stack_ftd_coap_efr32mg13_gcc.a
+ −		libs/libsl_ot_stack_ftd_coap_efr32mg21_gcc.a
+ −		libs/libsl_ot_stack_ftd_coap_efr32mg24_gcc.a
+ −		libs/libsl_ot_stack_ftd_efr32mg12_gcc.a
+ −		libs/libsl_ot_stack_ftd_efr32mg13_gcc.a
+ −		libs/libsl_ot_stack_ftd_efr32mg21_gcc.a
+ −		libs/libsl_ot_stack_ftd_efr32mg24_gcc.a
+ −		libs/libsl_ot_stack_mtd_coap_efr32mg12_gcc.a
+ −		libs/libsl_ot_stack_mtd_coap_efr32mg13_gcc.a
+ −		libs/libsl_ot_stack_mtd_coap_efr32mg21_gcc.a
+ −		libs/libsl_ot_stack_mtd_coap_efr32mg24_gcc.a
+ −		libs/libsl_ot_stack_mtd_efr32mg12_gcc.a
+ −		libs/libsl_ot_stack_mtd_efr32mg13_gcc.a
+ −		libs/libsl_ot_stack_mtd_efr32mg21_gcc.a
+ −		libs/libsl_ot_stack_mtd_efr32mg24_gcc.a
+ −		libs/libsl_platform_ftd_dmp_efr32mg12_gcc.a
+ −		libs/libsl_platform_ftd_dmp_efr32mg13_gcc.a
+ −		libs/libsl_platform_ftd_dmp_efr32mg21_gcc.a
+ −		libs/libsl_platform_ftd_dmp_efr32mg24_gcc.a
+ −		libs/libsl_platform_ftd_efr32mg12_gcc.a
+ −		libs/libsl_platform_ftd_efr32mg13_gcc.a
+ −		libs/libsl_platform_ftd_efr32mg21_gcc.a
+ −		libs/libsl_platform_ftd_efr32mg24_gcc.a
+ −		libs/libsl_platform_mtd_dmp_efr32mg12_gcc.a
+ −		libs/libsl_platform_mtd_dmp_efr32mg13_gcc.a
+ −		libs/libsl_platform_mtd_dmp_efr32mg21_gcc.a
+ −		libs/libsl_platform_mtd_dmp_efr32mg24_gcc.a
+ −		libs/libsl_platform_mtd_efr32mg12_gcc.a
+ −		libs/libsl_platform_mtd_efr32mg13_gcc.a
+ −		libs/libsl_platform_mtd_efr32mg21_gcc.a
+ −		libs/libsl_platform_mtd_efr32mg24_gcc.a
+68 −1		src/src/diag.c
+1 −71		src/src/radio.c
+0 −29		third_party/CMakeLists.txt
+0 −67		third_party/jlink/CMakeLists.txt
+0 −99		third_party/jlink/Makefile.am
+0 −21		third_party/jlink/README.md
+0 −43		third_party/jlink/SEGGER_RTT_V640/Examples/Main_RTT_InputEchoApp.c
+0 −70		third_party/jlink/SEGGER_RTT_V640/Examples/Main_RTT_MenuApp.c
+0 −118		third_party/jlink/SEGGER_RTT_V640/Examples/Main_RTT_PrintfTest.c
+0 −69		third_party/jlink/SEGGER_RTT_V640/Examples/Main_RTT_SpeedTestApp.c
+0 −44		third_party/jlink/SEGGER_RTT_V640/License.txt
+0 −20		third_party/jlink/SEGGER_RTT_V640/README.txt
+0 −1,761		third_party/jlink/SEGGER_RTT_V640/RTT/SEGGER_RTT.c
+0 −260		third_party/jlink/SEGGER_RTT_V640/RTT/SEGGER_RTT.h
+0 −340		third_party/jlink/SEGGER_RTT_V640/RTT/SEGGER_RTT_Conf.h
+0 −510		third_party/jlink/SEGGER_RTT_V640/RTT/SEGGER_RTT_printf.c
+0 −130		third_party/jlink/SEGGER_RTT_V640/Syscalls/SEGGER_RTT_Syscalls_GCC.c
+0 −124		third_party/jlink/SEGGER_RTT_V640/Syscalls/SEGGER_RTT_Syscalls_IAR.c
+0 −374		third_party/jlink/SEGGER_RTT_V640/Syscalls/SEGGER_RTT_Syscalls_KEIL.c
+0 −257		third_party/jlink/SEGGER_RTT_V640/Syscalls/SEGGER_RTT_Syscalls_SES.c
+0 −1		third_party/silabs/slc/exporter_templates/platform_library/custom.Makefile
+32 −40		matter/wifi/brd4186c.h
+30 −38		matter/wifi/brd4187c.h
+101 −125		matter/wifi/wf200/efr_spi.c
+7 −3		matter/wifi/wf200/sl_wfx_board.h