From c338002e0dcf6c2bc9fce2ce26457a8ee8a91913 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 25 Mar 2015 18:57:46 -0700 Subject: [PATCH] autotest: fixed defaults extraction in autotest --- Tools/autotest/autotest.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py index 8262418918..4effaaf4b4 100755 --- a/Tools/autotest/autotest.py +++ b/Tools/autotest/autotest.py @@ -15,6 +15,17 @@ os.putenv('TMPDIR', util.reltopdir('tmp')) def get_default_params(atype): '''get default parameters''' + + # use rover simulator so SITL is not starved of input + from pymavlink import mavutil + HOME=mavutil.location(40.071374969556928,-105.22978898137808,1583.702759,246) + sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_rover.py') + ' --rate=200 --nowait --home=%f,%f,%u,%u' % ( + HOME.lat, HOME.lng, HOME.alt, HOME.heading) + + runsim = pexpect.spawn(sim_cmd, logfile=sys.stdout, timeout=10) + runsim.delaybeforesend = 0 + runsim.expect('Starting at lat') + sil = util.start_SIL(atype, wipe=True) mavproxy = util.start_MAVProxy_SIL(atype) print("Dumping defaults") @@ -31,6 +42,7 @@ def get_default_params(atype): shutil.copy(parmfile, dest) util.pexpect_close(mavproxy) util.pexpect_close(sil) + util.pexpect_close(runsim) print("Saved defaults for %s to %s" % (atype, dest)) return True