Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 10:46:33 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

sdlog2_dump.py: C strings parsing fixed

Browse Source
This commit is contained in:
Anton Babushkin
2013-10-23 18:57:44 +02:00
parent 3c6f438691
commit bb8a2c3631
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/sdlog2_dump.py
+12 -13
View File
@@ -25,8 +25,12 @@ import struct, sys
if sys.hexversion >= 0x030000F0: if sys.hexversion >= 0x030000F0:
runningPython3 = True runningPython3 = True
def _parseCString(cstr):
return str(cstr, 'ascii').split('\0')[0]
else: else:
runningPython3 = False runningPython3 = False
def _parseCString(cstr):
return str(cstr).split('\0')[0]
class SDLog2Parser: class SDLog2Parser:
BLOCK_SIZE = 8192 BLOCK_SIZE = 8192
@@ -175,9 +179,9 @@ class SDLog2Parser:
self.__csv_columns.append(full_label) self.__csv_columns.append(full_label)
self.__csv_data[full_label] = None self.__csv_data[full_label] = None
if self.__file != None: if self.__file != None:
print(self.__csv_delim.join(self.__csv_columns), file=self.__file) print(self.__csv_delim.join(self.__csv_columns), file=self.__file)
else: else:
print(self.__csv_delim.join(self.__csv_columns)) print(self.__csv_delim.join(self.__csv_columns))
def __printCSVRow(self): def __printCSVRow(self):
s = [] s = []
@@ -190,9 +194,9 @@ class SDLog2Parser:
s.append(v) s.append(v)
if self.__file != None: if self.__file != None:
print(self.__csv_delim.join(s), file=self.__file) print(self.__csv_delim.join(s), file=self.__file)
else: else:
print(self.__csv_delim.join(s)) print(self.__csv_delim.join(s))
def __parseMsgDescr(self): def __parseMsgDescr(self):
if runningPython3: if runningPython3:
@@ -202,14 +206,9 @@ class SDLog2Parser:
msg_type = data[0] msg_type = data[0]
if msg_type != self.MSG_TYPE_FORMAT: if msg_type != self.MSG_TYPE_FORMAT:
msg_length = data[1] msg_length = data[1]
if runningPython3: msg_name = _parseCString(data[2])
msg_name = str(data[2], 'ascii').strip("\0") msg_format = _parseCString(data[3])
msg_format = str(data[3], 'ascii').strip("\0") msg_labels = _parseCString(data[4]).split(",")
msg_labels = str(data[4], 'ascii').strip("\0").split(",")
else:
msg_name = str(data[2]).strip("\0")
msg_format = str(data[3]).strip("\0")
msg_labels = str(data[4]).strip("\0").split(",")
# Convert msg_format to struct.unpack format string # Convert msg_format to struct.unpack format string
msg_struct = "" msg_struct = ""
msg_mults = [] msg_mults = []
@@ -243,7 +242,7 @@ class SDLog2Parser:
data = list(struct.unpack(msg_struct, str(self.__buffer[self.__ptr+self.MSG_HEADER_LEN:self.__ptr+msg_length]))) data = list(struct.unpack(msg_struct, str(self.__buffer[self.__ptr+self.MSG_HEADER_LEN:self.__ptr+msg_length])))
for i in range(len(data)): for i in range(len(data)):
if type(data[i]) is str: if type(data[i]) is str:
data[i] = data[i].strip("\0") data[i] = _parseCString(data[i])
m = msg_mults[i] m = msg_mults[i]
if m != None: if m != None:
data[i] = data[i] * m data[i] = data[i] * m