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

sawg: work around bool->int

This commit is contained in:
Robert Jördens 2017-05-22 18:50:58 +02:00
parent 1562f79101
commit 06721c19c4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/coredevice/sawg.py
View File

@ -1,4 +1,4 @@
from artiq.language.types import TInt32, TBool from artiq.language.types import TInt32
from artiq.language.core import kernel, now_mu from artiq.language.core import kernel, now_mu
from artiq.coredevice.spline import Spline from artiq.coredevice.spline import Spline
from artiq.coredevice.rtio import rtio_output from artiq.coredevice.rtio import rtio_output
@ -46,7 +46,7 @@ class Config:
rtio_output(now_mu(), self.channel, _SAWG_DIV, div | (n << 16)) rtio_output(now_mu(), self.channel, _SAWG_DIV, div | (n << 16))
@kernel @kernel
def set_clr(self, clr0: TBool, clr1: TBool, clr2: TBool): def set_clr(self, clr0: TInt32, clr1: TInt32, clr2: TInt32):
"""Set the phase clear mode for the three phase accumulators. """Set the phase clear mode for the three phase accumulators.
When the ``clr`` bit for a given phase accumulator is When the ``clr`` bit for a given phase accumulator is
@ -65,11 +65,11 @@ class Config:
:param clr2: Auto-clear phase accumulator of the ``phase2``/ :param clr2: Auto-clear phase accumulator of the ``phase2``/
``frequency2`` DDS. Default: ``True`` ``frequency2`` DDS. Default: ``True``
""" """
rtio_output(now_mu(), self.channel, _SAWG_CLR, int(clr1) | rtio_output(now_mu(), self.channel, _SAWG_CLR, clr1 |
(int(clr2) << 1) | (int(clr0) << 2)) (clr2 << 1) | (clr0 << 2))
@kernel @kernel
def set_iq_en(self, i_enable: TBool, q_enable: TBool): def set_iq_en(self, i_enable: TInt32, q_enable: TInt32):
"""Enable I/Q data on this DAC channel. """Enable I/Q data on this DAC channel.
Every pair of SAWG channels forms a buddy pair. Every pair of SAWG channels forms a buddy pair.
@ -86,8 +86,8 @@ class Config:
DUC-DDS data of this SAWG's *buddy* channel to *this* DAC DUC-DDS data of this SAWG's *buddy* channel to *this* DAC
channel. Default: ``0``. channel. Default: ``0``.
""" """
rtio_output(now_mu(), self.channel, _SAWG_IQ_EN, int(i_enable) | rtio_output(now_mu(), self.channel, _SAWG_IQ_EN, i_enable |
(int(q_enable) << 1)) (q_enable << 1))
@kernel @kernel
def set_duc_i_max(self, limit: TInt32): def set_duc_i_max(self, limit: TInt32):

2
artiq/examples/phaser/repository/demo_2tone.py
View File

@ -17,7 +17,7 @@ class SAWGTestTwoTone(EnvExperiment):
self.core.reset() self.core.reset()
self.ttl_sma.output() self.ttl_sma.output()
self.sawg0.config.set_clr(True, True, True) self.sawg0.config.set_clr(1, 1, 1)
delay(10*us) delay(10*us)
self.sawg0.config.set_duc_i_max(0x7fff) self.sawg0.config.set_duc_i_max(0x7fff)
delay(10*us) delay(10*us)