forked from M-Labs/artiq
parent
9eee0e5a7b
commit
4eee49f889
|
@ -43,7 +43,7 @@ class TB(Module):
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
cnv_old = Signal(reset_less=True)
|
cnv_old = Signal(reset_less=True)
|
||||||
self.sync.async += [
|
self.sync.async_ += [
|
||||||
cnv_old.eq(self.cnv),
|
cnv_old.eq(self.cnv),
|
||||||
If(Cat(cnv_old, self.cnv) == 0b10,
|
If(Cat(cnv_old, self.cnv) == 0b10,
|
||||||
sr.eq(Cat(reversed(self.data[2*i:2*i + 2]))),
|
sr.eq(Cat(reversed(self.data[2*i:2*i + 2]))),
|
||||||
|
@ -62,7 +62,7 @@ class TB(Module):
|
||||||
def _dly(self, sig, n=0):
|
def _dly(self, sig, n=0):
|
||||||
n += self.params.t_rtt*4//2 # t_{sys,adc,ret}/t_async half rtt
|
n += self.params.t_rtt*4//2 # t_{sys,adc,ret}/t_async half rtt
|
||||||
dly = Signal(n, reset_less=True)
|
dly = Signal(n, reset_less=True)
|
||||||
self.sync.async += dly.eq(Cat(sig, dly))
|
self.sync.async_ += dly.eq(Cat(sig, dly))
|
||||||
return dly[-1]
|
return dly[-1]
|
||||||
|
|
||||||
|
|
||||||
|
@ -85,8 +85,8 @@ def main():
|
||||||
assert not (yield dut.done)
|
assert not (yield dut.done)
|
||||||
while not (yield dut.done):
|
while not (yield dut.done):
|
||||||
yield
|
yield
|
||||||
x = (yield from [(yield d) for d in dut.data])
|
for i, d in enumerate(dut.data):
|
||||||
for i, ch in enumerate(x):
|
ch = yield d
|
||||||
assert ch == i, (hex(ch), hex(i))
|
assert ch == i, (hex(ch), hex(i))
|
||||||
|
|
||||||
run_simulation(tb, [run(tb)],
|
run_simulation(tb, [run(tb)],
|
||||||
|
@ -95,7 +95,7 @@ def main():
|
||||||
"sys": (8, 0),
|
"sys": (8, 0),
|
||||||
"adc": (8, 0),
|
"adc": (8, 0),
|
||||||
"ret": (8, 0),
|
"ret": (8, 0),
|
||||||
"async": (2, 0),
|
"async_": (2, 0),
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -44,8 +44,10 @@ class TB(Module):
|
||||||
yield
|
yield
|
||||||
dat = []
|
dat = []
|
||||||
for dds in self.ddss:
|
for dds in self.ddss:
|
||||||
v = yield from [(yield getattr(dds, k))
|
v = []
|
||||||
for k in "cmd ftw pow asf".split()]
|
for k in "cmd ftw pow asf".split():
|
||||||
|
f = yield getattr(dds, k)
|
||||||
|
v.append(f)
|
||||||
dat.append(v)
|
dat.append(v)
|
||||||
data.append((i, dat))
|
data.append((i, dat))
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -91,7 +91,7 @@ def main():
|
||||||
"sys": (8, 0),
|
"sys": (8, 0),
|
||||||
"adc": (8, 0),
|
"adc": (8, 0),
|
||||||
"ret": (8, 0),
|
"ret": (8, 0),
|
||||||
"async": (2, 0),
|
"async_": (2, 0),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue