mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-02-10 09:53:58 -04:00
autotest: standardize name of param files
Try to make the various param files to follow similar namings: - Lowercase the few ones using uppercase - Use dash to separate name components - Start with "copter", "plane", "rover", etc instead of the mix we had - Remove "params" from the filename since it's redundant with the extension
This commit is contained in:
parent
127e86562a
commit
f0590581e4
@ -101,7 +101,7 @@ def drive_APMrover2(binary, viewerip=None, map=False, valgrind=False, gdb=False)
|
|||||||
mavproxy.expect('Received [0-9]+ parameters')
|
mavproxy.expect('Received [0-9]+ parameters')
|
||||||
|
|
||||||
# setup test parameters
|
# setup test parameters
|
||||||
mavproxy.send("param load %s/default_params/Rover.parm\n" % testdir)
|
mavproxy.send("param load %s/default_params/rover.parm\n" % testdir)
|
||||||
mavproxy.expect('Loaded [0-9]+ parameters')
|
mavproxy.expect('Loaded [0-9]+ parameters')
|
||||||
mavproxy.send("param set LOG_REPLAY 1\n")
|
mavproxy.send("param set LOG_REPLAY 1\n")
|
||||||
mavproxy.send("param set LOG_DISARMED 1\n")
|
mavproxy.send("param set LOG_DISARMED 1\n")
|
||||||
|
@ -937,7 +937,7 @@ def fly_ArduCopter(binary, viewerip=None, use_map=False, valgrind=False, gdb=Fal
|
|||||||
mavproxy.expect('Received [0-9]+ parameters')
|
mavproxy.expect('Received [0-9]+ parameters')
|
||||||
|
|
||||||
# setup test parameters
|
# setup test parameters
|
||||||
mavproxy.send("param load %s/default_params/copter_params.parm\n" % testdir)
|
mavproxy.send("param load %s/default_params/copter.parm\n" % testdir)
|
||||||
mavproxy.expect('Loaded [0-9]+ parameters')
|
mavproxy.expect('Loaded [0-9]+ parameters')
|
||||||
mavproxy.send("param set LOG_REPLAY 1\n")
|
mavproxy.send("param set LOG_REPLAY 1\n")
|
||||||
mavproxy.send("param set LOG_DISARMED 1\n")
|
mavproxy.send("param set LOG_DISARMED 1\n")
|
||||||
@ -1285,7 +1285,7 @@ def fly_CopterAVC(binary, viewerip=None, map=False, valgrind=False, gdb=False):
|
|||||||
mavproxy.expect('Received [0-9]+ parameters')
|
mavproxy.expect('Received [0-9]+ parameters')
|
||||||
|
|
||||||
# setup test parameters
|
# setup test parameters
|
||||||
mavproxy.send("param load %s/default_params/Helicopter.parm\n" % testdir)
|
mavproxy.send("param load %s/default_params/copter-heli.parm\n" % testdir)
|
||||||
mavproxy.expect('Loaded [0-9]+ parameters')
|
mavproxy.expect('Loaded [0-9]+ parameters')
|
||||||
mavproxy.send("param set LOG_REPLAY 1\n")
|
mavproxy.send("param set LOG_REPLAY 1\n")
|
||||||
mavproxy.send("param set LOG_DISARMED 1\n")
|
mavproxy.send("param set LOG_DISARMED 1\n")
|
||||||
|
@ -442,7 +442,7 @@ def fly_ArduPlane(binary, viewerip=None, map=False, valgrind=False, gdb=False):
|
|||||||
|
|
||||||
sil = util.start_SIL(binary, model='plane-elevrev', home=HOME_LOCATION, speedup=10,
|
sil = util.start_SIL(binary, model='plane-elevrev', home=HOME_LOCATION, speedup=10,
|
||||||
valgrind=valgrind, gdb=gdb,
|
valgrind=valgrind, gdb=gdb,
|
||||||
defaults_file=os.path.join(testdir, 'default_params/ArduPlane.parm'))
|
defaults_file=os.path.join(testdir, 'default_params/plane-jsbsim.parm'))
|
||||||
mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options)
|
mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options)
|
||||||
mavproxy.expect('Telemetry log: (\S+)')
|
mavproxy.expect('Telemetry log: (\S+)')
|
||||||
logfile = mavproxy.match.group(1)
|
logfile = mavproxy.match.group(1)
|
||||||
|
@ -344,44 +344,44 @@ _options_for_frame = {
|
|||||||
# COPTER
|
# COPTER
|
||||||
"+": {
|
"+": {
|
||||||
"waf_target": "bin/arducopter-quad",
|
"waf_target": "bin/arducopter-quad",
|
||||||
"default_params_filename": "default_params/copter_params.parm",
|
"default_params_filename": "default_params/copter.parm",
|
||||||
},
|
},
|
||||||
"quad": {
|
"quad": {
|
||||||
"model": "+",
|
"model": "+",
|
||||||
"waf_target": "bin/arducopter-quad",
|
"waf_target": "bin/arducopter-quad",
|
||||||
"default_params_filename": "default_params/copter_params.parm",
|
"default_params_filename": "default_params/copter.parm",
|
||||||
},
|
},
|
||||||
"X": {
|
"X": {
|
||||||
"waf_target": "bin/arducopter-quad",
|
"waf_target": "bin/arducopter-quad",
|
||||||
# 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_params.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-hexa",
|
||||||
"waf_target": "bin/arducopter-hexa",
|
"waf_target": "bin/arducopter-hexa",
|
||||||
"default_params_filename": "default_params/copter_params.parm",
|
"default_params_filename": "default_params/copter.parm",
|
||||||
},
|
},
|
||||||
"octa": {
|
"octa": {
|
||||||
"make_target": "sitl-octa",
|
"make_target": "sitl-octa",
|
||||||
"waf_target": "bin/arducopter-octa",
|
"waf_target": "bin/arducopter-octa",
|
||||||
"default_params_filename": "default_params/copter_params.parm",
|
"default_params_filename": "default_params/copter.parm",
|
||||||
},
|
},
|
||||||
"tri": {
|
"tri": {
|
||||||
"make_target": "sitl-tri",
|
"make_target": "sitl-tri",
|
||||||
"waf_target": "bin/arducopter-tri",
|
"waf_target": "bin/arducopter-tri",
|
||||||
"default_params_filename": "default_params/tri_params.parm",
|
"default_params_filename": "default_params/copter-tri.parm",
|
||||||
},
|
},
|
||||||
"y6": {
|
"y6": {
|
||||||
"make_target": "sitl-y6",
|
"make_target": "sitl-y6",
|
||||||
"waf_target": "bin/arducopter-y6",
|
"waf_target": "bin/arducopter-y6",
|
||||||
"default_params_filename": "default_params/y6_params.parm",
|
"default_params_filename": "default_params/copter-y6.parm",
|
||||||
},
|
},
|
||||||
# COPTER TYPES
|
# COPTER TYPES
|
||||||
"IrisRos": {
|
"IrisRos": {
|
||||||
"waf_target": "bin/arducopter-quad",
|
"waf_target": "bin/arducopter-quad",
|
||||||
"default_params_filename": "default_params/copter_params.parm",
|
"default_params_filename": "default_params/copter.parm",
|
||||||
},
|
},
|
||||||
"firefly": {
|
"firefly": {
|
||||||
"waf_target": "bin/arducopter-firefly",
|
"waf_target": "bin/arducopter-firefly",
|
||||||
@ -391,7 +391,7 @@ _options_for_frame = {
|
|||||||
"heli": {
|
"heli": {
|
||||||
"make_target": "sitl-heli",
|
"make_target": "sitl-heli",
|
||||||
"waf_target": "bin/arducopter-heli",
|
"waf_target": "bin/arducopter-heli",
|
||||||
"default_params_filename": "default_params/Helicopter.parm",
|
"default_params_filename": "default_params/copter-heli.parm",
|
||||||
},
|
},
|
||||||
"heli-dual": {
|
"heli-dual": {
|
||||||
"make_target": "sitl-heli-dual",
|
"make_target": "sitl-heli-dual",
|
||||||
@ -404,12 +404,12 @@ _options_for_frame = {
|
|||||||
"singlecopter": {
|
"singlecopter": {
|
||||||
"make_target": "sitl-single",
|
"make_target": "sitl-single",
|
||||||
"waf_target": "bin/arducopter-single",
|
"waf_target": "bin/arducopter-single",
|
||||||
"default_params_filename": "default_params/SingleCopter.parm",
|
"default_params_filename": "default_params/copter-single.parm",
|
||||||
},
|
},
|
||||||
"coaxcopter": {
|
"coaxcopter": {
|
||||||
"make_target": "sitl-coax",
|
"make_target": "sitl-coax",
|
||||||
"waf_target": "bin/arducopter-coax",
|
"waf_target": "bin/arducopter-coax",
|
||||||
"default_params_filename": "default_params/CoaxCopter.parm",
|
"default_params_filename": "default_params/copter-coax.parm",
|
||||||
},
|
},
|
||||||
# PLANE
|
# PLANE
|
||||||
"quadplane-tilttri": {
|
"quadplane-tilttri": {
|
||||||
@ -441,16 +441,16 @@ _options_for_frame = {
|
|||||||
# ROVER
|
# ROVER
|
||||||
"rover": {
|
"rover": {
|
||||||
"waf_target": "bin/ardurover",
|
"waf_target": "bin/ardurover",
|
||||||
"default_params_filename": "default_params/Rover.parm",
|
"default_params_filename": "default_params/rover.parm",
|
||||||
},
|
},
|
||||||
"rover-skid": {
|
"rover-skid": {
|
||||||
"waf_target": "bin/ardurover",
|
"waf_target": "bin/ardurover",
|
||||||
"default_params_filename": "default_params/Rover-skid.parm",
|
"default_params_filename": "default_params/rover-skid.parm",
|
||||||
},
|
},
|
||||||
# SIM
|
# SIM
|
||||||
"Gazebo": {
|
"Gazebo": {
|
||||||
"waf_target": "bin/arducopter-quad",
|
"waf_target": "bin/arducopter-quad",
|
||||||
"default_params_filename": "default_params/copter_params.parm",
|
"default_params_filename": "default_params/copter.parm",
|
||||||
},
|
},
|
||||||
"last_letter": {
|
"last_letter": {
|
||||||
"waf_target": "bin/arduplane",
|
"waf_target": "bin/arduplane",
|
||||||
@ -460,7 +460,7 @@ _options_for_frame = {
|
|||||||
},
|
},
|
||||||
"jsbsim": {
|
"jsbsim": {
|
||||||
"waf_target": "bin/arduplane",
|
"waf_target": "bin/arduplane",
|
||||||
"default_params_filename": "default_params/ArduPlane.parm",
|
"default_params_filename": "default_params/plane-jsbsim.parm",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -250,28 +250,28 @@ case $FRAME in
|
|||||||
+|quad|quad-*)
|
+|quad|quad-*)
|
||||||
BUILD_TARGET="sitl"
|
BUILD_TARGET="sitl"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter.parm"
|
||||||
;;
|
;;
|
||||||
X*)
|
X*)
|
||||||
BUILD_TARGET="sitl"
|
BUILD_TARGET="sitl"
|
||||||
EXTRA_PARM="param set FRAME 1;"
|
EXTRA_PARM="param set FRAME 1;"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter.parm"
|
||||||
;;
|
;;
|
||||||
octa*)
|
octa*)
|
||||||
BUILD_TARGET="sitl-octa"
|
BUILD_TARGET="sitl-octa"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter.parm"
|
||||||
;;
|
;;
|
||||||
tri*)
|
tri*)
|
||||||
BUILD_TARGET="sitl-tri"
|
BUILD_TARGET="sitl-tri"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/tri_params.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter-tri.parm"
|
||||||
;;
|
;;
|
||||||
y6*)
|
y6*)
|
||||||
BUILD_TARGET="sitl-y6"
|
BUILD_TARGET="sitl-y6"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/y6_params.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter-y6.parm"
|
||||||
;;
|
;;
|
||||||
firefly*)
|
firefly*)
|
||||||
BUILD_TARGET="sitl"
|
BUILD_TARGET="sitl"
|
||||||
@ -289,26 +289,26 @@ case $FRAME in
|
|||||||
heli*)
|
heli*)
|
||||||
BUILD_TARGET="sitl-heli"
|
BUILD_TARGET="sitl-heli"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/Helicopter.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter-heli.parm"
|
||||||
;;
|
;;
|
||||||
singlecopter*)
|
singlecopter*)
|
||||||
BUILD_TARGET="sitl-single"
|
BUILD_TARGET="sitl-single"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/SingleCopter.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter-single.parm"
|
||||||
;;
|
;;
|
||||||
coaxcopter*)
|
coaxcopter*)
|
||||||
BUILD_TARGET="sitl-coax"
|
BUILD_TARGET="sitl-coax"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/CoaxCopter.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter-coax.parm"
|
||||||
;;
|
;;
|
||||||
IrisRos)
|
IrisRos)
|
||||||
BUILD_TARGET="sitl"
|
BUILD_TARGET="sitl"
|
||||||
DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter.parm"
|
||||||
;;
|
;;
|
||||||
Gazebo)
|
Gazebo)
|
||||||
BUILD_TARGET="sitl"
|
BUILD_TARGET="sitl"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter.parm"
|
||||||
;;
|
;;
|
||||||
CRRCSim|last_letter*)
|
CRRCSim|last_letter*)
|
||||||
BUILD_TARGET="sitl"
|
BUILD_TARGET="sitl"
|
||||||
@ -318,7 +318,7 @@ case $FRAME in
|
|||||||
BUILD_TARGET="sitl"
|
BUILD_TARGET="sitl"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
check_jsbsim_version
|
check_jsbsim_version
|
||||||
DEFAULTS_PATH="$autotest/default_params/ArduPlane.parm"
|
DEFAULTS_PATH="$autotest/default_params/plane-jsbsim.parm"
|
||||||
;;
|
;;
|
||||||
quadplane-tilttri*)
|
quadplane-tilttri*)
|
||||||
BUILD_TARGET="sitl-tri"
|
BUILD_TARGET="sitl-tri"
|
||||||
@ -348,7 +348,7 @@ case $FRAME in
|
|||||||
rover-skid)
|
rover-skid)
|
||||||
BUILD_TARGET="sitl"
|
BUILD_TARGET="sitl"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/Rover-skid.parm"
|
DEFAULTS_PATH="$autotest/default_params/rover-skid.parm"
|
||||||
;;
|
;;
|
||||||
flightaxis*)
|
flightaxis*)
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
@ -361,7 +361,7 @@ case $FRAME in
|
|||||||
*-heli)
|
*-heli)
|
||||||
BUILD_TARGET="sitl-heli"
|
BUILD_TARGET="sitl-heli"
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
DEFAULTS_PATH="$autotest/default_params/Helicopter.parm"
|
DEFAULTS_PATH="$autotest/default_params/copter-heli.parm"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
MODEL="$FRAME"
|
MODEL="$FRAME"
|
||||||
|
Loading…
Reference in New Issue
Block a user