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

sawg: style

This commit is contained in:
Robert Jördens 2016-11-29 20:51:29 +01:00
parent 4f813c4977
commit d8b5eac856
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/coredevice/sawg.py
View File

@ -89,10 +89,10 @@ class Spline:
coeff64[i] = ci coeff64[i] = ci
# artiq.wavesynth.coefficients.discrete_compensate: # artiq.wavesynth.coefficients.discrete_compensate:
if i == 2: if i == 2:
coeff64[1] += ci >> (self.time_width + 1) coeff64[1] += ci >> self.time_width + 1
elif i == 3: elif i == 3:
coeff64[2] += ci >> self.time_width coeff64[2] += ci >> self.time_width
coeff64[1] += (ci // 3) >> (2*self.time_width + 1) coeff64[1] += ci // 6 >> 2*self.time_width
@kernel @kernel
def set_coeff(self, value): def set_coeff(self, value):

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

@ -88,8 +88,7 @@ class SplineParallelDDS(SplineParallelDUC):
a = Spline(order=orders.a, width=widths.a) a = Spline(order=orders.a, width=widths.a)
self.a = a.tri(widths.t) self.a = a.tri(widths.t)
self.submodules += a self.submodules += a
super().__init__(widths._replace(a=len(self.a.a0)), super().__init__(widths._replace(a=len(self.a.a0)), orders, **kwargs)
orders, **kwargs)
### ###