[TI] Resolve build issues in Example Applications (#28508)

* Update TI Example applications to correctly pull in requirements.txt - Fix application build failures * Adjust return value to properly exit post-commissioning * Resolve run-time failure when using MTD configuration * Update OT TI Configuration * Disable Progress logging on lighting app for size constraints * Restyled by clang-format * Restyled by gn --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Oct 12, 2023 · 2526245 · 2526245
1 parent b595c0f
commit 2526245
Show file tree

Hide file tree

Showing 28 changed files with 64 additions and 21 deletions.
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/.gn b/examples/all-clusters-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/all-clusters-app/cc13x4_26x4/.gn b/examples/all-clusters-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/all-clusters-app/cc13x4_26x4/args.gni b/examples/all-clusters-app/cc13x4_26x4/args.gni
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/config/standalone/args.gni")
 import("${chip_root}/examples/platform/cc13x4_26x4/args.gni")
 
 ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")

diff --git a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
@@ -216,14 +216,13 @@ int AppTask::Init()
             ;
     }
 
-#ifdef CONFIG_OPENTHREAD_MTD_SED
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
-#elif CONFIG_OPENTHREAD_MTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #endif
-
     if (ret != CHIP_NO_ERROR)
     {
         PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");

diff --git a/examples/lighting-app/cc13x2x7_26x2x7/.gn b/examples/lighting-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/args.gni b/examples/lighting-app/cc13x2x7_26x2x7/args.gni
@@ -33,7 +33,8 @@ chip_openthread_ftd = false
 openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2"
 
 # Disable CHIP Logging
-#chip_progress_logging = false
+chip_progress_logging = false
+
 #chip_detail_logging = false
 #chip_automation_logging = false
 

diff --git a/examples/lighting-app/cc13x4_26x4/.gn b/examples/lighting-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/lock-app/cc13x2x7_26x2x7/.gn b/examples/lock-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/lock-app/cc13x2x7_26x2x7/args.gni b/examples/lock-app/cc13x2x7_26x2x7/args.gni
@@ -34,7 +34,8 @@ openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc
 
 # Disable CHIP Logging
 chip_progress_logging = false
-chip_detail_logging = false
+
+#chip_detail_logging = false
 chip_automation_logging = false
 
 # BLE options

diff --git a/examples/lock-app/cc13x4_26x4/.gn b/examples/lock-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/lock-app/cc13x4_26x4/args.gni b/examples/lock-app/cc13x4_26x4/args.gni
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/config/standalone/args.gni")
 import("${chip_root}/examples/platform/cc13x4_26x4/args.gni")
 
 ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")

diff --git a/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h b/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h
@@ -96,4 +96,4 @@
 #define OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE 1
 
 // Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13xx_cc26xx-config.h"
+#include "openthread-core-cc13xx_cc26xx-config-matter.h"
diff --git a/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h b/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h
@@ -96,4 +96,4 @@
 #define OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE 1
 
 // Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13xx_cc26xx-config.h"
+#include "openthread-core-cc13xx_cc26xx-config-matter.h"
diff --git a/examples/pump-app/cc13x2x7_26x2x7/.gn b/examples/pump-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
@@ -156,13 +156,14 @@ int AppTask::Init()
             ;
     }
 
-#ifdef CONFIG_OPENTHREAD_MTD_SED
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
-#elif CONFIG_OPENTHREAD_MTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #endif
+
     if (ret != CHIP_NO_ERROR)
     {
         PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");

diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
@@ -27,6 +27,8 @@
 #include "AppConfig.h"
 #include "PumpManager.h"
 
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
 #include <app/server/Dnssd.h>
 #include <app/util/util.h>
 #include <lib/support/CodeUtils.h>

diff --git a/examples/pump-app/cc13x4_26x4/.gn b/examples/pump-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/pump-app/cc13x4_26x4/args.gni b/examples/pump-app/cc13x4_26x4/args.gni
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/config/standalone/args.gni")
 import("${chip_root}/examples/platform/cc13x4_26x4/args.gni")
 
 ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")

diff --git a/examples/pump-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
@@ -157,12 +157,12 @@ int AppTask::Init()
             ;
     }
 
