From 81274018c3b87532f465dea0b72f2c34d054dbf6 Mon Sep 17 00:00:00 2001 From: Pierre Kancir Date: Tue, 10 Mar 2020 13:20:31 +0100 Subject: [PATCH] Tools: update path for sub test missions files --- .../ArmFeatures}/test_arming.txt | 0 Tools/autotest/ArduSub_Tests/DiveMission/sub_mission.txt | 7 +++++++ .../ArduSub_Tests/GripperMission/sub-gripper-mission.txt | 8 ++++++++ Tools/autotest/ardusub.py | 6 +++--- 4 files changed, 18 insertions(+), 3 deletions(-) rename Tools/autotest/{ArduSub-Missions => ArduSub_Tests/ArmFeatures}/test_arming.txt (100%) create mode 100644 Tools/autotest/ArduSub_Tests/DiveMission/sub_mission.txt create mode 100644 Tools/autotest/ArduSub_Tests/GripperMission/sub-gripper-mission.txt diff --git a/Tools/autotest/ArduSub-Missions/test_arming.txt b/Tools/autotest/ArduSub_Tests/ArmFeatures/test_arming.txt similarity index 100% rename from Tools/autotest/ArduSub-Missions/test_arming.txt rename to Tools/autotest/ArduSub_Tests/ArmFeatures/test_arming.txt diff --git a/Tools/autotest/ArduSub_Tests/DiveMission/sub_mission.txt b/Tools/autotest/ArduSub_Tests/DiveMission/sub_mission.txt new file mode 100644 index 0000000000..298b6bdc89 --- /dev/null +++ b/Tools/autotest/ArduSub_Tests/DiveMission/sub_mission.txt @@ -0,0 +1,7 @@ +QGC WPL 110 +0 0 0 16 0.000000 0.000000 0.000000 0.000000 -35.363262 149.165237 583.969971 1 +1 0 3 16 0.000000 0.000000 0.000000 0.000000 33.809780 -118.393982 -50.000000 1 +2 0 3 16 0.000000 0.000000 0.000000 0.000000 33.809780 -118.394432 -50.000000 1 +3 0 3 16 0.000000 0.000000 0.000000 0.000000 33.810310 -118.394432 -50.000000 1 +4 0 3 18 1.000000 0.000000 50.000000 1.000000 33.810310 -118.395020 -25.000000 1 +5 0 3 21 25.000000 0.000000 0.000000 0.000000 33.811207 -118.393036 -25.000000 1 diff --git a/Tools/autotest/ArduSub_Tests/GripperMission/sub-gripper-mission.txt b/Tools/autotest/ArduSub_Tests/GripperMission/sub-gripper-mission.txt new file mode 100644 index 0000000000..7971da36cb --- /dev/null +++ b/Tools/autotest/ArduSub_Tests/GripperMission/sub-gripper-mission.txt @@ -0,0 +1,8 @@ +QGC WPL 110 +0 0 0 16 0.000000 0.000000 0.000000 0.000000 33.810313 -118.393867 0 1 +1 0 3 22 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -5.000000 1 +2 0 3 16 0.000000 0.000000 0.000000 0.000000 33.810612 -118.393867 0.000000 1 +3 0 0 211 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1 +4 0 3 16 0.000000 0.000000 0.000000 0.000000 33.810612 -118.393578 0.000000 1 +5 0 0 211 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1 +4 0 3 16 0.000000 0.000000 0.000000 0.000000 33.810612 -118.393588 0.000000 1 diff --git a/Tools/autotest/ardusub.py b/Tools/autotest/ardusub.py index e6720cea2e..5ca59fc44a 100644 --- a/Tools/autotest/ardusub.py +++ b/Tools/autotest/ardusub.py @@ -51,6 +51,9 @@ class AutoTestSub(AutoTest): def test_filepath(self): return os.path.realpath(__file__) + def set_current_test_name(self, name): + self.current_test_name_directory = "ArduSub_Tests/" + name + "/" + def default_mode(self): return 'MANUAL' @@ -69,9 +72,6 @@ class AutoTestSub(AutoTest): def is_sub(self): return True - def arming_test_mission(self): - return os.path.join(testdir, "ArduSub-Missions", "test_arming.txt") - def watch_altitude_maintained(self, delta=0.5, timeout=5.0): """Watch and wait for the actual altitude to be maintained