From d897d71d534291e1679106f3ec0b188951bfdc22 Mon Sep 17 00:00:00 2001 From: Tatsuya Yamaguchi Date: Thu, 11 Apr 2024 16:41:58 +0900 Subject: [PATCH 1/2] AP_HAL_SITL: added HEXA X --- libraries/AP_HAL_SITL/SITL_cmdline.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/AP_HAL_SITL/SITL_cmdline.cpp b/libraries/AP_HAL_SITL/SITL_cmdline.cpp index 1f8d3935df8d4..005953e749edf 100644 --- a/libraries/AP_HAL_SITL/SITL_cmdline.cpp +++ b/libraries/AP_HAL_SITL/SITL_cmdline.cpp @@ -142,6 +142,7 @@ static const struct { { "djix", MultiCopter::create }, { "cwx", MultiCopter::create }, { "hexa", MultiCopter::create }, + { "hexax", MultiCopter::create }, { "hexa-cwx", MultiCopter::create }, { "hexa-dji", MultiCopter::create }, { "octa", MultiCopter::create }, From f11ebfb64b066675586da7ca2108d733f6761a42 Mon Sep 17 00:00:00 2001 From: Tatsuya Yamaguchi Date: Thu, 11 Apr 2024 16:46:25 +0900 Subject: [PATCH 2/2] Tools: autotest: added HEXA X --- Tools/autotest/default_params/copter-X.parm | 2 -- Tools/autotest/pysim/vehicleinfo.py | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Tools/autotest/default_params/copter-X.parm b/Tools/autotest/default_params/copter-X.parm index ee06ded19b212..06081beef07ee 100644 --- a/Tools/autotest/default_params/copter-X.parm +++ b/Tools/autotest/default_params/copter-X.parm @@ -1,3 +1 @@ -FRAME_CLASS 1 FRAME_TYPE 1 - diff --git a/Tools/autotest/pysim/vehicleinfo.py b/Tools/autotest/pysim/vehicleinfo.py index 198dda7461cae..cce7c65eeacbb 100644 --- a/Tools/autotest/pysim/vehicleinfo.py +++ b/Tools/autotest/pysim/vehicleinfo.py @@ -45,6 +45,12 @@ def __init__(self): "default_params_filename": ["default_params/copter.parm", "default_params/copter-hexa.parm" ], }, + "hexax": { + "waf_target": "bin/arducopter", + "default_params_filename": ["default_params/copter.parm", + "default_params/copter-hexa.parm", + "default_params/copter-X.parm", ], + }, "hexa-cwx": { "waf_target": "bin/arducopter", "default_params_filename": [