M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

artiq_devtool: don't require lock for reset. 

reset is mainly useful as a part of reset+hotswap sequence, and that
already needs lock via connect.
This commit is contained in:
whitequark 2017-12-25 16:15:51 +00:00
parent fa4dc1bf0e
commit 1570a482c2
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
artiq/frontend/artiq_devtool.py
View File

@ -44,7 +44,7 @@ def get_argparser():
parser.add_argument("actions", metavar="ACTION", parser.add_argument("actions", metavar="ACTION",
type=str, default=[], nargs="+", type=str, default=[], nargs="+",
help="actions to perform, sequence of: " help="actions to perform, sequence of: "
"build reset boot boot+log connect hotswap clean") "build boot boot+log connect reset hotswap clean")
return parser return parser
@ -112,14 +112,6 @@ def main():
if os.path.isdir(target_dir): if os.path.isdir(target_dir):
shutil.rmtree(target_dir) shutil.rmtree(target_dir)
elif action == "reset":
lock()
logger.info("Resetting device")
client.run_command(
"{env} artiq_flash start",
**substs)
elif action == "boot" or action == "boot+log": elif action == "boot" or action == "boot+log":
lock() lock()
@ -196,6 +188,12 @@ def main():
"{env} python3 flterm.py {serial} --output-only", "{env} python3 flterm.py {serial} --output-only",
**substs) **substs)
elif action == "reset":
logger.info("Resetting device")
client.run_command(
"{env} artiq_flash start",
**substs)
elif action == "hotswap": elif action == "hotswap":
logger.info("Hotswapping firmware") logger.info("Hotswapping firmware")
try: try: