diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-05-27 18:04:19 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-05-27 18:04:19 +0400 |
| commit | 8dbda512897b3d2a05d39ebc26aba35b86ce044d (patch) | |
| tree | 8c3c81bc4de1a9f53fe6a26a7c51cb1ebfde4ea0 /Tools | |
| parent | 84aa52c81a248f70171546ee7af317faa067f0ac (diff) | |
| download | px4-firmware-8dbda512897b3d2a05d39ebc26aba35b86ce044d.tar.gz px4-firmware-8dbda512897b3d2a05d39ebc26aba35b86ce044d.tar.bz2 px4-firmware-8dbda512897b3d2a05d39ebc26aba35b86ce044d.zip | |
Cleanup
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/sdlog2_dump.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Tools/sdlog2_dump.py b/Tools/sdlog2_dump.py index 70e7403bc..fa02a3723 100644 --- a/Tools/sdlog2_dump.py +++ b/Tools/sdlog2_dump.py @@ -19,9 +19,6 @@ __version__ = "1.1" import struct, sys -class BufferUnderflow(Exception): - pass - class SDLog2Parser: BLOCK_SIZE = 8192 MSG_HEADER_LEN = 3 @@ -102,6 +99,8 @@ class SDLog2Parser: msg_type = ord(self.__buffer[self.__ptr+2]) if msg_type == self.MSG_TYPE_FORMAT: # parse FORMAT message + if self.__bytesLeft() < self.MSG_FORMAT_PACKET_LEN: + break self.__parseMsgDescr() else: # parse data message @@ -143,8 +142,6 @@ class SDLog2Parser: print self.__csv_delim.join(self.__csv_columns) def __parseMsgDescr(self): - if self.__bytesLeft() < self.MSG_FORMAT_PACKET_LEN: - raise BufferUnderflow("Data is too short: %i bytes, need %i" % (self.__bytesLeft(), self.MSG_FORMAT_PACKET_LEN)) data = struct.unpack(self.MSG_FORMAT_STRUCT, self.__buffer[self.__ptr + 3 : self.__ptr + self.MSG_FORMAT_PACKET_LEN]) msg_type = data[0] if msg_type != self.MSG_TYPE_FORMAT: |