aleks/flix
1
0
Fork 0
mirror of https://github.com/okalachev/flix.git synced 2026-09-06 00:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make failed mavlink commands exception more verbose in pytflix

Browse Source
This commit is contained in:
Oleg Kalachev
2026-08-29 16:52:34 +03:00
parent 0dae0a3e7e
commit 3861c4438a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/pyflix/flix.py
+3 -1
View File
@@ -264,7 +264,9 @@ class Flix:
self.mavlink.command_long_send(self.system_id, 0, command, 0, *params) # type: ignore self.mavlink.command_long_send(self.system_id, 0, command, 0, *params) # type: ignore
ack = self.wait('mavlink.COMMAND_ACK', value=lambda msg: msg.command == command, timeout=0.1) ack = self.wait('mavlink.COMMAND_ACK', value=lambda msg: msg.command == command, timeout=0.1)
if ack.result != mavlink.MAV_RESULT_ACCEPTED: if ack.result != mavlink.MAV_RESULT_ACCEPTED:
raise RuntimeError(f'Command {command} failed with result {ack.result}') name = getattr(mavlink.enums['MAV_CMD'].get(command, {}), 'name', f'UNKNOWN({command})')
result = getattr(mavlink.enums['MAV_RESULT'].get(ack.result, {}), 'name', f'UNKNOWN({ack.result})')
raise RuntimeError(f'Command {name} failed with result {result}')
return return
except TimeoutError: except TimeoutError:
continue continue
tools/test.py
+5 -2
View File
@@ -46,5 +46,8 @@ def test():
flix.set_mode('AUTO') flix.set_mode('AUTO')
flix.wait('mode', 'AUTO') flix.wait('mode', 'AUTO')
raises(RuntimeError, lambda: flix._command_send(mavlink.MAV_CMD_DO_SET_MODE, [0, 99, 0, 0, 0, 0, 0])) # invalid mode print("=== Check command errors")
raises(RuntimeError, lambda: flix._command_send(mavlink.MAV_CMD_DO_PARACHUTE, [0, 0, 0, 0, 0, 0, 0])) # unsupported command with raises(RuntimeError, match='MAV_RESULT_DENIED'):
flix._command_send(mavlink.MAV_CMD_DO_SET_MODE, [0, 99, 0, 0, 0, 0, 0]) # invalid mode
with raises(RuntimeError, match='MAV_RESULT_UNSUPPORTED'):
flix._command_send(mavlink.MAV_CMD_DO_PARACHUTE, [0, 0, 0, 0, 0, 0, 0]) # unsupported command