From 46d680b3ce1bf89cf3e4e3cfe475ad84bf851a89 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 14 Mar 2022 14:25:00 +1100 Subject: [PATCH] DFReader: provide __MAV__ message for log metadata Logs now have messages called "MAV" in them, so you end up with a keyerror if you look for MAV.percent in a condition. Provide a very unlikely key for the log metadata --- DFReader.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/DFReader.py b/DFReader.py index f40e2949c..b6a512d4b 100644 --- a/DFReader.py +++ b/DFReader.py @@ -483,7 +483,11 @@ def __init__(self): self.verbose = False self.params = {} self._flightmodes = None - self.messages = {} + self.messages = { + 'MAV': self, + '__MAV__': self, # avoids conflicts with messages actually called "MAV" + } + self.percent = 0 def _rewind(self): '''reset state on rewind''' @@ -492,7 +496,10 @@ def _rewind(self): # need their messages to disappear to. If they want their own # copy they can copy.copy it! self.messages.clear() - self.messages['MAV'] = self + self.messages = { + 'MAV': self, + '__MAV__': self, # avoids conflicts with messages actually called "MAV" + } if self._flightmodes is not None and len(self._flightmodes) > 0: self.flightmode = self._flightmodes[0][0] else: