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

eem: add Zotino monitoring. Closes #1095

This commit is contained in:
Sebastien Bourdeauducq 2018-07-15 15:35:04 +08:00
parent 8bcba82b65
commit b6c70b3cb0
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
artiq/gateware/eem.py
View File

@ -3,7 +3,7 @@ from migen.build.generic_platform import *
from migen.genlib.io import DifferentialOutput from migen.genlib.io import DifferentialOutput
from artiq.gateware import rtio from artiq.gateware import rtio
from artiq.gateware.rtio.phy import spi2, grabber from artiq.gateware.rtio.phy import spi2, ad53xx_monitor, grabber
from artiq.gateware.suservo import servo, pads as servo_pads from artiq.gateware.suservo import servo, pads as servo_pads
from artiq.gateware.rtio.phy import servo as rtservo from artiq.gateware.rtio.phy import servo as rtservo
@ -339,16 +339,24 @@ class Zotino(_EEM):
def add_std(cls, target, eem, ttl_out_cls): def add_std(cls, target, eem, ttl_out_cls):
cls.add_extension(target, eem) cls.add_extension(target, eem)
phy = spi2.SPIMaster(target.platform.request("zotino{}_spi_p".format(eem)), spi_phy = spi2.SPIMaster(target.platform.request("zotino{}_spi_p".format(eem)),
target.platform.request("zotino{}_spi_n".format(eem))) target.platform.request("zotino{}_spi_n".format(eem)))
target.submodules += phy target.submodules += spi_phy
target.rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=4)) target.rtio_channels.append(rtio.Channel.from_phy(spi_phy, ififo_depth=4))
for signal in "ldac_n clr_n".split(): pads = target.platform.request("zotino{}_ldac_n".format(eem))
pads = target.platform.request("zotino{}_{}".format(eem, signal)) ldac_phy = ttl_out_cls(pads.p, pads.n)
phy = ttl_out_cls(pads.p, pads.n) target.submodules += ldac_phy
target.submodules += phy target.rtio_channels.append(rtio.Channel.from_phy(ldac_phy))
target.rtio_channels.append(rtio.Channel.from_phy(phy))
pads = target.platform.request("zotino{}_clr_n".format(eem))
clr_phy = ttl_out_cls(pads.p, pads.n)
target.submodules += clr_phy
target.rtio_channels.append(rtio.Channel.from_phy(clr_phy))
dac_monitor = ad53xx_monitor.AD53XXMonitor(spi_phy.rtlink, ldac_phy.rtlink)
target.submodules += dac_monitor
spi_phy.probes.extend(dac_monitor.probes)
class Grabber(_EEM): class Grabber(_EEM):