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

grabber: use new rtio_output() API

This commit is contained in:
Sebastien Bourdeauducq 2018-11-08 19:15:50 +08:00
parent 2549e623c1
commit d18546550e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
artiq/coredevice/grabber.py
View File

@ -40,13 +40,13 @@ class Grabber:
Advances the timeline by 4 coarse RTIO cycles. Advances the timeline by 4 coarse RTIO cycles.
""" """
c = int64(self.core.ref_multiplier) c = int64(self.core.ref_multiplier)
rtio_output(now_mu(), self.channel_base, 4*n+0, x0) rtio_output((self.channel_base << 8) | (4*n+0), x0)
delay_mu(c) delay_mu(c)
rtio_output(now_mu(), self.channel_base, 4*n+1, y0) rtio_output((self.channel_base << 8) | (4*n+1), y0)
delay_mu(c) delay_mu(c)
rtio_output(now_mu(), self.channel_base, 4*n+2, x1) rtio_output((self.channel_base << 8) | (4*n+2), x1)
delay_mu(c) delay_mu(c)
rtio_output(now_mu(), self.channel_base, 4*n+3, y1) rtio_output((self.channel_base << 8) | (4*n+3), y1)
delay_mu(c) delay_mu(c)
@kernel @kernel
@ -67,7 +67,7 @@ class Grabber:
:param mask: bitmask enabling or disabling each ROI engine. :param mask: bitmask enabling or disabling each ROI engine.
""" """
rtio_output(now_mu(), self.channel_base+1, 0, mask) rtio_output((self.channel_base + 1) << 8, mask)
@kernel @kernel
def gate_roi_pulse(self, mask, dt): def gate_roi_pulse(self, mask, dt):