Hardware
/
litescope
mirror of https://github.com/enjoy-digital/litescope.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

software/dump/sigrok: Support width > 1.

This commit is contained in:
Vegard Storheil Eriksen 2020-02-26 17:58:41 +01:00
parent daf10e9473
commit e07bdbfb29
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
litescope/software/dump/sigrok.py
View File

@ -23,7 +23,7 @@ class SigrokDump(Dump):
f.close() f.close()
def write_metadata(self, name): def write_metadata(self, name):
probe_bits = math.ceil(len(self.variables)/8)*8 probe_bits = math.ceil(sum(variable.width for variable in self.variables)/8)*8
f = open("metadata", "w") f = open("metadata", "w")
r = """ r = """
[global] [global]
@ -38,13 +38,20 @@ unitsize={}
self.samplerate//1e6*2, self.samplerate//1e6*2,
probe_bits//8 probe_bits//8
) )
for i, variable in enumerate(self.variables): i = 1
r += "probe{}={}\n".format(i + 1, variable.name) for variable in self.variables:
if variable.width > 1:
for j in range(variable.width):
r += "probe{}={}[{}]\n".format(i, variable.name, j)
i += 1
else:
r += "probe{}={}\n".format(i, variable.name)
i += 1
f.write(r) f.write(r)
f.close() f.close()
def write_data(self): def write_data(self):
data_bits = math.ceil(len(self.variables)/8)*8 data_bits = math.ceil(sum(variable.width for variable in self.variables)/8)*8
data_len = 0 data_len = 0
for variable in self.variables: for variable in self.variables:
data_len = max(data_len, len(variable)) data_len = max(data_len, len(variable))
@ -52,9 +59,9 @@ unitsize={}
for i in range(data_len): for i in range(data_len):
data = 0 data = 0
for j, variable in enumerate(reversed(self.variables)): for j, variable in enumerate(reversed(self.variables)):
data = data << 1 data = data << variable.width
try: try:
data |= variable.values[i] & 0x1 # 1 bit probes data |= variable.values[i]
except: except:
pass pass
datas.append(data) datas.append(data)