From 30233ab9b8d1fadb8ff5cc84482e360b51a0d65a Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 26 Oct 2016 08:32:28 +1100 Subject: [PATCH] Tools: unhide groups when generating parameters in autotest --- Tools/autotest/autotest.py | 2 +- Tools/autotest/pysim/util.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py index 26059c48fd..66cebdf45e 100755 --- a/Tools/autotest/autotest.py +++ b/Tools/autotest/autotest.py @@ -38,7 +38,7 @@ def get_default_params(atype, binary): frame = "+" home = "%f,%f,%u,%u" % (HOME.lat, HOME.lng, HOME.alt, HOME.heading) - sitl = util.start_SITL(binary, wipe=True, model=frame, home=home, speedup=10) + sitl = util.start_SITL(binary, wipe=True, model=frame, home=home, speedup=10, unhide_parameters=True) mavproxy = util.start_MAVProxy_SITL(atype) print("Dumping defaults") idx = mavproxy.expect(['Please Run Setup', 'Saved [0-9]+ parameters to (\S+)']) diff --git a/Tools/autotest/pysim/util.py b/Tools/autotest/pysim/util.py index 58c6338e36..a4682206d3 100644 --- a/Tools/autotest/pysim/util.py +++ b/Tools/autotest/pysim/util.py @@ -180,7 +180,7 @@ def make_safe_filename(text): class SITL(pexpect.spawn): - def __init__(self, binary, valgrind=False, gdb=False, wipe=False, synthetic_clock=True, home=None, model=None, speedup=1, defaults_file=None): + def __init__(self, binary, valgrind=False, gdb=False, wipe=False, synthetic_clock=True, home=None, model=None, speedup=1, defaults_file=None, unhide_parameters=False): self.binary = binary self.model = model @@ -206,6 +206,8 @@ class SITL(pexpect.spawn): cmd.extend(['--speedup', str(speedup)]) if defaults_file is not None: cmd.extend(['--defaults', defaults_file]) + if unhide_parameters: + cmd.extend(['--unhide-groups']) print("Running: %s" % cmd_as_shell(cmd)) first = cmd[0] rest = cmd[1:]