Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: added --osdmsp option to sim_vehicle.py

This commit is contained in:
Andrew Tridgell 2020-09-07 09:18:25 +10:00
parent 65b70dddb2
commit a9ecac4fff
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tools/autotest/default_params/msposd.parm Normal file
View File

@ -0,0 +1,3 @@
SERIAL2_PROTOCOL 33
MSP_OPTIONS 1
OSD_TYPE 3

13
Tools/autotest/sim_vehicle.py
View File

@ -295,6 +295,9 @@ def do_build_waf(opts, frame_options):
cmd_configure.append("--enable-sfml") cmd_configure.append("--enable-sfml")
cmd_configure.append("--sitl-osd") cmd_configure.append("--sitl-osd")
if opts.OSDMSP:
cmd_configure.append("--osd")
if opts.rgbled: if opts.rgbled:
cmd_configure.append("--enable-sfml") cmd_configure.append("--enable-sfml")
cmd_configure.append("--sitl-rgbled") cmd_configure.append("--sitl-rgbled")
@ -643,6 +646,11 @@ def start_vehicle(binary, opts, stuff, spawns=None):
sys.exit(1) sys.exit(1)
path += "," + str(opts.add_param_file) path += "," + str(opts.add_param_file)
progress("Adding parameters from (%s)" % (str(opts.add_param_file),)) progress("Adding parameters from (%s)" % (str(opts.add_param_file),))
if opts.OSDMSP:
path += "," + os.path.join(root_dir, "libraries/AP_MSP/Tools/osdtest.parm")
path += "," + os.path.join(autotest_dir, "default_params/msposd.parm")
subprocess.Popen([os.path.join(root_dir, "libraries/AP_MSP/Tools/msposd.py")])
if path is not None: if path is not None:
cmd.extend(["--defaults", path]) cmd.extend(["--defaults", path])
if opts.mcast: if opts.mcast:
@ -996,6 +1004,11 @@ group_sim.add_option("", "--osd",
dest='OSD', dest='OSD',
default=False, default=False,
help="Enable SITL OSD") help="Enable SITL OSD")
group_sim.add_option("", "--osdmsp",
action='store_true',
dest='OSDMSP',
default=False,
help="Enable SITL OSD using MSP")
group_sim.add_option("", "--tonealarm", group_sim.add_option("", "--tonealarm",
action='store_true', action='store_true',
dest='tonealarm', dest='tonealarm',