autotest: move all default params to default_params directory

Tools/autotest/apmrover2.py

@@ -101,7 +101,7 @@ def drive_APMrover2(binary, viewerip=None, map=False, valgrind=False, gdb=False)
     mavproxy.expect('Received [0-9]+ parameters')
 
     # setup test parameters
-    mavproxy.send("param load %s/Rover.parm\n" % testdir)
+    mavproxy.send("param load %s/default_params/Rover.parm\n" % testdir)
     mavproxy.expect('Loaded [0-9]+ parameters')
     mavproxy.send("param set LOG_REPLAY 1\n")
     mavproxy.send("param set LOG_DISARMED 1\n")

Tools/autotest/arducopter.py

@@ -937,7 +937,7 @@ def fly_ArduCopter(binary, viewerip=None, use_map=False, valgrind=False, gdb=Fal
     mavproxy.expect('Received [0-9]+ parameters')
 
     # setup test parameters
-    mavproxy.send("param load %s/copter_params.parm\n" % testdir)
+    mavproxy.send("param load %s/default_params/copter_params.parm\n" % testdir)
     mavproxy.expect('Loaded [0-9]+ parameters')
     mavproxy.send("param set LOG_REPLAY 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')
 
     # setup test parameters
-    mavproxy.send("param load %s/Helicopter.parm\n" % testdir)
+    mavproxy.send("param load %s/default_params/Helicopter.parm\n" % testdir)
     mavproxy.expect('Loaded [0-9]+ parameters')
     mavproxy.send("param set LOG_REPLAY 1\n")
     mavproxy.send("param set LOG_DISARMED 1\n")

Tools/autotest/arduplane.py

@@ -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,
                          valgrind=valgrind, gdb=gdb,
-                         defaults_file=os.path.join(testdir, 'ArduPlane.parm'))
+                         defaults_file=os.path.join(testdir, 'default_params/ArduPlane.parm'))
     mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options)
     mavproxy.expect('Telemetry log: (\S+)')
     logfile = mavproxy.match.group(1)

Tools/autotest/autotest.py

@@ -371,14 +371,14 @@ def write_fullresults():
     results.addfile('ArduPlane build log', 'ArduPlane.txt')
     results.addfile('ArduPlane code size', 'ArduPlane.sizes.txt')
     results.addfile('ArduPlane stack sizes', 'ArduPlane.framesizes.txt')
-    results.addfile('ArduPlane defaults', 'ArduPlane-defaults.parm')
+    results.addfile('ArduPlane defaults', 'default_params/ArduPlane-defaults.parm')
     results.addglob("ArduPlane log", 'ArduPlane-*.BIN')
     results.addglob("ArduPlane core", 'ArduPlane.core')
     results.addglob("ArduPlane ELF", 'ArduPlane.elf')
     results.addfile('ArduCopter build log', 'ArduCopter.txt')
     results.addfile('ArduCopter code size', 'ArduCopter.sizes.txt')
     results.addfile('ArduCopter stack sizes', 'ArduCopter.framesizes.txt')
-    results.addfile('ArduCopter defaults', 'ArduCopter-defaults.parm')
+    results.addfile('ArduCopter defaults', 'default_params/ArduCopter-defaults.parm')
     results.addglob("ArduCopter log", 'ArduCopter-*.BIN')
     results.addglob("ArduCopter core", 'ArduCopter.core')
     results.addglob("ArduCopter elf", 'ArduCopter.elf')
@@ -387,7 +387,7 @@ def write_fullresults():
     results.addfile('APMrover2 build log', 'APMrover2.txt')
     results.addfile('APMrover2 code size', 'APMrover2.sizes.txt')
     results.addfile('APMrover2 stack sizes', 'APMrover2.framesizes.txt')
-    results.addfile('APMrover2 defaults', 'APMrover2-defaults.parm')
+    results.addfile('APMrover2 defaults', 'default_params/APMrover2-defaults.parm')
     results.addglob("APMrover2 log", 'APMrover2-*.BIN')
     results.addglob("APMrover2 core", 'APMrover2.core')
     results.addglob("APMrover2 ELF", 'APMrover2.elf')

Tools/autotest/quadplane.py

