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

autotest: copter: catch exception on test_battery_failsafe to reset parameters

Browse Source
This commit is contained in:
Pierre Kancir 2020-08-11 11:41:18 +02:00 committed by Peter Barker
parent 5fe81706bb
commit 3c6d1a359a
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Tools/autotest/arducopter.py
View File

@ -803,6 +803,23 @@ class AutoTestCopter(AutoTest):
# Tests all actions and logic behind the battery failsafe
def fly_battery_failsafe(self, timeout=300):
ex = None
try:
self.test_battery_failsafe(timeout=timeout)
except Exception as e:
ex = e
self.set_parameter('BATT_LOW_VOLT', 0)
self.set_parameter('BATT_CRT_VOLT', 0)
self.set_parameter('BATT_FS_LOW_ACT', 0)
self.set_parameter('BATT_FS_CRT_ACT', 0)
self.set_parameter('FS_OPTIONS', 0)
self.reboot_sitl()
if ex is not None:
raise ex
def test_battery_failsafe(self, timeout=300):
self.progress("Configure battery failsafe parameters")
self.set_parameter('SIM_SPEEDUP', 4)
self.set_parameter('BATT_LOW_VOLT', 11.5)
@ -917,12 +934,6 @@ class AutoTestCopter(AutoTest):
self.end_subtest("Completed terminate failsafe test")
self.progress("All Battery failsafe tests complete")
self.set_parameter('BATT_LOW_VOLT', 0)
self.set_parameter('BATT_CRT_VOLT', 0)
self.set_parameter('BATT_FS_LOW_ACT', 0)
self.set_parameter('BATT_FS_CRT_ACT', 0)
self.set_parameter('FS_OPTIONS', 0)
self.reboot_sitl()
# fly_stability_patch - fly south, then hold loiter within 5m
# position and altitude and reduce 1 motor to 60% efficiency