[projmgr] Extend RPC BoardInfo with on-board Debugger info (#1332) (#2239)

* [projmgr] Extend RPC `BoardInfo` with on-board Debugger info

* Update tools/projmgr/CMakeLists.txt

Co-authored-by: Daniel Brondani <[email protected]>

Author: grasci-arm

tools/projmgr/CMakeLists.txt

@@ -24,8 +24,8 @@ include(FetchContent)
 FetchContent_Declare(
   rpc-interface
   DOWNLOAD_EXTRACT_TIMESTAMP ON
-  URL https://github.com/Open-CMSIS-Pack/csolution-rpc/releases/download/v0.0.4/csolution-rpc.zip
-  URL_HASH SHA256=ca9bfdacb35b44b6cadf29d87123adbfc1a5e944af7f2aefda0ccf7fd4bd216f
+  URL https://github.com/Open-CMSIS-Pack/csolution-rpc/releases/download/v0.0.5/csolution-rpc.zip
+  URL_HASH SHA256=94bd65ec0f8054dc7685a60812f00bc32cc7f9227bec5abdbaa7215fb6b6bd27
 )
 FetchContent_MakeAvailable(rpc-interface)
 

tools/projmgr/src/ProjMgrRpcServerData.cpp

@@ -224,6 +224,14 @@ RpcArgs::Board RpcDataCollector::FromRteBoard( RteBoard* rteBoard, bool bInclude
     if(!memories.empty()) {
       b.memories = memories;
     }
+    auto debugProbe = rteBoard->GetItemByTag("debugProbe");
+    if (debugProbe) {
+      RpcArgs::Debugger d;
+      d.name = debugProbe->GetName();
+      d.protocol = debugProbe->GetAttribute("debugLink");
+      d.clock = debugProbe->GetAttributeAsULL("debugClock");
+      b.debugger = d;
+    }
     vector<RpcArgs::Device> devices;
     list<RteDevice*> processedDevices;
     CollectBoardDevices(devices, rteBoard, true, processedDevices);

tools/projmgr/test/src/ProjMgrRpcTests.cpp

@@ -375,6 +375,8 @@ TEST_F(ProjMgrRpcTests, RpcBoardInfo) {
   requests += FormatRequest(6, "GetBoardInfo", json({{ "id", "RteTest NoMCU board"}}));
   //  only vendor => no ID
   requests += FormatRequest(7, "GetBoardInfo", json({{ "id", "Keil::"}}));
+  // board with debugger
+  requests += FormatRequest(8, "GetBoardInfo", json({{ "id", "Keil::RteTest-Test-board With.Memory:1.1.1" }}));  
 
   const auto responses = RunRpcMethods(requests);
   EXPECT_TRUE(responses[0]["result"]["success"]);
@@ -422,6 +424,14 @@ TEST_F(ProjMgrRpcTests, RpcBoardInfo) {
 
   EXPECT_FALSE(responses[6]["result"]["success"]);
   EXPECT_EQ(responses[6]["result"]["message"], "Invalid board ID: 'Keil::'");
+
+  auto b7 = responses[7]["result"]["board"];
+  EXPECT_EQ(b7["id"], "Keil::RteTest-Test-board With.Memory:1.1.1");
+  EXPECT_EQ(b7["pack"], "ARM::[email protected]");
+  EXPECT_EQ(b7["description"], "TestBoard with dots in the name and memory");
+  EXPECT_EQ(b7["debugger"]["name"], "CMSIS-DAP");
+  EXPECT_EQ(b7["debugger"]["protocol"], "swd");
+  EXPECT_EQ(b7["debugger"]["clock"], 30000000);
 }
 
 /////////