@@ -55,7 +55,7 @@ def fly_QuadPlane(binary, viewerip=None, map=False, valgrind=False, gdb=False):
         options += ' --map'
 
     sil = util.start_SIL(binary, model='quadplane', wipe=True, home=HOME_LOCATION, speedup=10,
-                         defaults_file=os.path.join(testdir, 'quadplane.parm'), valgrind=valgrind, gdb=gdb)
+                         defaults_file=os.path.join(testdir, 'default_params/quadplane.parm'), valgrind=valgrind, gdb=gdb)
     mavproxy = util.start_MAVProxy_SIL('QuadPlane', options=options)
     mavproxy.expect('Telemetry log: (\S+)')
     logfile = mavproxy.match.group(1)

Tools/autotest/sim_vehicle.py

@@ -344,54 +344,54 @@ _options_for_frame = {
     # COPTER
     "+": {
         "waf_target": "bin/arducopter-quad",
-        "default_params_filename": "copter_params.parm",
+        "default_params_filename": "default_params/copter_params.parm",
     },
     "quad": {
         "model": "+",
         "waf_target": "bin/arducopter-quad",
-        "default_params_filename": "copter_params.parm",
+        "default_params_filename": "default_params/copter_params.parm",
     },
     "X": {
         "waf_target": "bin/arducopter-quad",
         # 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
-        "default_params_filename": "copter_params.parm",
+        "default_params_filename": "default_params/copter_params.parm",
         "extra_mavlink_cmds": "param fetch frame; param set FRAME 1;",
     },
     "hexa": {
         "make_target": "sitl-hexa",
         "waf_target": "bin/arducopter-hexa",
-        "default_params_filename": "copter_params.parm",
+        "default_params_filename": "default_params/copter_params.parm",
     },
     "octa": {
         "make_target": "sitl-octa",
         "waf_target": "bin/arducopter-octa",
-        "default_params_filename": "copter_params.parm",
+        "default_params_filename": "default_params/copter_params.parm",
     },
     "tri": {
         "make_target": "sitl-tri",
         "waf_target": "bin/arducopter-tri",
-        "default_params_filename": "tri_params.parm",
+        "default_params_filename": "default_params/tri_params.parm",
     },
     "y6": {
         "make_target": "sitl-y6",
         "waf_target": "bin/arducopter-y6",
-        "default_params_filename": "y6_params.parm",
+        "default_params_filename": "default_params/y6_params.parm",
     },
     # COPTER TYPES
     "IrisRos": {
         "waf_target": "bin/arducopter-quad",
-        "default_params_filename": "copter_params.parm",
+        "default_params_filename": "default_params/copter_params.parm",
     },
     "firefly": {
         "waf_target": "bin/arducopter-firefly",
-        "default_params_filename": "firefly.parm",
+        "default_params_filename": "default_params/firefly.parm",
     },
     # HELICOPTER
     "heli": {
         "make_target": "sitl-heli",
         "waf_target": "bin/arducopter-heli",
-        "default_params_filename": "Helicopter.parm",
+        "default_params_filename": "default_params/Helicopter.parm",
     },
     "heli-dual": {
         "make_target": "sitl-heli-dual",
@@ -404,53 +404,53 @@ _options_for_frame = {
     "singlecopter": {
         "make_target": "sitl-single",
         "waf_target": "bin/arducopter-single",
-        "default_params_filename": "SingleCopter.parm",
+        "default_params_filename": "default_params/SingleCopter.parm",
     },
     "coaxcopter": {
         "make_target": "sitl-coax",
         "waf_target": "bin/arducopter-coax",
-        "default_params_filename": "CoaxCopter.parm",
+        "default_params_filename": "default_params/CoaxCopter.parm",
     },
     # PLANE
     "quadplane-tilttri": {
         "make_target": "sitl-tri",
         "waf_target": "bin/arduplane-tri",
-        "default_params_filename": "quadplane-tilttri.parm",
+        "default_params_filename": "default_params/quadplane-tilttri.parm",
     },
     "quadplane-tri": {
         "make_target": "sitl-tri",
         "waf_target": "bin/arduplane-tri",
-        "default_params_filename": "quadplane-tri.parm",
+        "default_params_filename": "default_params/quadplane-tri.parm",
     },
     "quadplane": {
         "waf_target": "bin/arduplane",
-        "default_params_filename": "quadplane.parm",
+        "default_params_filename": "default_params/quadplane.parm",
     },
     "plane-elevon": {
         "waf_target": "bin/arduplane",
-        "default_params_filename": "plane-elevons.parm",
+        "default_params_filename": "default_params/plane-elevons.parm",
     },
     "plane-vtail": {
         "waf_target": "bin/arduplane",
-        "default_params_filename": "plane-vtail.parm",
+        "default_params_filename": "default_params/plane-vtail.parm",
     },
     "plane": {
         "waf_target": "bin/arduplane",
-        "default_params_filename": "plane.parm",
+        "default_params_filename": "default_params/plane.parm",
     },
     # ROVER
     "rover": {
         "waf_target": "bin/ardurover",
-        "default_params_filename": "Rover.parm",
+        "default_params_filename": "default_params/Rover.parm",
     },
     "rover-skid": {
         "waf_target": "bin/ardurover",
-        "default_params_filename": "Rover-skid.parm",
+        "default_params_filename": "default_params/Rover-skid.parm",
     },
     # SIM
     "Gazebo": {
         "waf_target": "bin/arducopter-quad",
-        "default_params_filename": "copter_params.parm",
+        "default_params_filename": "default_params/copter_params.parm",
     },
     "last_letter": {
         "waf_target": "bin/arduplane",
@@ -460,7 +460,7 @@ _options_for_frame = {
     },
     "jsbsim": {
         "waf_target": "bin/arduplane",
-        "default_params_filename": "ArduPlane.parm",
+        "default_params_filename": "default_params/ArduPlane.parm",
     },
 }
 

Tools/autotest/sim_vehicle.sh

@@ -250,33 +250,33 @@ case $FRAME in
     +|quad|quad-*)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
 	;;
     X*)
 	BUILD_TARGET="sitl"
         EXTRA_PARM="param set FRAME 1;"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
 	;;
     octa*)
 	BUILD_TARGET="sitl-octa"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
 	;;
     tri*)
 	BUILD_TARGET="sitl-tri"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/tri_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/tri_params.parm"
 	;;
     y6*)
 	BUILD_TARGET="sitl-y6"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/y6_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/y6_params.parm"
 	;;
     firefly*)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/firefly.parm"
