Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-24 09:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: autotest: drain mav before getting message rates, improve debug

Browse Source
This commit is contained in:
Peter Barker 2019-05-09 18:43:42 +10:00 committed by Peter Barker
parent dd62489f5e
commit d76894d883
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tools/autotest/common.py
View File

@ -2334,8 +2334,9 @@ class AutoTest(ABC):
"long SET_MESSAGE_INTERVAL %u %d\n" % "long SET_MESSAGE_INTERVAL %u %d\n" %
(mavutil.mavlink.MAVLINK_MSG_ID_CAMERA_FEEDBACK, (mavutil.mavlink.MAVLINK_MSG_ID_CAMERA_FEEDBACK,
self.rate_to_interval_us(want_rate))) self.rate_to_interval_us(want_rate)))
self.drain_mav()
rate = round(self.get_message_rate("CAMERA_FEEDBACK", 20)) rate = round(self.get_message_rate("CAMERA_FEEDBACK", 20))
self.progress("Want=%f got=%f" % (want_rate, rate)) self.progress("Want=%u got=%u" % (want_rate, rate))
if rate != want_rate: if rate != want_rate:
raise NotAchievedException("Did not get expected rate") raise NotAchievedException("Did not get expected rate")
@ -2355,6 +2356,8 @@ class AutoTest(ABC):
if abs(rate - want_rate) > 2: if abs(rate - want_rate) > 2:
raise NotAchievedException("Did not get expected rate") raise NotAchievedException("Did not get expected rate")
self.drain_mav()
self.progress("Resetting CAMERA_FEEDBACK rate to zero") self.progress("Resetting CAMERA_FEEDBACK rate to zero")
self.set_message_rate_hz(mavutil.mavlink.MAVLINK_MSG_ID_CAMERA_FEEDBACK, -1) self.set_message_rate_hz(mavutil.mavlink.MAVLINK_MSG_ID_CAMERA_FEEDBACK, -1)
@ -2372,6 +2375,8 @@ class AutoTest(ABC):
self.mavproxy.send("set streamrate %u\n" % sr) self.mavproxy.send("set streamrate %u\n" % sr)
except Exception as e: except Exception as e:
self.progress("Caught exception %s" %
self.get_exception_stacktrace(e))
# tell MAVProxy to start stuffing around with the rates: # tell MAVProxy to start stuffing around with the rates:
sr = self.sitl_streamrate() sr = self.sitl_streamrate()
self.mavproxy.send("set streamrate %u\n" % sr) self.mavproxy.send("set streamrate %u\n" % sr)