Add support for Sleepy End Device in EFR32 examples and add power man…

…ager to enable and handle MCU sleep modes
project-chip · Jan 24, 2022 · 9dd2eb5 · 9dd2eb5
1 parent 1490461
commit 9dd2eb5
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 144 deletions.
diff --git a/examples/lighting-app/efr32/.gn b/examples/lighting-app/efr32/.gn
@@ -23,6 +23,6 @@ check_system_includes = true
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"
-
+  chip_openthread_ftd = true
   import("//args.gni")
 }
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -45,6 +45,9 @@ declare_args() {
   # Monitor & log memory usage at runtime.
   enable_heap_monitoring = false
 
+  # Enable Sleepy end device
+  sleepy_device = false
+
   # Wifi related stuff - they are overriden by gn -args="use_wf200=true"
   use_wf200 = false
   use_rs911x = false

diff --git a/examples/lighting-app/efr32/args.gni b/examples/lighting-app/efr32/args.gni
@@ -21,5 +21,4 @@ efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log"
 chip_enable_openthread = true
-chip_openthread_ftd = true
 chip_system_config_use_open_thread_udp = true
diff --git a/examples/lighting-app/efr32/include/FreeRTOSConfig.h b/examples/lighting-app/efr32/include/FreeRTOSConfig.h
@@ -127,34 +127,15 @@ extern "C" {
  * See http://www.freertos.org/a00110.html.
  *----------------------------------------------------------*/
 
-/* Set configCREATE_LOW_POWER_DEMO as follows:
- *
- * 0: Build the full test and demo application.
- * 1: Build the simple blinky tickless low power demo, generating the tick
- *    interrupt from the RTCC.  EM2 will be entered.  The LXFO clock is used.
- *  See the comments at the top of main.c, main_full.c and main_low_power.c for
- *  more information.
- */
-
-#define configCREATE_LOW_POWER_DEMO (0)
-
-/* Some configuration is dependent on the demo being built. */
-#if (configCREATE_LOW_POWER_DEMO == 0)
-
-/* Tickless mode is not used. */
-
-/* Some of the standard demo test tasks assume a tick rate of 1KHz, even
-though that is faster than would normally be warranted by a real
-application. */
-#define configTICK_RATE_HZ (1000)
 
 /* Energy saving modes. */
 #if defined(SL_CATALOG_POWER_MANAGER_PRESENT)
 #define configUSE_TICKLESS_IDLE 1
 #else
 #define configUSE_TICKLESS_IDLE 0
-#endif
+#endif //SL_CATALOG_POWER_MANAGER_PRESENT
 
+#define configTICK_RATE_HZ (1000)
 /* Definition used by Keil to replace default system clock source. */
 #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 1
 
@@ -164,30 +145,6 @@ application. */
 #define configUSE_MALLOC_FAILED_HOOK (1)
 #define configUSE_IDLE_HOOK (1)
 
-#define configENERGY_MODE (sleepEM1)
-
-#else
-
-/* Tickless idle mode, generating RTOS tick interrupts from the RTC, fed
-by the LXFO clock. */
-
-/* The slow clock used to generate the tick interrupt in the low power demo
-runs at 32768/8=4096Hz.  Ensure the tick rate is a multiple of the clock. */
-#define configTICK_RATE_HZ (128)
-
-/* The low power demo uses the tickless idle feature. */
-#define configUSE_TICKLESS_IDLE (1)
-#define configOVERRIDE_DEFAULT_TICK_CONFIGURATION (1)
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK (0)
-#define configCHECK_FOR_STACK_OVERFLOW (0)
-#define configUSE_MALLOC_FAILED_HOOK (0)
-#define configUSE_IDLE_HOOK (1)
-
-#define configENERGY_MODE (sleepEM3)
-#endif
-
 /* Main functions*/
 /* Run time stats gathering related definitions. */
 #define configGENERATE_RUN_TIME_STATS (0)

diff --git a/examples/lighting-app/efr32/src/main.cpp b/examples/lighting-app/efr32/src/main.cpp
@@ -150,7 +150,14 @@ int main(void)
         appError(ret);
     }
 
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#else // CHIP_DEVICE_CONFIG_THREAD_FTD
+#if CHIP_DEVICE_CONFIG_ENABLE_SED
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#endif // CHIP_DEVICE_CONFIG_ENABLE_SED
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#endif // CHIP_DEVICE_CONFIG_THREAD_FTD
     if (ret != CHIP_NO_ERROR)
     {
         EFR32_LOG("ConnectivityMgr().SetThreadDeviceType() failed");

diff --git a/examples/lock-app/efr32/.gn b/examples/lock-app/efr32/.gn
@@ -23,6 +23,6 @@ check_system_includes = true
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"
-
+  chip_openthread_ftd = true
   import("//args.gni")
 }
diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -43,6 +43,9 @@ declare_args() {
 
   # Monitor & log memory usage at runtime.
   enable_heap_monitoring = false
+
+  # Enable Sleepy end device
+  sleepy_device = false
 
   # Wifi related stuff - they are overriden by gn -args="use_wf200=true"
   use_wf200 = false

diff --git a/examples/lock-app/efr32/args.gni b/examples/lock-app/efr32/args.gni
@@ -19,6 +19,5 @@ import("${chip_root}/src/platform/EFR32/args.gni")
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_enable_openthread = true
-chip_openthread_ftd = true
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log"
diff --git a/examples/lock-app/efr32/include/FreeRTOSConfig.h b/examples/lock-app/efr32/include/FreeRTOSConfig.h
@@ -127,34 +127,15 @@ extern "C" {
  * See http://www.freertos.org/a00110.html.
  *----------------------------------------------------------*/
 
-/* Set configCREATE_LOW_POWER_DEMO as follows:
- *
- * 0: Build the full test and demo application.
- * 1: Build the simple blinky tickless low power demo, generating the tick
- *    interrupt from the RTCC.  EM2 will be entered.  The LXFO clock is used.
- *  See the comments at the top of main.c, main_full.c and main_low_power.c for
- *  more information.
- */
-
-#define configCREATE_LOW_POWER_DEMO (0)
-
-/* Some configuration is dependent on the demo being built. */
-#if (configCREATE_LOW_POWER_DEMO == 0)
-
-/* Tickless mode is not used. */
-
-/* Some of the standard demo test tasks assume a tick rate of 1KHz, even
-though that is faster than would normally be warranted by a real
-application. */
-#define configTICK_RATE_HZ (1000)
 
 /* Energy saving modes. */
 #if defined(SL_CATALOG_POWER_MANAGER_PRESENT)
 #define configUSE_TICKLESS_IDLE 1
 #else
 #define configUSE_TICKLESS_IDLE 0
-#endif
+#endif //SL_CATALOG_POWER_MANAGER_PRESENT
 
+#define configTICK_RATE_HZ (1000)
 /* Definition used by Keil to replace default system clock source. */
 #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 1
 
@@ -164,30 +145,6 @@ application. */
 #define configUSE_MALLOC_FAILED_HOOK (1)
 #define configUSE_IDLE_HOOK (1)
 
-#define configENERGY_MODE (sleepEM1)
-
-#else
-
-/* Tickless idle mode, generating RTOS tick interrupts from the RTC, fed
-by the LXFO clock. */
-
-/* The slow clock used to generate the tick interrupt in the low power demo
-runs at 32768/8=4096Hz.  Ensure the tick rate is a multiple of the clock. */
-#define configTICK_RATE_HZ (128)
-
-/* The low power demo uses the tickless idle feature. */
-#define configUSE_TICKLESS_IDLE (1)
-#define configOVERRIDE_DEFAULT_TICK_CONFIGURATION (1)
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK (0)
-#define configCHECK_FOR_STACK_OVERFLOW (0)
-#define configUSE_MALLOC_FAILED_HOOK (0)
-#define configUSE_IDLE_HOOK (1)
-
-#define configENERGY_MODE (sleepEM3)
-#endif
-
 /* Main functions*/
 /* Run time stats gathering related definitions. */
 #define configGENERATE_RUN_TIME_STATS (0)

diff --git a/examples/lock-app/efr32/src/main.cpp b/examples/lock-app/efr32/src/main.cpp
@@ -146,7 +146,14 @@ int main(void)
         appError(ret);
     }
 
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#else // CHIP_DEVICE_CONFIG_THREAD_FTD
+#if CHIP_DEVICE_CONFIG_ENABLE_SED
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#endif // CHIP_DEVICE_CONFIG_ENABLE_SED
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#endif // CHIP_DEVICE_CONFIG_THREAD_FTD
     if (ret != CHIP_NO_ERROR)
     {
         EFR32_LOG("ConnectivityMgr().SetThreadDeviceType() failed");

diff --git a/examples/window-app/efr32/.gn b/examples/window-app/efr32/.gn
@@ -23,6 +23,6 @@ check_system_includes = true
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"
-
+  chip_openthread_ftd = true
   import("//args.gni")
 }
diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
@@ -38,6 +38,9 @@ declare_args() {
   # Monitor & log memory usage at runtime.
   enable_heap_monitoring = false
 
+  # Enable Sleepy end device
+  sleepy_device = false
+
   # Wifi related stuff - they are overriden by gn -args="use_wf200=true"
   use_wf200 = false
   use_rs911x = false

diff --git a/examples/window-app/efr32/args.gni b/examples/window-app/efr32/args.gni
@@ -21,4 +21,3 @@ efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log"
 chip_enable_openthread = true
-chip_openthread_ftd = true
diff --git a/examples/window-app/efr32/include/FreeRTOSConfig.h b/examples/window-app/efr32/include/FreeRTOSConfig.h
@@ -127,34 +127,15 @@ extern "C" {
  * See http://www.freertos.org/a00110.html.
  *----------------------------------------------------------*/
 
-/* Set configCREATE_LOW_POWER_DEMO as follows:
- *
- * 0: Build the full test and demo application.
- * 1: Build the simple blinky tickless low power demo, generating the tick
- *    interrupt from the RTCC.  EM2 will be entered.  The LXFO clock is used.
- *  See the comments at the top of main.c, main_full.c and main_low_power.c for
- *  more information.
- */
-
-#define configCREATE_LOW_POWER_DEMO (0)
-
-/* Some configuration is dependent on the demo being built. */
-#if (configCREATE_LOW_POWER_DEMO == 0)
-
-/* Tickless mode is not used. */
-
-/* Some of the standard demo test tasks assume a tick rate of 1KHz, even
-though that is faster than would normally be warranted by a real
-application. */
-#define configTICK_RATE_HZ (1000)
 
 /* Energy saving modes. */
 #if defined(SL_CATALOG_POWER_MANAGER_PRESENT)
 #define configUSE_TICKLESS_IDLE 1
 #else
 #define configUSE_TICKLESS_IDLE 0
-#endif
+#endif //SL_CATALOG_POWER_MANAGER_PRESENT
 
+#define configTICK_RATE_HZ (1000)
 /* Definition used by Keil to replace default system clock source. */
 #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 1
 
@@ -164,30 +145,6 @@ application. */
 #define configUSE_MALLOC_FAILED_HOOK (1)
 #define configUSE_IDLE_HOOK (1)
 
-#define configENERGY_MODE (sleepEM1)
-
-#else
-
-/* Tickless idle mode, generating RTOS tick interrupts from the RTC, fed
-by the LXFO clock. */
-
-/* The slow clock used to generate the tick interrupt in the low power demo
-runs at 32768/8=4096Hz.  Ensure the tick rate is a multiple of the clock. */
-#define configTICK_RATE_HZ (128)
-
-/* The low power demo uses the tickless idle feature. */
-#define configUSE_TICKLESS_IDLE (1)
-#define configOVERRIDE_DEFAULT_TICK_CONFIGURATION (1)
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK (0)
-#define configCHECK_FOR_STACK_OVERFLOW (0)
-#define configUSE_MALLOC_FAILED_HOOK (0)
-#define configUSE_IDLE_HOOK (1)
-
-#define configENERGY_MODE (sleepEM3)
-#endif
-
 /* Main functions*/
 /* Run time stats gathering related definitions. */
 #define configGENERATE_RUN_TIME_STATS (0)

diff --git a/examples/window-app/efr32/src/WindowAppImpl.cpp b/examples/window-app/efr32/src/WindowAppImpl.cpp
@@ -382,7 +382,10 @@ void WindowAppImpl::UpdateLCD()
     }
     else
     {
-        LCDWriteQRCode((uint8_t *) mQRCode.c_str());
+        if (GetQRCode(mQRCode, chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE)) == CHIP_NO_ERROR)
+        {
+            LCDWriteQRCode((uint8_t *) mQRCode.c_str());
+        }
     }
 #endif
 }

diff --git a/examples/window-app/efr32/src/main.cpp b/examples/window-app/efr32/src/main.cpp
@@ -131,7 +131,14 @@ int main(void)
         appError(err);
     }
 
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
     err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#else // CHIP_DEVICE_CONFIG_THREAD_FTD
