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

sawg: advance the timeline on Config access 

c.f. #773 #765
This commit is contained in:
Robert Jördens 2017-07-07 11:17:52 +02:00
parent 3222f5036f
commit 3bc0e32dc0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
artiq/coredevice/sawg.py
View File

@ -21,6 +21,13 @@ class Config:
Exposes the configurable quantities of a single SAWG channel. Exposes the configurable quantities of a single SAWG channel.
Access to the configuration registers for a SAWG channel can not
be concurrent. There must be at least :attr:_rtio_interval` machine
units of delay between accesses. Replacement is not supported and will be
lead to an ``RTIOCollision`` as this is likely a programming error.
All methods therefore advance the timeline by the duration of one
configuration register transfer.
:param channel: RTIO channel number of the channel. :param channel: RTIO channel number of the channel.
:param core: Core device. :param core: Core device.
""" """
@ -53,6 +60,7 @@ class Config:
:param n: Current value of the counter. Default: ``0``. :param n: Current value of the counter. Default: ``0``.
""" """
rtio_output(now_mu(), self.channel, _SAWG_DIV, div | (n << 16)) rtio_output(now_mu(), self.channel, _SAWG_DIV, div | (n << 16))
delay_mu(self._rtio_interval)
@kernel @kernel
def set_clr(self, clr0: TInt32, clr1: TInt32, clr2: TInt32): def set_clr(self, clr0: TInt32, clr1: TInt32, clr2: TInt32):
@ -92,6 +100,7 @@ class Config:
""" """
rtio_output(now_mu(), self.channel, _SAWG_CLR, clr0 | rtio_output(now_mu(), self.channel, _SAWG_CLR, clr0 |
(clr1 << 1) | (clr2 << 2)) (clr1 << 1) | (clr2 << 2))
delay_mu(self._rtio_interval)
@kernel @kernel
def set_iq_en(self, i_enable: TInt32, q_enable: TInt32): def set_iq_en(self, i_enable: TInt32, q_enable: TInt32):
@ -118,6 +127,7 @@ class Config:
""" """
rtio_output(now_mu(), self.channel, _SAWG_IQ_EN, i_enable | rtio_output(now_mu(), self.channel, _SAWG_IQ_EN, i_enable |
(q_enable << 1)) (q_enable << 1))
delay_mu(self._rtio_interval)
@kernel @kernel
def set_duc_max_mu(self, limit: TInt32): def set_duc_max_mu(self, limit: TInt32):
@ -132,21 +142,25 @@ class Config:
.. seealso:: :meth:`set_duc_max` .. seealso:: :meth:`set_duc_max`
""" """
rtio_output(now_mu(), self.channel, _SAWG_DUC_MAX, limit) rtio_output(now_mu(), self.channel, _SAWG_DUC_MAX, limit)
delay_mu(self._rtio_interval)
@kernel @kernel
def set_duc_min_mu(self, limit: TInt32): def set_duc_min_mu(self, limit: TInt32):
""".. seealso:: :meth:`set_duc_max_mu`""" """.. seealso:: :meth:`set_duc_max_mu`"""
rtio_output(now_mu(), self.channel, _SAWG_DUC_MIN, limit) rtio_output(now_mu(), self.channel, _SAWG_DUC_MIN, limit)
delay_mu(self._rtio_interval)
@kernel @kernel
def set_out_max_mu(self, limit: TInt32): def set_out_max_mu(self, limit: TInt32):
""".. seealso:: :meth:`set_duc_max_mu`""" """.. seealso:: :meth:`set_duc_max_mu`"""
rtio_output(now_mu(), self.channel, _SAWG_OUT_MAX, limit) rtio_output(now_mu(), self.channel, _SAWG_OUT_MAX, limit)
delay_mu(self._rtio_interval)
@kernel @kernel
def set_out_min_mu(self, limit: TInt32): def set_out_min_mu(self, limit: TInt32):
""".. seealso:: :meth:`set_duc_max_mu`""" """.. seealso:: :meth:`set_duc_max_mu`"""
rtio_output(now_mu(), self.channel, _SAWG_OUT_MIN, limit) rtio_output(now_mu(), self.channel, _SAWG_OUT_MIN, limit)
delay_mu(self._rtio_interval)
@kernel @kernel
def set_duc_max(self, limit: TFloat): def set_duc_max(self, limit: TFloat):
@ -321,19 +335,12 @@ class SAWG:
seven writes to the configuration channel. seven writes to the configuration channel.
""" """
self.config.set_div(0, 0) self.config.set_div(0, 0)
delay_mu(self.config._rtio_interval)
self.config.set_clr(1, 1, 1) self.config.set_clr(1, 1, 1)
delay_mu(self.config._rtio_interval)
self.config.set_iq_en(1, 0) self.config.set_iq_en(1, 0)
delay_mu(self.config._rtio_interval)
self.config.set_duc_min(-1.) self.config.set_duc_min(-1.)
delay_mu(self.config._rtio_interval)
self.config.set_duc_max(1.) self.config.set_duc_max(1.)
delay_mu(self.config._rtio_interval)
self.config.set_out_min(-1.) self.config.set_out_min(-1.)
delay_mu(self.config._rtio_interval)
self.config.set_out_max(1.) self.config.set_out_max(1.)
delay_mu(self.config._rtio_interval)
self.frequency0.set_mu(0) self.frequency0.set_mu(0)
self.frequency1.set_mu(0) self.frequency1.set_mu(0)
self.frequency2.set_mu(0) self.frequency2.set_mu(0)