session: add command property used for detecting which sub-command is executing

- cbuild-run: SVD file loading for load/erase/reset sub-command

Author: TeoMahnic

pyocd/core/session.py

@@ -132,6 +132,7 @@ def __init__(
             auto_open: bool = True,
             options: Optional[Mapping[str, Any]] = None,
             option_defaults: Optional[Mapping[str, Any]] = None,
+            command: Optional[str] = None,
             **kwargs
             ) -> None:
         """@brief Session constructor.
@@ -166,6 +167,7 @@ def __init__(
         self._probe = probe
         self._closed: bool = True
         self._inited: bool = False
+        self._command = command
         self._user_script_namespace: Dict[str, Any] = {}
         self._user_script_proxy: Optional[UserScriptDelegateProxy] = None
         self._user_script_print_proxy = PrintProxy()
@@ -331,6 +333,11 @@ def probe(self) -> Optional[DebugProbe]:
         """@brief The @ref pyocd.probe.debug_probe.DebugProbe "DebugProbe" instance."""
         return self._probe
 
+    @property
+    def command(self) -> Optional[str]:
+        """@brief The current command being executed in the session."""
+        return self._command
+
     @property
     def board(self) -> Optional[Board]:
         """@brief The @ref pyocd.board.board.Board "Board" object."""

pyocd/subcommands/erase_cmd.py

@@ -87,6 +87,7 @@ def invoke(self) -> int:
                             frequency=self._args.frequency,
                             blocking=(not self._args.no_wait),
                             connect_mode=self._args.connect_mode,
+                            command=self._args.cmd,
                             options=convert_session_options(self._args.options),
                             option_defaults=self._modified_option_defaults(),
                             )

pyocd/subcommands/load_cmd.py

@@ -98,6 +98,7 @@ def invoke(self) -> int:
                             frequency=self._args.frequency,
                             blocking=(not self._args.no_wait),
                             connect_mode=self._args.connect_mode,
+                            command=self._args.cmd,
                             options=convert_session_options(self._args.options),
                             option_defaults=self._modified_option_defaults(),
                             )

pyocd/subcommands/reset_cmd.py

@@ -86,6 +86,7 @@ def invoke(self) -> None:
                             connect_mode=self._args.connect_mode,
                             resume_on_disconnect=not self._args.halt,
                             reset_type=self._args.reset_type,
+                            command=self._args.cmd,
                             options=convert_session_options(self._args.options),
                             option_defaults=self._modified_option_defaults(),
                             )

pyocd/target/pack/cbuild_run.py

@@ -95,8 +95,10 @@ def _cbuild_target_init(self, session: Session) -> None:
         super(self.__class__, self).__init__(session, self._cbuild_device.memory_map)
         self.vendor = self._cbuild_device.vendor
         self.part_number = self._cbuild_device.target
-        _svd = self._cbuild_device.svd
-        self._svd_location = SVDFile(filename=_svd) if _svd else None
+        if session.command not in ('load', 'erase', 'reset'):
+            # SVD file is not required for load/erase/reset commands
+            _svd = self._cbuild_device.svd
+            self._svd_location = SVDFile(filename=_svd) if _svd else None
         self.debug_sequence_delegate = CbuildRunDebugSequenceDelegate(self, self._cbuild_device)
 
     @staticmethod
@@ -292,13 +294,13 @@ def _is_under(parent: Path, child: Path) -> bool:
             except ValueError:
                 return False
 
-        # Use warning logging for non-required files
-        log = LOG.warning
-        err = f"File '{file_path}' not found"
+        # Select appropriate logging level and error message based on whether the file is required
         if required:
-            # Switch to using error logging for required files
             log = LOG.error
             err = f"File '{file_path}' is required but not found"
+        else:
+            log = LOG.warning
+            err = f"File '{file_path}' not found"
 
         self._get_required_packs()
         # Verify pack installation only if the file is located within a required pack.