mirror of https://github.com/ArduPilot/ardupilot
autotest: increase timeout allowed for mavlite parameter test
the FRSky thread isn't any faster, but ArduPlane's speedup was increased. So allow more simulated time to get the data
This commit is contained in:
parent
3c700bdf44
commit
a306c4c506
|
@ -11189,14 +11189,13 @@ switch value'''
|
||||||
def read_message_via_mavlite(self, frsky, sport_to_mavlite):
|
def read_message_via_mavlite(self, frsky, sport_to_mavlite):
|
||||||
'''read bytes from frsky mavlite stream, trying to form up a mavlite
|
'''read bytes from frsky mavlite stream, trying to form up a mavlite
|
||||||
message'''
|
message'''
|
||||||
self.drain_mav(quiet=True)
|
|
||||||
tstart = self.get_sim_time()
|
tstart = self.get_sim_time()
|
||||||
|
timeout = 30 * self.speedup/10.0
|
||||||
|
if self.valgrind or self.callgrind:
|
||||||
|
timeout *= 10
|
||||||
while True:
|
while True:
|
||||||
self.drain_mav(quiet=True)
|
self.drain_mav(quiet=True)
|
||||||
tnow = self.get_sim_time_cached()
|
tnow = self.get_sim_time_cached()
|
||||||
timeout = 30
|
|
||||||
if self.valgrind or self.callgrind:
|
|
||||||
timeout *= 10
|
|
||||||
if tnow - tstart > timeout:
|
if tnow - tstart > timeout:
|
||||||
raise NotAchievedException("Did not get parameter via mavlite")
|
raise NotAchievedException("Did not get parameter via mavlite")
|
||||||
frsky.update()
|
frsky.update()
|
||||||
|
@ -11207,11 +11206,10 @@ switch value'''
|
||||||
return message
|
return message
|
||||||
|
|
||||||
def read_parameter_via_mavlite(self, frsky, sport_to_mavlite, name):
|
def read_parameter_via_mavlite(self, frsky, sport_to_mavlite, name):
|
||||||
self.drain_mav(quiet=True)
|
|
||||||
tstart = self.get_sim_time()
|
tstart = self.get_sim_time()
|
||||||
while True:
|
while True:
|
||||||
tnow = self.get_sim_time_cached()
|
tnow = self.get_sim_time_cached()
|
||||||
if tnow - tstart > 30:
|
if tnow - tstart > 30 * self.speedup / 10.0:
|
||||||
raise NotAchievedException("Did not get parameter via mavlite")
|
raise NotAchievedException("Did not get parameter via mavlite")
|
||||||
message = self.read_message_via_mavlite(frsky, sport_to_mavlite)
|
message = self.read_message_via_mavlite(frsky, sport_to_mavlite)
|
||||||
if message.msgid != mavutil.mavlink.MAVLINK_MSG_ID_PARAM_VALUE:
|
if message.msgid != mavutil.mavlink.MAVLINK_MSG_ID_PARAM_VALUE:
|
||||||
|
|
Loading…
Reference in New Issue