From 21c124ab47badd4ecfe8701d8eba9c8e394f65c5 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 10 Mar 2021 09:16:19 +1100 Subject: [PATCH] autotest: tidy set_parameters Remove commented code, add more to the verbose option --- Tools/autotest/common.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index 01356a5cf4..508bbe865a 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -3953,10 +3953,12 @@ class AutoTest(ABC): self.drain_mav(quiet=True) received = set() for (name, value) in want.items(): - # self.progress("%s want=%f autopilot=%s" % (name, value, autopilot_values.get(name, 'None'))) + if verbose: + self.progress("%s want=%f autopilot=%s" % (name, value, autopilot_values.get(name, 'None'))) if name not in autopilot_values: self.send_get_parameter_direct(name) - # self.progress("Requesting (%s) (retry=%u)" % (name, i)) + if verbose: + self.progress("Requesting (%s) (retry=%u)" % (name, i)) continue delta = abs(autopilot_values[name] - value) if delta <= epsilon_pct*0.01*abs(value): @@ -3979,12 +3981,6 @@ class AutoTest(ABC): self.do_timesync_roundtrip(quiet=True) except AutoTestTimeoutException: pass - # now = self.get_sim_time_cached() - # if tstart > now: - # self.progress("Time wrap detected") - # else: - # raise -# do_fetch_all = False for m in param_value_messages: if m.param_id in want: self.progress("Received wanted PARAM_VALUE %s=%f" % @@ -3992,12 +3988,7 @@ class AutoTest(ABC): autopilot_values[m.param_id] = m.param_value if m.param_id not in original_values: original_values[m.param_id] = m.param_value - # if (self.should_fetch_all_for_parameter_change(m.param_id.upper()) and - # m.param_value != 0): - # do_fetch_all = True param_value_messages = [] -# if do_fetch_all: -# self.do_fetch_all() self.remove_message_hook(add_param_value)