autotest: fixed sim_vehicle for new frame builds

This commit is contained in:
Andrew Tridgell 2017-01-09 20:55:20 +11:00
parent 34a7d47b3f
commit 8504a8baad
1 changed files with 25 additions and 25 deletions

View File

@ -227,49 +227,49 @@ _options_for_frame = {
}, },
# COPTER # COPTER
"+": { "+": {
"waf_target": "bin/arducopter-quad", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter.parm", "default_params_filename": "default_params/copter.parm",
}, },
"quad": { "quad": {
"model": "+", "model": "+",
"waf_target": "bin/arducopter-quad", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter.parm", "default_params_filename": "default_params/copter.parm",
}, },
"X": { "X": {
"waf_target": "bin/arducopter-quad", "waf_target": "bin/arducopter",
# this param set FRAME doesn't actually work because mavproxy # this param set FRAME doesn't actually work because mavproxy
# won't set a parameter unless it knows of it, and the param fetch happens asynchronously # won't set a parameter unless it knows of it, and the param fetch happens asynchronously
"default_params_filename": "default_params/copter.parm", "default_params_filename": "default_params/copter.parm",
"extra_mavlink_cmds": "param fetch frame; param set FRAME 1;", "extra_mavlink_cmds": "param fetch frame; param set FRAME 1;",
}, },
"hexa": { "hexa": {
"make_target": "sitl-hexa", "make_target": "sitl",
"waf_target": "bin/arducopter-hexa", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter.parm", "default_params_filename": "default_params/copter.parm",
}, },
"octa-quad": { "octa-quad": {
"make_target": "sitl-octa-quad", "make_target": "sitl",
"waf_target": "bin/arducopter-octa-quad", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter.parm", "default_params_filename": "default_params/copter.parm",
}, },
"octa": { "octa": {
"make_target": "sitl-octa", "make_target": "sitl",
"waf_target": "bin/arducopter-octa", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter.parm", "default_params_filename": "default_params/copter.parm",
}, },
"tri": { "tri": {
"make_target": "sitl-tri", "make_target": "sitl",
"waf_target": "bin/arducopter-tri", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter-tri.parm", "default_params_filename": "default_params/copter-tri.parm",
}, },
"y6": { "y6": {
"make_target": "sitl-y6", "make_target": "sitl",
"waf_target": "bin/arducopter-y6", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter-y6.parm", "default_params_filename": "default_params/copter-y6.parm",
}, },
# COPTER TYPES # COPTER TYPES
"IrisRos": { "IrisRos": {
"waf_target": "bin/arducopter-quad", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter.parm", "default_params_filename": "default_params/copter.parm",
}, },
"firefly": { "firefly": {
@ -279,7 +279,7 @@ _options_for_frame = {
# HELICOPTER # HELICOPTER
"heli": { "heli": {
"make_target": "sitl-heli", "make_target": "sitl-heli",
"waf_target": "bin/arducopter-heli", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter-heli.parm", "default_params_filename": "default_params/copter-heli.parm",
}, },
"heli-dual": { "heli-dual": {
@ -291,24 +291,24 @@ _options_for_frame = {
"waf_target": "bin/arducopter-coax", # is this correct? -pb201604301447 "waf_target": "bin/arducopter-coax", # is this correct? -pb201604301447
}, },
"singlecopter": { "singlecopter": {
"make_target": "sitl-single", "make_target": "sitl",
"waf_target": "bin/arducopter-single", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter-single.parm", "default_params_filename": "default_params/copter-single.parm",
}, },
"coaxcopter": { "coaxcopter": {
"make_target": "sitl-coax", "make_target": "sitl",
"waf_target": "bin/arducopter-coax", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/copter-coax.parm", "default_params_filename": "default_params/copter-coax.parm",
}, },
# PLANE # PLANE
"quadplane-tilttri": { "quadplane-tilttri": {
"make_target": "sitl-tri", "make_target": "sitl",
"waf_target": "bin/arduplane-tri", "waf_target": "bin/arduplane",
"default_params_filename": "default_params/quadplane-tilttri.parm", "default_params_filename": "default_params/quadplane-tilttri.parm",
}, },
"quadplane-tri": { "quadplane-tri": {
"make_target": "sitl-tri", "make_target": "sitl",
"waf_target": "bin/arduplane-tri", "waf_target": "bin/arduplane",
"default_params_filename": "default_params/quadplane-tri.parm", "default_params_filename": "default_params/quadplane-tri.parm",
}, },
"quadplane": { "quadplane": {
@ -338,7 +338,7 @@ _options_for_frame = {
}, },
# SIM # SIM
"gazebo-iris": { "gazebo-iris": {
"waf_target": "bin/arducopter-quad", "waf_target": "bin/arducopter",
"default_params_filename": "default_params/gazebo-iris.parm", "default_params_filename": "default_params/gazebo-iris.parm",
}, },
"gazebo-zephyr": { "gazebo-zephyr": {
@ -359,7 +359,7 @@ _options_for_frame = {
_default_waf_target = { _default_waf_target = {
"ArduPlane": "bin/arduplane", "ArduPlane": "bin/arduplane",
"ArduCopter": "bin/arducopter-quad", "ArduCopter": "bin/arducopter",
"APMrover2": "bin/ardurover", "APMrover2": "bin/ardurover",
"AntennaTracker": "bin/antennatracker", "AntennaTracker": "bin/antennatracker",
} }