From 2a290bbfe18929fdd00e24d937d9dfc6530eb874 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Wed, 25 Aug 2021 11:06:25 +1000 Subject: [PATCH] tools/pyboard.py: Move --no-exclusive/--soft-reset out of mutex group. The --no-exclusive flag was accidentally added to the mutex group in 178198a01df51b5f4c5ef9f38ab2fb8f6269d5f4. The --soft-reset flag was accidentally added to the mutex group in 41adf178309759d5965c15972f04987a2635314c. These flags can be specified independently to --[no-]follow so should not be in that mutex group. Signed-off-by: Jim Mussared --- tools/pyboard.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/pyboard.py b/tools/pyboard.py index e460c69e24..2608cb2a02 100755 --- a/tools/pyboard.py +++ b/tools/pyboard.py @@ -655,13 +655,13 @@ def main(): type=int, help="seconds to wait for USB connected board to become available", ) - group = cmd_parser.add_mutually_exclusive_group() - group.add_argument( + cmd_parser.add_argument( "--soft-reset", default=True, action=argparse.BooleanOptionalAction, help="Whether to perform a soft reset when connecting to the board.", ) + group = cmd_parser.add_mutually_exclusive_group() group.add_argument( "--follow", action="store_true", @@ -672,7 +672,7 @@ def main(): action="store_true", help="Do not follow the output after running the scripts.", ) - group.add_argument( + cmd_parser.add_argument( "--no-exclusive", action="store_true", help="Do not try to open the serial device for exclusive access.",