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

urukul: support dds_reset and sync options

This commit is contained in:
Sebastien Bourdeauducq 2022-03-27 18:02:36 +08:00
parent 9d26f887ee
commit 1a3607564b
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
artiq/coredevice/urukul.py
View File

@ -1,11 +1,11 @@
from numpy import int32, int64 from numpy import int32, int64
from artiq.language.core import nac3, Kernel, KernelInvariant, kernel, portable from artiq.language.core import *
from artiq.language.units import us, ms from artiq.language.units import us, ms
from artiq.coredevice.core import Core from artiq.coredevice.core import Core
from artiq.coredevice.spi2 import * from artiq.coredevice.spi2 import *
from artiq.coredevice.ttl import TTLOut from artiq.coredevice.ttl import TTLOut, TTLClockGen
SPI_CONFIG = (0 * SPI_OFFLINE | 0 * SPI_END | SPI_CONFIG = (0 * SPI_OFFLINE | 0 * SPI_END |
@ -104,15 +104,6 @@ def urukul_sta_proto_rev(sta: int32) -> int32:
"""Return the PROTO_REV value from Urukul status register value.""" """Return the PROTO_REV value from Urukul status register value."""
return (sta >> STA_PROTO_REV) & 0x7f return (sta >> STA_PROTO_REV) & 0x7f
@nac3
class _DummySync:
def __init__(self, cpld):
self.cpld = cpld
@kernel
def set_mu(self, ftw: int32):
pass
@nac3 @nac3
class CPLD: class CPLD:
@ -159,7 +150,8 @@ class CPLD:
bus: KernelInvariant[SPIMaster] bus: KernelInvariant[SPIMaster]
io_update: KernelInvariant[TTLOut] io_update: KernelInvariant[TTLOut]
clk_div: KernelInvariant[int32] clk_div: KernelInvariant[int32]
sync: KernelInvariant[_DummySync] dds_reset: KernelInvariant[Option[TTLOut]]
sync: KernelInvariant[Option[TTLClockGen]]
cfg_reg: Kernel[int32] cfg_reg: Kernel[int32]
att_reg: Kernel[int32] att_reg: Kernel[int32]
sync_div: Kernel[int32] sync_div: Kernel[int32]
@ -183,15 +175,15 @@ class CPLD:
# NAC3TODO # NAC3TODO
raise NotImplementedError raise NotImplementedError
if dds_reset_device is not None: if dds_reset_device is not None:
self.dds_reset = dmgr.get(dds_reset_device) self.dds_reset = Some(dmgr.get(dds_reset_device))
else:
self.dds_reset = none
if sync_device is not None: if sync_device is not None:
self.sync = dmgr.get(sync_device) self.sync = Some(dmgr.get(sync_device))
if sync_div is None: if sync_div is None:
sync_div = 2 sync_div = 2
# NAC3TODO
raise NotImplementedError
else: else:
self.sync = _DummySync(self) self.sync = none
assert sync_div is None assert sync_div is None
sync_div = 0 sync_div = 0
@ -420,7 +412,8 @@ class CPLD:
ftw_max = 1 << 4 ftw_max = 1 << 4
ftw = ftw_max // div ftw = ftw_max // div
# NAC3TODO assert ftw * div == ftw_max # NAC3TODO assert ftw * div == ftw_max
self.sync.set_mu(ftw) if self.sync.is_some():
self.sync.unwrap().set_mu(ftw)
@kernel @kernel
def set_profile(self, profile: int32): def set_profile(self, profile: int32):