Tools: autotest check-avoidance-corners disables proximity before RTL

rmackay9 · Aug 28, 2024 · 109d021 · 109d021
1 parent 780721e
commit 109d021
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
@@ -7331,7 +7331,6 @@ def check_avoidance_corners(self):
         self.reach_heading_manual(225)
         self.wait_location(west_loc, accuracy=6, timeout=200)
         self.set_rc(2, 1500)
-        self.do_RTL()
 
     def OBSTACLE_DISTANCE_3D_test_angle(self, angle):
         now = self.get_sim_time_cached()
@@ -7421,6 +7420,8 @@ def AC_Avoidance_Proximity(self):
         self.progress("Enabling proximity")
         self.set_rc(10, 2000)
         self.check_avoidance_corners()
+        self.set_rc(10, 1000)
+        self.do_RTL()
 
         self.assert_current_onboard_log_contains_message("PRX")
         self.assert_current_onboard_log_contains_message("PRXR")
@@ -7588,6 +7589,7 @@ def AC_Avoidance_Fence(self):
         self.load_fence("copter-avoidance-fence.txt")
         self.set_parameter("FENCE_ENABLE", 1)
         self.check_avoidance_corners()
+        self.do_RTL()
 
     def AvoidanceAltFence(self):
         '''Test fence avoidance at minimum and maximum altitude'''