Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: rename sim_multicopter.py to sim_wrapper.py

Browse Source 
it now supports multiple vehicle types
This commit is contained in:
Andrew Tridgell 2015-04-15 16:05:33 +10:00
parent c95348c1d9
commit d691cfc3d8
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/autotest/arducopter.py
View File

@ -911,7 +911,7 @@ def fly_ArduCopter(viewerip=None, map=False):
if TARGET != 'sitl':
util.build_SIL('ArduCopter', target=TARGET)
sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_multicopter.py') + ' --frame=%s --speedup=100 --rate=400 --home=%f,%f,%u,%u' % (
sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_wrapper.py') + ' --frame=%s --speedup=100 --rate=400 --home=%f,%f,%u,%u' % (
FRAME, HOME.lat, HOME.lng, HOME.alt, HOME.heading)
sim_cmd += ' --wind=6,45,.3'
if viewerip:
@ -1272,7 +1272,7 @@ def fly_CopterAVC(viewerip=None, map=False):
if TARGET != 'sitl':
util.build_SIL('ArduCopter', target=TARGET)
sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_multicopter.py') + ' --frame=%s --rate=400 --speedup=100 --home=%f,%f,%u,%u' % (
sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_wrapper.py') + ' --frame=%s --rate=400 --speedup=100 --home=%f,%f,%u,%u' % (
FRAME, AVCHOME.lat, AVCHOME.lng, AVCHOME.alt, AVCHOME.heading)
if viewerip:
sim_cmd += ' --fgout=%s:5503' % viewerip

2
Tools/autotest/autotest_jenkins.py
View File

@ -141,7 +141,7 @@ def fly_ArduCopter_scripted(testname):
'''
global homeloc
sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_multicopter.py') + ' --frame=%s --rate=400 --home=%f,%f,%u,%u' % (
sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_wrapper.py') + ' --frame=%s --rate=400 --home=%f,%f,%u,%u' % (
FRAME, HOME.lat, HOME.lng, HOME.alt, HOME.heading)
sim_cmd += ' --wind=6,45,.3'

2
Tools/autotest/pysim/sim_multicopter.py → Tools/autotest/pysim/sim_wrapper.py
View File

@ -92,7 +92,7 @@ def interpret_address(addrstr):
##################
# main program
from optparse import OptionParser
parser = OptionParser("sim_multicopter.py [options]")
parser = OptionParser("sim_wrapper.py [options]")
parser.add_option("--fgout", dest="fgout", help="flightgear output (IP:port)", default="127.0.0.1:5503")
parser.add_option("--simin", dest="simin", help="SIM input (IP:port)", default="127.0.0.1:5502")
parser.add_option("--simout", dest="simout", help="SIM output (IP:port)", default="127.0.0.1:5501")

4
Tools/autotest/sim_vehicle.sh
View File

@ -151,7 +151,7 @@ kill_tasks()
pkill -f runsim.py
pkill -f sim_tracker.py
pkill -f sim_rover.py
pkill -f sim_multicopter.py
pkill -f sim_wrapper.py
}
}
@ -325,7 +325,7 @@ EOF
fi
;;
ArduCopter)
RUNSIM="nice $autotest/pysim/sim_multicopter.py --home=$SIMHOME --simin=$SIMIN_PORT --simout=$SIMOUT_PORT --fgout=$FG_PORT $EXTRA_SIM"
RUNSIM="nice $autotest/pysim/sim_wrapper.py --home=$SIMHOME --simin=$SIMIN_PORT --simout=$SIMOUT_PORT --fgout=$FG_PORT $EXTRA_SIM"
PARMS="copter_params.parm"
;;
APMrover2)