aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AutoTest: Fix autotest conflicts after rebase on upstream

Browse Source
This commit is contained in:
James O'Shannessy 2021-03-03 14:10:47 +11:00 committed by Peter Barker
parent e16bbe6e18
commit dac5996d93
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/autotest/arduplane.py
View File

@ -1353,7 +1353,7 @@ class AutoTestPlane(AutoTest):
return_radius = 100
return_alt = 80
self.set_parameter("RTL_RADIUS", return_radius)
self.set_parameter("FENCE_ACTION", 5) # Set Fence Action to Guided
self.set_parameter("FENCE_ACTION", 6) # Set Fence Action to Guided
self.set_parameter("FENCE_TYPE", 8) # Only use fence floor
self.set_parameter("FENCE_RET_ALT", return_alt)
self.do_fence_enable()
@ -2524,8 +2524,8 @@ class AutoTestPlane(AutoTest):
self.disarm_vehicle(force=True)
attempt_fence_breached_disable(start_mode="FBWA", end_mode="RTL", expected_mode="RTL", action=1)
attempt_fence_breached_disable(start_mode="FBWA", end_mode="FBWA", expected_mode="GUIDED", action=5)
attempt_fence_breached_disable(start_mode="FBWA", end_mode="FBWA", expected_mode="GUIDED", action=6)
attempt_fence_breached_disable(start_mode="FBWA", end_mode="FBWA", expected_mode="GUIDED", action=7)
def tests(self):
'''return list of all tests'''