From 8f566a96c3b27380e092956b9ba26f645e81a291 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 27 Dec 2024 09:31:13 +1100 Subject: [PATCH] autotest: correct copter-tailsitter parameter file for RNGFND1_MIN_CM rename also fix a race condition in the quadplane-tailsitter test - which is unlikely to ever trigger --- .../autotest/default_params/quadplane-copter_tailsitter.parm | 4 ++-- Tools/autotest/quadplane.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tools/autotest/default_params/quadplane-copter_tailsitter.parm b/Tools/autotest/default_params/quadplane-copter_tailsitter.parm index a936774c6ce33..901bd7eda8d6a 100644 --- a/Tools/autotest/default_params/quadplane-copter_tailsitter.parm +++ b/Tools/autotest/default_params/quadplane-copter_tailsitter.parm @@ -38,8 +38,8 @@ SIM_SONAR_SCALE 10 RNGFND1_TYPE 100 RNGFND1_PIN 0 RNGFND1_SCALING 10 -RNGFND1_MIN_CM 10 -RNGFND1_MAX_CM 5000 +RNGFND1_MIN 0.10 +RNGFND1_MAX 50 RNGFND1_ORIENT 12 RNGFND_LANDING 1 RNGFND_LND_ORNT 12 diff --git a/Tools/autotest/quadplane.py b/Tools/autotest/quadplane.py index 8e2500a9e04c1..4583846883863 100644 --- a/Tools/autotest/quadplane.py +++ b/Tools/autotest/quadplane.py @@ -1077,7 +1077,7 @@ def CopterTailsitter(self): self.context_collect("STATUSTEXT") self.progress("Starting QLAND") self.change_mode("QLAND") - self.wait_statustext("Rangefinder engaged") + self.wait_statustext("Rangefinder engaged", check_context=True) self.wait_disarmed(timeout=100) def setup_ICEngine_vehicle(self):