mirror of https://github.com/ArduPilot/ardupilot
autotest: avoid draining mav while waiting for motors-armed heartbeat
This commit is contained in:
parent
3b034e3af6
commit
b69a75098f
|
@ -4475,7 +4475,6 @@ class AutoTest(ABC):
|
||||||
def arm_vehicle(self, timeout=20, force=False):
|
def arm_vehicle(self, timeout=20, force=False):
|
||||||
"""Arm vehicle with mavlink arm message."""
|
"""Arm vehicle with mavlink arm message."""
|
||||||
self.progress("Arm motors with MAVLink cmd")
|
self.progress("Arm motors with MAVLink cmd")
|
||||||
self.drain_mav()
|
|
||||||
p2 = 0
|
p2 = 0
|
||||||
if force:
|
if force:
|
||||||
p2 = 2989
|
p2 = 2989
|
||||||
|
@ -4502,7 +4501,7 @@ class AutoTest(ABC):
|
||||||
def wait_armed(self, timeout=20):
|
def wait_armed(self, timeout=20):
|
||||||
tstart = self.get_sim_time()
|
tstart = self.get_sim_time()
|
||||||
while self.get_sim_time_cached() - tstart < timeout:
|
while self.get_sim_time_cached() - tstart < timeout:
|
||||||
self.wait_heartbeat()
|
self.wait_heartbeat(drain_mav=False)
|
||||||
if self.mav.motors_armed():
|
if self.mav.motors_armed():
|
||||||
self.progress("Motors ARMED")
|
self.progress("Motors ARMED")
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue