[cbuild-run] Remove default debugger protocol and clock

Author: grasci-arm

tools/projmgr/include/ProjMgrRunDebug.h

@@ -97,7 +97,7 @@ struct DebuggerType {
   std::string name;
   std::string info;
   std::string protocol;
-  unsigned long long clock = 0;
+  std::optional<unsigned long long> clock;
   std::string dbgconf;
 };
 

tools/projmgr/src/ProjMgrCbuildRun.cpp

@@ -99,7 +99,9 @@ void ProjMgrCbuildRun::SetDebuggersNode(YAML::Node node, const std::vector<Debug
     SetNodeValue(debuggerNode[YAML_NAME], item.name);
     SetNodeValue(debuggerNode[YAML_INFO], item.info);
     SetNodeValue(debuggerNode[YAML_PROTOCOL], item.protocol);
-    debuggerNode[YAML_CLOCK] = item.clock;
+    if (item.clock.has_value()) {
+      debuggerNode[YAML_CLOCK] = item.clock.value();
+    }
     SetNodeValue(debuggerNode[YAML_DBGCONF], FormatPath(item.dbgconf, m_directory));
     node.push_back(debuggerNode);
   }

tools/projmgr/src/ProjMgrRunDebug.cpp

@@ -18,8 +18,6 @@ using namespace std;
   * @brief default debugger parameters
  */
 static constexpr const char* DEBUGGER_NAME_DEFAULT = "<default>";
-static constexpr const char* DEBUGGER_PROTOCOL_DEFAULT = "swd";
-static unsigned long long DEBUGGER_CLOCK_DEFAULT = 10000000;
 
 ProjMgrRunDebug::ProjMgrRunDebug(void) {
   // Reserved
@@ -288,10 +286,12 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts) {
   defaultDebugger.name = debugProbe ? debugProbe->GetName() : DEBUGGER_NAME_DEFAULT;
   const auto& boardProtocol = debugProbe ? debugProbe->GetAttribute("debugLink") : "";
   const auto& deviceProtocol = debugConfig ? debugConfig->GetAttribute("default") : "";
-  defaultDebugger.protocol = !boardProtocol.empty() ? boardProtocol : !deviceProtocol.empty() ? deviceProtocol : DEBUGGER_PROTOCOL_DEFAULT;
-  const auto& boardClock = debugProbe ? debugProbe->GetAttributeAsULL("debugClock") : 0;
-  const auto& deviceClock = debugConfig ? debugConfig->GetAttributeAsULL("clock") : 0;
-  defaultDebugger.clock = boardClock > 0 ? boardClock : deviceClock > 0 ? deviceClock : DEBUGGER_CLOCK_DEFAULT;
+  defaultDebugger.protocol = !boardProtocol.empty() ? boardProtocol : deviceProtocol;
+  if (debugProbe && debugProbe->HasAttribute("debugClock")) {
+    defaultDebugger.clock = debugProbe->GetAttributeAsULL("debugClock");
+  } else if (debugConfig && debugConfig->HasAttribute("clock")) {
+    defaultDebugger.clock = debugConfig->GetAttributeAsULL("clock");
+  }
 
   // user defined debugger parameters
   if (context0->debuggers.size() > 0) {

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml

@@ -48,8 +48,6 @@ cbuild-run:
       type: svd
   debugger:
     - name: <default>
-      protocol: swd
-      clock: 10000000
       dbgconf: ../data/TestRunDebug/RTE/Device/RteTest_ARMCM0_Dual_cm0_core0/ARMCM.dbgconf
   debug-vars:
     vars: |