+#if CHIP_DEVICE_CONFIG_ENABLE_SED
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#endif // CHIP_DEVICE_CONFIG_ENABLE_SED
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#endif // CHIP_DEVICE_CONFIG_THREAD_FTD
     if (err != CHIP_NO_ERROR)
     {
         EFR32_LOG("ConnectivityMgr().SetThreadDeviceType() failed");

diff --git a/third_party/efr32_sdk/efr32_sdk.gni b/third_party/efr32_sdk/efr32_sdk.gni
@@ -152,6 +152,18 @@ template("efr32_sdk") {
 
     defines += board_defines
 
+    if (defined(invoker.sleepy_device))
+    {
+      if (invoker.sleepy_device) {
+        print("INVOKER SLEEPY")
+        defines += [
+          "CHIP_DEVICE_CONFIG_ENABLE_SED=1",
+          "SL_CATALOG_POWER_MANAGER_PRESENT",
+          "SL_CATALOG_SLEEPTIMER_PRESENT",
+          ]
+      }
+    } 
+
     if (chip_build_libshell) {
       defines += [
         "ENABLE_CHIP_SHELL",

diff --git a/third_party/efr32_sdk/repo b/third_party/efr32_sdk/repo
diff --git a/third_party/zap/repo b/third_party/zap/repo
-Original file line number
+Diff line change
@@ Expand Up / @@ -382,7 +382,10 @@ void WindowAppImpl::UpdateLCD() @@
         }
         else
         {
-            LCDWriteQRCode((uint8_t *) mQRCode.c_str());
+            if (GetQRCode(mQRCode, chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE)) == CHIP_NO_ERROR)
+            {
+                LCDWriteQRCode((uint8_t *) mQRCode.c_str());
+            }
         }
     #endif
     }
@@ Expand Down @@
+5 −1		matter/efr32/sl_component_catalog.h
+7 −2		matter/efr32/sl_event_handler.c
+70 −0		matter/efr32/sl_power_manager_config.h
+804 −0		...oader-storage-spiflash-single/efr32mg12p432f1024gl125-brd4161a/bootloader-storage-spiflash-single-1024k.s37
+0 −55		cypress/integration/theme/theme.spec.js
+2 −2		docs/zap-schema.svg
+2 −2		package.json
+0 −1		quasar.conf.js
+1 −5		src-electron/db/db-mapping.js
+2 −2		src-electron/db/query-attribute.js
+51 −99		src-electron/db/query-command.js
+2 −9		src-electron/db/query-config.js
+13 −17		src-electron/db/query-endpoint-type.js
+25 −53		src-electron/db/query-impexp.js
+3 −5		src-electron/db/query-loader.js
+1 −1		src-electron/db/query-session-zcl.js
+7 −7		src-electron/db/query-zcl.js
+2 −3		src-electron/db/zap-schema.sql
+45 −65		src-electron/generator/helper-endpointconfig.js
+89 −82		src-electron/generator/helper-session.js
+14 −28		src-electron/generator/helper-zcl.js
+11 −35		src-electron/ui/menu.js
+6 −5		src-electron/ui/window.ts
+21 −18		src-electron/util/iterator-util.js
+9 −15		src-electron/zcl/zcl-loader-dotdot.js
+6 −48		src-electron/zcl/zcl-loader-silabs.js
+2 −1		src-electron/zcl/zcl-loader.js
+0 −40		src-shared/db-enum.js
+6 −6		src-shared/rend-api.js
+1 −1		src-shared/types/db-types.ts
+15 −4		src/App.vue
+9 −23		src/api/renderer_api.js
+1 −2		src/layouts/ZclLayout.vue
+13 −4		src/pages/PreferenceUser.vue
+0 −2		test/gen-meta.test.js
+0 −84		test/resource/bead.zap
+0 −7		test/resource/meta/access.zapt
+2 −3		test/resource/meta/test1.xml
+0 −5		test/resource/meta/test1.zapt
+0 −1		zcl-builtin/shared/schema/zcl.xsd