M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

sawg: adapt latency to fir changes 

closes #748
This commit is contained in:
Robert Jördens 2017-06-28 20:12:25 +02:00
parent e7db2c6578
commit f2632e0fd1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
artiq/gateware/dsp/sawg.py
View File

@ -80,6 +80,8 @@ class SplineParallelDDS(SplineParallelDUC):
[eqh(x, a.o.a0) for x in self.xi], [eqh(x, a.o.a0) for x in self.xi],
[y.eq(0) for y in self.yi], [y.eq(0) for y in self.yi],
] ]
del self.xi
del self.yi
class Config(Module): class Config(Module):
@ -157,10 +159,10 @@ class Channel(Module, SatAddMixin):
self.parallelism = parallelism self.parallelism = parallelism
self.cordic_gain = a2.gain*b.gain self.cordic_gain = a2.gain*b.gain
self.u.latency += 1 self.u.latency += 1 # self.o
b.p.latency += 2 b.p.latency += 1 # self.o
b.f.latency += 2 b.f.latency += 1 # self.o
a_latency_delta = hbf[0].latency + b.latency + 2 a_latency_delta = hbf[0].latency + b.latency + 2 # hbf.i, self.o
for a in a1, a2: for a in a1, a2:
a.a.latency += a_latency_delta a.a.latency += a_latency_delta
a.p.latency += a_latency_delta a.p.latency += a_latency_delta