Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 23:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: moved plane-3d.parm to models directory

Browse Source
This commit is contained in:
Andrew Tridgell 2022-11-09 08:01:54 +11:00
parent aef745c693
commit 98145f7a3f
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tools/autotest/default_params/plane-3d.parm → Tools/autotest/models/plane-3d.parm
View File

@ -22,8 +22,15 @@ YAW_RATE_FF 0.55
YAW_RATE_FLTT 3.18 YAW_RATE_FLTT 3.18
YAW_RATE_FLTD 10.0 YAW_RATE_FLTD 10.0
YAW_RATE_SMAX 460.0 YAW_RATE_SMAX 460.0
ACRO_ROLL_RATE 360
ACRO_YAW_RATE 60 ACRO_YAW_RATE 60
ACRO_LOCKING 2 ACRO_LOCKING 2
AHRS_EKF_TYPE 10 AHRS_EKF_TYPE 10
TRIM_THROTTLE 30 TRIM_THROTTLE 30
NAVL1_PERIOD 7 NAVL1_PERIOD 7
TRIM_ARSPD_CM 2400
ARSPD_FBW_MAX 30
# setup for scripting
SCR_ENABLE 1
SCR_HEAP_SIZE 300000
SCR_VM_I_COUNT 100000

0
Tools/autotest/default_params/plane.parm → Tools/autotest/models/plane.parm
View File

24
Tools/autotest/pysim/vehicleinfo.py
View File

@ -232,7 +232,7 @@ class VehicleInfo(object):
}, },
"quadplane-tilthvec": { "quadplane-tilthvec": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": ["default_params/plane.parm", "default_params/quadplane-tilthvec.parm"], "default_params_filename": ["models/plane.parm", "default_params/quadplane-tilthvec.parm"],
}, },
"quadplane-tri": { "quadplane-tri": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
@ -256,11 +256,11 @@ class VehicleInfo(object):
}, },
"plane-elevon": { "plane-elevon": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": ["default_params/plane.parm", "default_params/plane-elevons.parm"], "default_params_filename": ["models/plane.parm", "default_params/plane-elevons.parm"],
}, },
"plane-vtail": { "plane-vtail": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": ["default_params/plane.parm", "default_params/plane-vtail.parm"], "default_params_filename": ["models/plane.parm", "default_params/plane-vtail.parm"],
}, },
"plane-tailsitter": { "plane-tailsitter": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
@ -268,15 +268,15 @@ class VehicleInfo(object):
}, },
"plane-jet": { "plane-jet": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": ["default_params/plane.parm", "default_params/plane-jet.parm"], "default_params_filename": ["models/plane.parm", "default_params/plane-jet.parm"],
}, },
"plane-ice": { "plane-ice": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": ["default_params/plane.parm", "default_params/plane-ice.parm"], "default_params_filename": ["models/plane.parm", "default_params/plane-ice.parm"],
}, },
"plane-3d": { "plane-3d": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": ["default_params/plane.parm", "default_params/plane-3d.parm"], "default_params_filename": [], # defaults are loaded in SIM_Plane.cpp
}, },
"quadplane-copter_tailsitter": { "quadplane-copter_tailsitter": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
@ -284,15 +284,15 @@ class VehicleInfo(object):
}, },
"plane": { "plane": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": "default_params/plane.parm", "default_params_filename": "models/plane.parm",
}, },
"plane-dspoilers": { "plane-dspoilers": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": ["default_params/plane.parm", "default_params/plane-dspoilers.parm"] "default_params_filename": ["models/plane.parm", "default_params/plane-dspoilers.parm"]
}, },
"plane-soaring": { "plane-soaring": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": ["default_params/plane.parm", "default_params/plane-soaring.parm"] "default_params_filename": ["models/plane.parm", "default_params/plane-soaring.parm"]
}, },
"gazebo-zephyr": { "gazebo-zephyr": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
@ -301,12 +301,12 @@ class VehicleInfo(object):
}, },
"last_letter": { "last_letter": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": "default_params/plane.parm", "default_params_filename": "models/plane.parm",
"external": True, "external": True,
}, },
"CRRCSim": { "CRRCSim": {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": "default_params/plane.parm", "default_params_filename": "models/plane.parm",
"external": True, "external": True,
}, },
"jsbsim": { "jsbsim": {
@ -316,7 +316,7 @@ class VehicleInfo(object):
}, },
"scrimmage-plane" : { "scrimmage-plane" : {
"waf_target": "bin/arduplane", "waf_target": "bin/arduplane",
"default_params_filename": "default_params/plane.parm", "default_params_filename": "models/plane.parm",
"external": True, "external": True,
}, },
"calibration": { "calibration": {

2
Tools/autotest/sim_vehicle.py
View File

@ -743,7 +743,7 @@ def start_vehicle(binary, opts, stuff, spawns=None):
path += "," + os.path.join(autotest_dir, "default_params/msposd.parm") path += "," + os.path.join(autotest_dir, "default_params/msposd.parm")
subprocess.Popen([os.path.join(root_dir, "libraries/AP_MSP/Tools/msposd.py")]) subprocess.Popen([os.path.join(root_dir, "libraries/AP_MSP/Tools/msposd.py")])
if path is not None: if path is not None and len(path) > 0:
cmd.extend(["--defaults", path]) cmd.extend(["--defaults", path])
if cmd_opts.start_time is not None: if cmd_opts.start_time is not None: