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

autotest: reset camera feedback rate if exception is raised

Browse Source
This commit is contained in:
Peter Barker 2020-09-11 09:32:58 +10:00 committed by Andrew Tridgell
parent 989f8c5d41
commit 8f1e9ebc7f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/autotest/common.py
View File

@ -5917,7 +5917,7 @@ Also, ignores heartbeats not from our target system'''
rate = round(self.get_message_rate("CAMERA_FEEDBACK", 20))
self.progress("Want=%u got=%u" % (want_rate, rate))
if rate != want_rate:
raise NotAchievedException("Did not get expected rate")
raise NotAchievedException("Did not get expected rate (want=%u got=%u" % (want_rate, rate))
self.progress("try at the main loop rate")
@ -5936,9 +5936,6 @@ Also, ignores heartbeats not from our target system'''
self.drain_mav()
self.progress("Resetting CAMERA_FEEDBACK rate to zero")
self.set_message_rate_hz(mavutil.mavlink.MAVLINK_MSG_ID_CAMERA_FEEDBACK, -1)
non_existant_id = 145
self.send_get_message_interval(non_existant_id)
m = self.mav.recv_match(type='MESSAGE_INTERVAL', blocking=True)
@ -5953,6 +5950,9 @@ Also, ignores heartbeats not from our target system'''
self.get_exception_stacktrace(e))
ex = e
self.progress("Resetting CAMERA_FEEDBACK rate to zero")
self.set_message_rate_hz(mavutil.mavlink.MAVLINK_MSG_ID_CAMERA_FEEDBACK, -1)
# tell MAVProxy to start stuffing around with the rates:
sr = self.sitl_streamrate()
self.mavproxy.send("set streamrate %u\n" % sr)