autotest:Copter test fix for some frames

removed some lines Whitespace messages removal
4 years ago · 45f1d03bda
5 changed files with 21 additions and 6 deletions
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@ -6615,9 +6615,6 @@ class AutoTestCopter(AutoTest):
				@@ -6615,9 +6615,6 @@ class AutoTestCopter(AutoTest):
            'heli-compound': "wrong binary, different takeoff regime",
            'heli-dual': "wrong binary, different takeoff regime",
            'heli': "wrong binary, different takeoff regime",
-            'hexa-cwx': "does not take off",
-            'hexa-dji': "does not take off",
-            'octa-quad-cwx': "does not take off",
            'tri': "does not take off",
        }
        for frame in sorted(copter_vinfo_options["frames"].keys()):
--- a/Tools/autotest/default_params/copter-hexa-cwx.parm
+++ b/Tools/autotest/default_params/copter-hexa-cwx.parm
@ -0,0 +1,2 @@
				@@ -0,0 +1,2 @@
+FRAME_CLASS     2
+FRAME_TYPE     14
--- a/Tools/autotest/default_params/copter-hexa-dji.parm
+++ b/Tools/autotest/default_params/copter-hexa-dji.parm
@ -0,0 +1,2 @@
				@@ -0,0 +1,2 @@
+FRAME_CLASS     2
+FRAME_TYPE     13
--- a/Tools/autotest/default_params/copter-octaquad-cwx.parm
+++ b/Tools/autotest/default_params/copter-octaquad-cwx.parm
@ -0,0 +1,2 @@
				@@ -0,0 +1,2 @@
+FRAME_CLASS     4
+FRAME_TYPE     14
--- a/Tools/autotest/pysim/vehicleinfo.py
+++ b/Tools/autotest/pysim/vehicleinfo.py
@ -50,11 +50,19 @@ class VehicleInfo(object):
				@@ -50,11 +50,19 @@ class VehicleInfo(object):
            },
            "hexa-cwx": {
                "waf_target": "bin/arducopter",
-                "default_params_filename": "default_params/copter.parm",
+                "default_params_filename": [
+                    "default_params/copter.parm",
+                    "default_params/copter-hexa.parm",
+                    "default_params/copter-hexa-cwx.parm"
+                ],
            },
            "hexa-dji": {
                "waf_target": "bin/arducopter",
-                "default_params_filename": "default_params/copter.parm",
+                "default_params_filename": [
+                    "default_params/copter.parm",
+                    "default_params/copter-hexa.parm",
+                    "default_params/copter-hexa-dji.parm"
+                ],
            },
             "octa-cwx": {
                "waf_target": "bin/arducopter",
@ -66,7 +74,11 @@ class VehicleInfo(object):
				@@ -66,7 +74,11 @@ class VehicleInfo(object):
            },
            "octa-quad-cwx": {
                "waf_target": "bin/arducopter",
-                "default_params_filename": "default_params/copter.parm",
+                "default_params_filename": [
+                    "default_params/copter.parm",
+                    "default_params/copter-octaquad.parm",
+                    "default_params/copter-octaquad-cwx.parm"
+                ],
            },
            "octa-quad": {
                "waf_target": "bin/arducopter",