Skip to content

DFReader: recognise VER.BU for build type #865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tridge merged 1 commit into from
Oct 16, 2023
Merged

DFReader: recognise VER.BU for build type #865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions DFReader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,18 @@ def _add_msg(self, m):
self.mav_type = mavutil.mavlink.MAV_TYPE_SUBMARINE
elif m.Message.find("Blimp") != -1:
self.mav_type = mavutil.mavlink.MAV_TYPE_AIRSHIP
if type == 'VER' and hasattr(m,'BU'):
build_types = { 1: mavutil.mavlink.MAV_TYPE_GROUND_ROVER,
2: mavutil.mavlink.MAV_TYPE_QUADROTOR,
3: mavutil.mavlink.MAV_TYPE_FIXED_WING,
4: mavutil.mavlink.MAV_TYPE_ANTENNA_TRACKER,
7: mavutil.mavlink.MAV_TYPE_SUBMARINE,
13: mavutil.mavlink.MAV_TYPE_HELICOPTER,
12: mavutil.mavlink.MAV_TYPE_AIRSHIP,
}
mavtype = build_types.get(m.BU,None)
if mavtype is not None:
self.mav_type = mavtype
if type == 'MODE':
if hasattr(m,'Mode') and isinstance(m.Mode, str):
self.flightmode = m.Mode.upper()
Expand Down Expand Up @@ -901,7 +913,7 @@ def skip_to_type(self, type):
if self.type_nums is None:
# always add some key msg types so we can track flightmode, params etc
type = type.copy()
type.update(set(['MODE','MSG','PARM','STAT','ORGN']))
type.update(set(['MODE','MSG','PARM','STAT','ORGN','VER']))
self.indexes = []
self.type_nums = []
for t in type:
Expand Down Expand Up @@ -1171,7 +1183,7 @@ def skip_to_type(self, type):
if self.type_list is None:
# always add some key msg types so we can track flightmode, params etc
self.type_list = type.copy()
self.type_list.update(set(['MODE','MSG','PARM','STAT','ORGN']))
self.type_list.update(set(['MODE','MSG','PARM','STAT','ORGN','VER']))
self.type_list = list(self.type_list)
self.indexes = []
self.type_nums = []
Expand Down