autotest: add timeout parameter to takeoff method

This commit is contained in:
Peter Barker 2021-12-13 13:36:46 +11:00 committed by Peter Barker
parent 5f21b2f7c9
commit dc90fd57e8
1 changed files with 3 additions and 3 deletions

View File

@ -388,20 +388,20 @@ class AutoTestQuadPlane(AutoTest):
break break
self.wait_disarmed() self.wait_disarmed()
def takeoff(self, height, mode): def takeoff(self, height, mode, timeout=30):
"""climb to specified height and set throttle to 1500""" """climb to specified height and set throttle to 1500"""
self.set_current_waypoint(0, check_afterwards=False) self.set_current_waypoint(0, check_afterwards=False)
self.change_mode(mode) self.change_mode(mode)
self.wait_ready_to_arm() self.wait_ready_to_arm()
self.arm_vehicle() self.arm_vehicle()
if mode == 'GUIDED': if mode == 'GUIDED':
self.user_takeoff(alt_min=height) self.user_takeoff(alt_min=height, timeout=timeout)
return return
self.set_rc(3, 1800) self.set_rc(3, 1800)
self.wait_altitude(height, self.wait_altitude(height,
height+5, height+5,
relative=True, relative=True,
timeout=30) timeout=timeout)
self.set_rc(3, 1500) self.set_rc(3, 1500)
def do_RTL(self): def do_RTL(self):