Merge branch 'main' into dependabot/github_actions/github/codeql-action-3.29.5

Author: soumeh01

tools/projmgr/include/ProjMgrRpcServerData.h

@@ -49,7 +49,7 @@ class RpcDataCollector {
   std::string ResultStringFromRteItem(const RteItem* item) const;
 
 protected:
-  void CollectBoardDevices(vector<RpcArgs::Device>& boardDevices, RteBoard* rteBoard, bool bInstalled, std::list<RteDevice*>& processedDevices) const;
+  void CollectBoardDevices(vector<RpcArgs::Device>& boardDevices, RteBoard* rteBoard, bool bMounted, std::list<RteDevice*>& processedDevices) const;
   void CollectCtBundles(RpcArgs::CtClass& ctClass, RteComponentGroup* rteClass) const;
   void CollectCtChildren(RpcArgs::CtTreeItem& parent, RteComponentGroup* rteGroup, const string& bundleName) const;
   void CollectCtAggregates(RpcArgs::CtTreeItem& parent, RteComponentGroup* rteGroup, const string& bundleName) const;

tools/projmgr/src/ProjMgrRpcServerData.cpp

@@ -227,7 +227,6 @@ RpcArgs::Board RpcDataCollector::FromRteBoard( RteBoard* rteBoard, bool bInclude
     vector<RpcArgs::Device> devices;
     list<RteDevice*> processedDevices;
     CollectBoardDevices(devices, rteBoard, true, processedDevices);
-    CollectBoardDevices(devices, rteBoard, false, processedDevices);
     if(!devices.empty()) {
       b.devices = devices;
     }
@@ -236,19 +235,18 @@ RpcArgs::Board RpcDataCollector::FromRteBoard( RteBoard* rteBoard, bool bInclude
 }
 
 void RpcDataCollector::CollectBoardDevices(vector<RpcArgs::Device>& boardDevices, RteBoard* rteBoard,
-  bool bInstalled, list<RteDevice*>& processedDevices) const {
+  bool bMounted, list<RteDevice*>& processedDevices) const {
   list<RteItem*> refDevices;
-  rteBoard->GetDevices(refDevices, !bInstalled, bInstalled);
+  rteBoard->GetDevices(refDevices, !bMounted, bMounted);
   for(auto rteItem : refDevices) {
     RteDevice* rteDevice = m_model->GetDevice(rteItem->GetDeviceName(), rteItem->GetDeviceVendor());
     if(rteDevice && find(processedDevices.begin(), processedDevices.end(), rteDevice) == processedDevices.end()) {
       processedDevices.push_back(rteDevice);
-      boardDevices.push_back(FromRteDevice(rteDevice, bInstalled));
+      boardDevices.push_back(FromRteDevice(rteDevice, bMounted));
     }
   }
 }
 
-
 void RpcDataCollector::CollectDeviceList(RpcArgs::DeviceList& deviceList, const std::string& namePattern, const std::string& vendor) const {
   list<RteDevice*> devices;
   if(m_model) {

tools/projmgr/test/src/ProjMgrRpcTests.cpp

@@ -380,16 +380,17 @@ TEST_F(ProjMgrRpcTests, RpcBoardInfo) {
   EXPECT_EQ(b1["pack"], "ARM::[email protected]");
   EXPECT_EQ(b1["description"], "uVision Simulator");
   auto devices = b1["devices"];
-  EXPECT_EQ(devices.size(), 4);
+  EXPECT_EQ(devices.size(), 2);
   EXPECT_FALSE(b1.contains("memories"));
   auto d1 = devices[1];
   EXPECT_EQ(d1["id"], "ARM::RteTest_ARMCM0_Dual");
   EXPECT_EQ(d1["processors"].size(), 2);
   EXPECT_EQ(d1["processors"][0]["name"], "cm0_core0");
 
-  auto d2 = devices[2];
-  EXPECT_EQ(d2["id"], "ARM::RteTest_ARMCM4_NOFP");
-  EXPECT_FALSE(d2.contains("processors"));
+  auto d0 = devices[0];
+  EXPECT_EQ(d0["id"], "ARM::RteTest_ARMCM3");
+  EXPECT_EQ(d0["processors"].size(), 1);
+  EXPECT_EQ(d0["processors"][0]["name"], "");
 
   auto b2 = responses[2]["result"]["board"];
   EXPECT_EQ(b2["id"], "Keil::RteTest Test board:1.1.1");