From 5172e767df26dfb84bf2142b774f38d509e554dd Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 28 Apr 2021 17:43:28 +1000 Subject: [PATCH] autotest: fix octa-dji in SITL --- Tools/autotest/arducopter.py | 1 - Tools/autotest/default_params/copter-octa-dji.parm | 1 + Tools/autotest/pysim/vehicleinfo.py | 6 +++++- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Tools/autotest/default_params/copter-octa-dji.parm diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py index 540c31361d..b2c6548f5e 100644 --- a/Tools/autotest/arducopter.py +++ b/Tools/autotest/arducopter.py @@ -6494,7 +6494,6 @@ class AutoTestCopter(AutoTest): 'hexa-cwx': "does not take off", 'hexa-dji': "does not take off", 'octa-cwx': "does not take off", - 'octa-dji': "does not take off", 'octa-quad-cwx': "does not take off", 'tri': "does not take off", } diff --git a/Tools/autotest/default_params/copter-octa-dji.parm b/Tools/autotest/default_params/copter-octa-dji.parm new file mode 100644 index 0000000000..4c60f79bee --- /dev/null +++ b/Tools/autotest/default_params/copter-octa-dji.parm @@ -0,0 +1 @@ +FRAME_TYPE 13 diff --git a/Tools/autotest/pysim/vehicleinfo.py b/Tools/autotest/pysim/vehicleinfo.py index cd818a1fc4..1e7b8bdd27 100644 --- a/Tools/autotest/pysim/vehicleinfo.py +++ b/Tools/autotest/pysim/vehicleinfo.py @@ -76,7 +76,11 @@ class VehicleInfo(object): }, "octa-dji": { "waf_target": "bin/arducopter", - "default_params_filename": "default_params/copter.parm", + "default_params_filename": [ + "default_params/copter.parm", + "default_params/copter-octa.parm", + "default_params/copter-octa-dji.parm" + ], }, "deca": { "waf_target": "bin/arducopter",