Skip to content

Add reset type option to the load command #1843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add reset type option to the load command #1843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions pyocd/subcommands/load_cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from ..flash.file_programmer import FileProgrammer
from ..utility.cmdline import (
convert_session_options,
convert_reset_type,
int_base_0,
)

Expand Down Expand Up @@ -64,7 +65,13 @@ def get_args(cls) -> List[argparse.ArgumentParser]:
"all must be of this type.")
parser_options.add_argument("--skip", metavar="BYTES", default=0, type=int_base_0,
help="Skip programming the first N bytes. Binary files only.")
parser_options.add_argument("--no-reset", action="store_true",

# Make reset method and no-reset mutually exclusive
reset_group = parser_options.add_mutually_exclusive_group()
reset_group.add_argument("-m", "--method", default='sw', dest='reset_type', metavar="METHOD",
help="Reset method to use after programming (default, hw, sw, sysresetreq, vectreset, emulated). "
"Default is 'sw'.")
reset_group.add_argument("--no-reset", action="store_true",
help="Specify to prevent resetting device after programming has finished.")

parser.add_argument("file", metavar="<file-path>", nargs="*",
Expand All @@ -85,6 +92,13 @@ def invoke(self) -> int:
raise ValueError("--base-address cannot be set when loading more than one file; "
"use a base address suffix instead")

# Verify selected reset type.
try:
_ = convert_reset_type(self._args.reset_type)
except ValueError:
LOG.error("Invalid reset method: %s", self._args.reset_type)
return 1

session = ConnectHelper.session_with_chosen_probe(
project_dir=self._args.project_dir,
config_file=self._args.config,
Expand Down Expand Up @@ -165,6 +179,7 @@ def invoke(self) -> int:

# Reset the target after programming unless --no-reset was specified.
if not self._args.no_reset:
session.target.reset(Target.ResetType.NSRST)
the_reset_type = convert_reset_type(self._args.reset_type)
session.target.reset(the_reset_type)

return 0