[Telink]: Use separate OpenThread configs for apps (#18891)

project-chip · May 31, 2022 · e74d2b3 · e74d2b3
1 parent 04ceb50
commit e74d2b3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/config/telink/app/zephyr.conf b/config/telink/app/zephyr.conf
@@ -71,8 +71,6 @@ CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"
 
 # OpenThread configs
-CONFIG_OPENTHREAD_MTD=y
-CONFIG_OPENTHREAD_FTD=n
 CONFIG_OPENTHREAD_SLAAC=y
 CONFIG_OPENTHREAD_DHCP6_CLIENT=y
 CONFIG_OPENTHREAD_SNTP_CLIENT=y

diff --git a/examples/light-switch-app/telink/prj.conf b/examples/light-switch-app/telink/prj.conf
@@ -24,6 +24,10 @@ CONFIG_GPIO=y
 # enable PWM
 CONFIG_PWM=y
 
+# OpenThread configs
+CONFIG_OPENTHREAD_MTD=y
+CONFIG_OPENTHREAD_FTD=n
+
 # Default OpenThread network settings
 CONFIG_OPENTHREAD_PANID=4660
 CONFIG_OPENTHREAD_CHANNEL=15

diff --git a/examples/light-switch-app/telink/src/main.cpp b/examples/light-switch-app/telink/src/main.cpp
@@ -64,7 +64,13 @@ int main(void)
         goto exit;
     }
 
+#ifdef CONFIG_OPENTHREAD_MTD_SED
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#elif CONFIG_OPENTHREAD_MTD
     err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#else
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#endif
     if (err != CHIP_NO_ERROR)
     {
         LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");

diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf
@@ -24,6 +24,10 @@ CONFIG_GPIO=y
 # enable PWM
 CONFIG_PWM=y
 
+# OpenThread configs
+CONFIG_OPENTHREAD_MTD=y
+CONFIG_OPENTHREAD_FTD=n
+
 # Default OpenThread network settings
 CONFIG_OPENTHREAD_PANID=4660
 CONFIG_OPENTHREAD_CHANNEL=15

diff --git a/examples/lighting-app/telink/src/main.cpp b/examples/lighting-app/telink/src/main.cpp
@@ -64,7 +64,11 @@ int main(void)
         goto exit;
     }
 
+#ifdef CONFIG_OPENTHREAD_MTD
     err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#else
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#endif
     if (err != CHIP_NO_ERROR)
     {
         LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");