+        DEFAULTS_PATH="$autotest/default_params/firefly.parm"
 	;;
     heli-dual)
         BUILD_TARGET="sitl-heli-dual"
@@ -289,26 +289,26 @@ case $FRAME in
     heli*)
 	BUILD_TARGET="sitl-heli"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/Helicopter.parm"
+        DEFAULTS_PATH="$autotest/default_params/Helicopter.parm"
 	;;
     singlecopter*)
 	BUILD_TARGET="sitl-single"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/SingleCopter.parm"
+        DEFAULTS_PATH="$autotest/default_params/SingleCopter.parm"
 	;;
     coaxcopter*)
 	BUILD_TARGET="sitl-coax"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/CoaxCopter.parm"
+        DEFAULTS_PATH="$autotest/default_params/CoaxCopter.parm"
 	;;
     IrisRos)
 	BUILD_TARGET="sitl"
-        DEFAULTS_PATH="$autotest/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
 	;;
     Gazebo)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
 	;;
     CRRCSim|last_letter*)
 	BUILD_TARGET="sitl"
@@ -318,37 +318,37 @@ case $FRAME in
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
         check_jsbsim_version
-        DEFAULTS_PATH="$autotest/ArduPlane.parm"
+        DEFAULTS_PATH="$autotest/default_params/ArduPlane.parm"
 	;;
     quadplane-tilttri*)
 	BUILD_TARGET="sitl-tri"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/quadplane-tilttri.parm"
+        DEFAULTS_PATH="$autotest/default_params/quadplane-tilttri.parm"
 	;;
     quadplane*)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/quadplane.parm"
+        DEFAULTS_PATH="$autotest/default_params/quadplane.parm"
 	;;
     plane-elevon*)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/plane-elevons.parm"
+        DEFAULTS_PATH="$autotest/default_params/plane-elevons.parm"
 	;;
     plane-vtail*)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/plane-vtail.parm"
+        DEFAULTS_PATH="$autotest/default_params/plane-vtail.parm"
 	;;
     plane*)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/plane.parm"
+        DEFAULTS_PATH="$autotest/default_params/plane.parm"
 	;;
     rover-skid)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/Rover-skid.parm"
+        DEFAULTS_PATH="$autotest/default_params/Rover-skid.parm"
 	;;
     flightaxis*)
         MODEL="$FRAME"
@@ -361,7 +361,7 @@ case $FRAME in
     *-heli)
 	BUILD_TARGET="sitl-heli"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/Helicopter.parm"
+        DEFAULTS_PATH="$autotest/default_params/Helicopter.parm"
 	;;
     *)
         MODEL="$FRAME"