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

sayma: add SAWG and JESD to DRTIO master

This commit is contained in:
Sebastien Bourdeauducq 2018-06-22 00:04:22 +08:00
parent c1db02a351
commit 83428961ad
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/examples/sayma_drtio/repository/sines_drtio.py
View File

@ -5,7 +5,7 @@ class SAWGTestDRTIO(EnvExperiment):
def build(self): def build(self):
self.setattr_device("core") self.setattr_device("core")
self.setattr_device("ttl_sma_out") self.setattr_device("ttl_sma_out")
self.sawgs = [self.get_device("sawg"+str(8+i)) for i in range(8)] self.sawgs = [self.get_device("sawg"+str(i)) for i in range(16)]
@kernel @kernel
def run(self): def run(self):

21
artiq/gateware/targets/sayma_amc.py
View File

@ -230,9 +230,6 @@ class Master(MiniSoC, AMPSoC, RTMCommon):
RTMCommon.__init__(self) RTMCommon.__init__(self)
self.config["HMC830_REF"] = "150" self.config["HMC830_REF"] = "150"
if with_sawg:
warnings.warn("SAWG is not implemented yet, ignoring.")
platform = self.platform platform = self.platform
rtio_clk_freq = 150e6 rtio_clk_freq = 150e6
@ -299,10 +296,22 @@ class Master(MiniSoC, AMPSoC, RTMCommon):
rtio_channels.append(rtio.Channel.from_phy(phy)) rtio_channels.append(rtio.Channel.from_phy(phy))
self.submodules.ad9154_crg = jesd204_tools.UltrascaleCRG(platform) self.submodules.ad9154_crg = jesd204_tools.UltrascaleCRG(platform)
if with_sawg:
cls = AD9154
else:
cls = AD9154NoSAWG
self.submodules.ad9154_0 = cls(platform, self.crg, self.ad9154_crg, 0)
self.submodules.ad9154_1 = cls(platform, self.crg, self.ad9154_crg, 1)
self.csr_devices.append("ad9154_crg") self.csr_devices.append("ad9154_crg")
platform.add_false_path_constraints( self.csr_devices.append("ad9154_0")
self.crg.cd_sys.clk, self.csr_devices.append("ad9154_1")
self.ad9154_crg.cd_jesd.clk) self.config["HAS_AD9154"] = None
self.add_csr_group("ad9154", ["ad9154_0", "ad9154_1"])
self.config["RTIO_FIRST_SAWG_CHANNEL"] = len(rtio_channels)
rtio_channels.extend(rtio.Channel.from_phy(phy)
for sawg in self.ad9154_0.sawgs +
self.ad9154_1.sawgs
for phy in sawg.phys)
self.submodules.rtio_moninj = rtio.MonInj(rtio_channels) self.submodules.rtio_moninj = rtio.MonInj(rtio_channels)
self.csr_devices.append("rtio_moninj") self.csr_devices.append("rtio_moninj")