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

sawg: int32 artiq python

This commit is contained in:
Robert Jördens 2016-11-29 17:33:43 +01:00
parent 4a03e3fce0
commit d9dd79fb1a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
artiq/coredevice/sawg.py
View File

@ -18,16 +18,15 @@ class Spline:
@portable(flags={"fast-math"}) @portable(flags={"fast-math"})
def to_mu(self, value: TFloat) -> TInt32: def to_mu(self, value: TFloat) -> TInt32:
return int(round(value*self.scale)) return int32(round(value*self.scale))
@portable(flags={"fast-math"}) @portable(flags={"fast-math"})
def from_mu(self, value: TInt32) -> TFloat: def from_mu(self, value: TInt32) -> TFloat:
return value/self.scale return value/self.scale
@portable(flags={"fast-math"}) @portable(flags={"fast-math"})
def to_mu64(self, value: TFloat) -> TList(TInt32): def to_mu64(self, value: TFloat) -> TInt64:
v = int64(round(value*self.scale)) return int64(round(value*self.scale))
return [int32(v), int32((v >> 32) & 0xffffffff)]
@kernel @kernel
def set_mu(self, value: TInt32): def set_mu(self, value: TInt32):
@ -51,7 +50,9 @@ class Spline:
:param value: Spline value relative to full-scale. :param value: Spline value relative to full-scale.
""" """
rtio_output_wide(now_mu(), self.channel, 0, self.to_mu64(value)) v = self.to_mu64(value)
l = [int32(v), int32(v >> 32)]
rtio_output_wide(now_mu(), self.channel, 0, l)
@kernel @kernel
def set_coeff_mu(self, value): def set_coeff_mu(self, value):
@ -84,7 +85,7 @@ class Spline:
vi = coeff[i] * self.scale vi = coeff[i] * self.scale
for j in range(i): for j in range(i):
vi *= self.time_scale vi *= self.time_scale
ci = int(round(vi)) ci = int64(round(vi))
coeff64[i] = ci coeff64[i] = ci
# artiq.wavesynth.coefficients.discrete_compensate: # artiq.wavesynth.coefficients.discrete_compensate:
if i == 2: if i == 2: