Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 02:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: fixed extraction of defaults

Browse Source
This commit is contained in:
Andrew Tridgell 2015-04-20 15:09:31 +10:00
parent 8f09ee077c
commit 5f8c05b712
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/autotest/apmrover2.py
View File

@ -83,7 +83,7 @@ def drive_APMrover2(viewerip=None, map=False):
if map: if map:
options += ' --map' options += ' --map'
sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_rover.py') + ' --rate=200 --speedup=100 --home=%f,%f,%u,%u' % ( sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_wrapper.py') + ' --frame=rover --rate=200 --speedup=100 --home=%f,%f,%u,%u' % (
HOME.lat, HOME.lng, HOME.alt, HOME.heading) HOME.lat, HOME.lng, HOME.alt, HOME.heading)
sil = util.start_SIL('APMrover2', wipe=True) sil = util.start_SIL('APMrover2', wipe=True)
@ -111,7 +111,7 @@ def drive_APMrover2(viewerip=None, map=False):
logfile = mavproxy.match.group(1) logfile = mavproxy.match.group(1)
print("LOGFILE %s" % logfile) print("LOGFILE %s" % logfile)
sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_rover.py') + ' --rate=200 --speedup=100 --home=%f,%f,%u,%u' % ( sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_wrapper.py') + ' --frame=rover --rate=200 --speedup=100 --home=%f,%f,%u,%u' % (
HOME.lat, HOME.lng, HOME.alt, HOME.heading) HOME.lat, HOME.lng, HOME.alt, HOME.heading)
runsim = pexpect.spawn(sim_cmd, logfile=sys.stdout, timeout=10) runsim = pexpect.spawn(sim_cmd, logfile=sys.stdout, timeout=10)

2
Tools/autotest/autotest.py
View File

@ -19,7 +19,7 @@ def get_default_params(atype):
# use rover simulator so SITL is not starved of input # use rover simulator so SITL is not starved of input
from pymavlink import mavutil from pymavlink import mavutil
HOME=mavutil.location(40.071374969556928,-105.22978898137808,1583.702759,246) HOME=mavutil.location(40.071374969556928,-105.22978898137808,1583.702759,246)
sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_rover.py') + ' --rate=200 --speedup=100 --home=%f,%f,%u,%u' % ( sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_wrapper.py') + ' --frame=rover --rate=200 --speedup=100 --home=%f,%f,%u,%u' % (
HOME.lat, HOME.lng, HOME.alt, HOME.heading) HOME.lat, HOME.lng, HOME.alt, HOME.heading)
runsim = pexpect.spawn(sim_cmd, logfile=sys.stdout, timeout=10) runsim = pexpect.spawn(sim_cmd, logfile=sys.stdout, timeout=10)

1
Tools/autotest/sim_vehicle.sh
View File

@ -150,7 +150,6 @@ kill_tasks()
killall -q JSBSim lt-JSBSim ArduPlane.elf ArduCopter.elf APMrover2.elf AntennaTracker.elf killall -q JSBSim lt-JSBSim ArduPlane.elf ArduCopter.elf APMrover2.elf AntennaTracker.elf
pkill -f runsim.py pkill -f runsim.py
pkill -f sim_tracker.py pkill -f sim_tracker.py
pkill -f sim_rover.py
pkill -f sim_wrapper.py pkill -f sim_wrapper.py
} }
} }