Add OpenThread UDP endpoints (#15137)

* Support OpenThread UDP endpoints on the qpg platforms * clean-up of some `*.gn` and `*.gni` files
project-chip · Sep 15, 2023 · 1986464 · 1986464
1 parent c0c6e93
commit 1986464
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/examples/lighting-app/qpg/with_pw_rpc.gni b/examples/lighting-app/qpg/with_pw_rpc.gni
@@ -17,7 +17,6 @@
 
 import("//build_overrides/chip.gni")
 import("${chip_root}/config/qpg/lib/pw_rpc/pw_rpc.gni")
-import("${chip_root}/examples/platform/qpg/args.gni")
 
 qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 

diff --git a/examples/lock-app/qpg/with_pw_rpc.gni b/examples/lock-app/qpg/with_pw_rpc.gni
@@ -22,6 +22,5 @@ import("${chip_root}/examples/platform/qpg/args.gni")
 qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_enable_pw_rpc = true
-chip_enable_openthread = true
 
 cpp_standard = "gnu++17"
diff --git a/examples/persistent-storage/qpg/BUILD.gn b/examples/persistent-storage/qpg/BUILD.gn
@@ -53,7 +53,6 @@ qpg_executable("persistent_storage") {
   include_dirs += [
     "${qpg_project_dir}/include",
     "${examples_plat_dir}",
-    "${examples_plat_dir}/app/include",
   ]
 
   sources = [

diff --git a/examples/platform/qpg/args.gni b/examples/platform/qpg/args.gni
@@ -16,7 +16,9 @@ import("//build_overrides/chip.gni")
 
 import("${chip_root}/src/platform/qpg/args.gni")
 
+chip_enable_openthread = true
 chip_openthread_ftd = false
+chip_system_config_use_open_thread_udp = true
 openthread_project_core_config_file = "OpenThreadConfig.h"
 openthread_core_config_deps = []
 openthread_core_config_deps = [

diff --git a/examples/platform/qpg/shell_common/shell.cpp b/examples/platform/qpg/shell_common/shell.cpp
@@ -62,6 +62,9 @@ int ShellTask::Init(void)
     cmd_otcli_init();
     cmd_ping_init();
     cmd_send_init();
+#if CHIP_SHELL_ENABLE_CMD_SERVER
+    cmd_app_server_init();
+#endif // CHIP_SHELL_ENABLE_CMD_SERVER
 
     return err;
 }

diff --git a/examples/shell/qpg/args.gni b/examples/shell/qpg/args.gni
@@ -20,5 +20,4 @@ qpg_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_build_libshell = true
diff --git a/src/inet/UDPEndPointImpl_OpenThread.cpp b/src/inet/UDPEndPointImpl_OpenThread.cpp
@@ -79,7 +79,7 @@ void UDPEndPointImplOT::handleUdpReceive(void * aContext, otMessage * aMessage,
         ChipLogError(Inet, "Failed to copy OpenThread buffer into System Packet buffer");
         return;
     }
-    payload->SetDataLength(msgLen + sizeof(IPPacketInfo));
+    payload->SetDataLength(static_cast<uint16_t>(msgLen + sizeof(IPPacketInfo)));
 
     ep->Retain();
     CHIP_ERROR err = ep->GetSystemLayer().ScheduleLambda([ep, p = System::LwIPPacketBufferView::UnsafeGetLwIPpbuf(payload)] {

diff --git a/src/platform/qpg/args.gni b/src/platform/qpg/args.gni
@@ -14,6 +14,7 @@
 
 import("//build_overrides/chip.gni")
 import("//build_overrides/qpg_sdk.gni")
+import("${qpg_sdk_build_root}/qpg_sdk.gni")
 
 # ARM architecture flags will be set for QPG family.
 arm_platform_config = "${qpg_sdk_build_root}/qpg_arm.gni"
@@ -44,9 +45,10 @@ chip_build_tests = false
 chip_enable_rotating_device_id = false
 
 openthread_external_mbedtls = mbedtls_target
-openthread_project_core_config_file = "openthread-core-qpg6105-config.h"
+openthread_project_core_config_file =
+    "openthread-core-${qpg_target_ic}-config.h"
 openthread_core_config_platform_check_file =
-    "openthread-core-qpg6105-config-check.h"
+    "openthread-core-${qpg_target_ic}-config-check.h"
 openthread_core_config_deps = [
   "${chip_root}/third_party/openthread/platforms/qpg:libopenthread-qpg-config",
 ]