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

Tools: LogAnalyzer: remove vehicle-type-is-first-MSG-assumption

Browse Source
This commit is contained in:
Peter Barker 2017-07-22 09:15:59 +10:00
parent 44d1c77b0c
commit cb56cf38d0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/LogAnalyzer/DataflashLog.py
View File

@ -571,7 +571,10 @@ class DataflashLog(object):
elif e.NAME == "MSG": elif e.NAME == "MSG":
if not self.vehicleType: if not self.vehicleType:
tokens = e.Message.split(' ') tokens = e.Message.split(' ')
self.set_vehicleType_from_MSG_vehicle(tokens[0]); try:
self.set_vehicleType_from_MSG_vehicle(tokens[0]);
except ValueError:
pass
self.backPatchModeChanges() self.backPatchModeChanges()
self.firmwareVersion = tokens[1] self.firmwareVersion = tokens[1]
if len(tokens) == 3: if len(tokens) == 3:
@ -629,7 +632,10 @@ class DataflashLog(object):
elif tokens2[0] in knownHardwareTypes: elif tokens2[0] in knownHardwareTypes:
self.hardwareType = line # not sure if we can parse this more usefully, for now only need to report it back verbatim self.hardwareType = line # not sure if we can parse this more usefully, for now only need to report it back verbatim
elif (len(tokens2) == 2 or len(tokens2) == 3) and tokens2[1][0].lower() == "v": # e.g. ArduCopter V3.1 (5c6503e2) elif (len(tokens2) == 2 or len(tokens2) == 3) and tokens2[1][0].lower() == "v": # e.g. ArduCopter V3.1 (5c6503e2)
self.set_vehicleType_from_MSG_vehicle(tokens2[0]) try:
self.set_vehicleType_from_MSG_vehicle(tokens2[0])
except ValueError:
pass
self.firmwareVersion = tokens2[1] self.firmwareVersion = tokens2[1]
if len(tokens2) == 3: if len(tokens2) == 3:
self.firmwareHash = tokens2[2][1:-1] self.firmwareHash = tokens2[2][1:-1]