srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

test/sawg: adapt to new latency spec

This commit is contained in:
Robert Jördens 2016-12-14 19:43:30 +01:00
parent 115ea67860
commit 15b48be6e4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/test/gateware/test_sawg_fe.py
View File

@ -91,9 +91,7 @@ class SAWGTest(unittest.TestCase):
# print("{}: set ch {} to {}".format(time, channel, hex(data))) # print("{}: set ch {} to {}".format(time, channel, hex(data)))
def log(dut, data, n): def log(dut, data, n):
for i in range(dut.latency): for i in range(n + dut.latency):
yield
for i in range(n):
yield yield
data.append((yield from [(yield _) for _ in dut.o])) data.append((yield from [(yield _) for _ in dut.o]))
@ -138,6 +136,7 @@ class SAWGTest(unittest.TestCase):
d.offset.set_coeff([0]) d.offset.set_coeff([0])
delay(1*self.t) delay(1*self.t)
out = self.run_channel(self.rtio_manager.outputs) out = self.run_channel(self.rtio_manager.outputs)
out = out[self.channel.latency + self.channel.u.latency:][:11]
for i in range(len(out) - 1): for i in range(len(out) - 1):
with self.subTest(i): with self.subTest(i):
v = 100 + i*10 v = 100 + i*10
@ -164,6 +163,7 @@ class SAWGTest(unittest.TestCase):
ch.set(.2) ch.set(.2)
delay(1*self.t) delay(1*self.t)
out = self.run_channel(self.rtio_manager.outputs) out = self.run_channel(self.rtio_manager.outputs)
out = out[self.channel.latency + self.channel.u.latency:][:14]
a = int(round(.1*ch.scale)) a = int(round(.1*ch.scale))
da = int(round(.1*ch.scale*(1 << ch.width)//13)) da = int(round(.1*ch.scale*(1 << ch.width)//13))
for i in range(len(out) - 1): for i in range(len(out) - 1):