-#ifdef CONFIG_OPENTHREAD_MTD_SED
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
-#elif CONFIG_OPENTHREAD_MTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #endif
     if (ret != CHIP_NO_ERROR)
     {

diff --git a/examples/pump-app/cc13x4_26x4/main/DeviceCallbacks.cpp b/examples/pump-app/cc13x4_26x4/main/DeviceCallbacks.cpp
@@ -27,6 +27,8 @@
 #include "AppConfig.h"
 #include "PumpManager.h"
 
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
 #include <app/server/Dnssd.h>
 #include <app/util/util.h>
 #include <lib/support/CodeUtils.h>

diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/.gn b/examples/pump-controller-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp
@@ -145,7 +145,14 @@ int AppTask::Init()
             ;
     }
 
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#else
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#endif
+
     if (ret != CHIP_NO_ERROR)
     {
         PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");

diff --git a/examples/pump-controller-app/cc13x4_26x4/.gn b/examples/pump-controller-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/pump-controller-app/cc13x4_26x4/args.gni b/examples/pump-controller-app/cc13x4_26x4/args.gni
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/config/standalone/args.gni")
 import("${chip_root}/examples/platform/cc13x4_26x4/args.gni")
 
 ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")

diff --git a/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
@@ -145,7 +145,14 @@ int AppTask::Init()
             ;
     }
 
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#else
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#endif
+
     if (ret != CHIP_NO_ERROR)
     {
         PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");

diff --git a/scripts/setup/requirements.ti.txt b/scripts/setup/requirements.ti.txt
@@ -1 +1,2 @@
 ecdsa>=0.17.0
+intelhex
diff --git a/src/platform/cc13xx_26xx/BLEManagerImpl.cpp b/src/platform/cc13xx_26xx/BLEManagerImpl.cpp
@@ -266,9 +266,7 @@ bool BLEManagerImpl::CloseConnection(BLE_CONNECTION_OBJECT conId)
     void * pMsg = (void *) ICall_malloc(sizeof(void *));
     pMsg        = (void *) conId;
 
-    EnqueueEvtHdrMsg(BLEManagerIMPL_CHIPOBLE_CLOSE_CONN_EVT, (void *) pMsg);
-
-    return false;
+    return (EnqueueEvtHdrMsg(BLEManagerIMPL_CHIPOBLE_CLOSE_CONN_EVT, (void *) pMsg) == true);
 }
 
 uint16_t BLEManagerImpl::GetMTU(BLE_CONNECTION_OBJECT conId) const

diff --git a/third_party/openthread/ot-ti b/third_party/openthread/ot-ti
+1 −0		.gitmodules
+11 −5		CMakeLists.txt
+5 −4		README.md
+24 −14		boards.cmake
+1 −1		openthread
+8 −8		script/bootstrap
+82 −17		script/build
+98 −0		script/release
+11 −3		src/CMakeLists.txt
+31 −26		src/FreeRTOSConfig.h
+55 −34		src/alarm.c
+38 −16		src/alarm_micro.c
+43 −0		src/arm-none-eabi-m33.cmake
+2 −2		src/arm-none-eabi-m4f.cmake
+97 −0		src/openthread-core-cc13xx_cc26xx-config-matter.h
+111 −0		src/openthread-core-cc13xx_cc26xx-config-thci.h
+64 −1		src/openthread-core-cc13xx_cc26xx-config.h
+17 −19		src/openthread.syscfg
+416 −109		src/radio.c
+1 −1		src/spi_periph.c
+1 −1		src/uart.c
+18 −0		third_party/freertos/CMakeLists.txt
+51 −0		third_party/freertos/shim.c
+20 −44		third_party/mbedtls/CMakeLists.txt
+1 −1		third_party/mbedtls/mbedtls-config-cc13x2_cc26x2.h
+56 −63		third_party/mbedtls/mbedtls-config-cc13x4_cc26x4.h
+16 −9		third_party/ti_simplelink_sdk/CMakeLists.txt
+2 −1		third_party/ti_simplelink_sdk/README.md
+1 −1		third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx