From e7ca2057ce38b65718f22b350aaa78da747490ab Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 25 Jan 2020 12:03:17 +1100 Subject: [PATCH] autotest: improve output from wait_altitude --- Tools/autotest/common.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index cd3d21de99..d9ea41a05e 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -2121,11 +2121,12 @@ class AutoTest(ABC): climb_rate = alt - previous_alt previous_alt = alt - if self.get_sim_time_cached() - last_wait_alt_msg > 1: - self.progress("Wait Altitude: Cur:%.02f min_alt:%.02f climb_rate: %.02f" - % (alt, alt_min, climb_rate)) + ok = alt >= alt_min and alt <= alt_max + if ok or self.get_sim_time_cached() - last_wait_alt_msg > 1: + self.progress("Wait Altitude: Cur:%.02f min:%.02f max:%.02f climb_rate: %.02f" + % (alt, alt_min, alt_max, climb_rate)) last_wait_alt_msg = self.get_sim_time_cached() - if alt >= alt_min and alt <= alt_max: + if ok: self.progress("Altitude OK") return True raise WaitAltitudeTimout("Failed to attain altitude range")