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

urukul: add sync_in to eem0-7 name 

Signed-off-by: Robert Jördens <rj@quartiq.de>
This commit is contained in:
Robert Jördens 2018-10-26 08:02:28 +00:00
parent 0433e8f4fe
commit 3538444876
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/gateware/eem.py
View File

@ -75,7 +75,7 @@ class Urukul(_EEM):
), ),
] ]
ttls = [(6, eem, "io_update"), ttls = [(6, eem, "io_update"),
(7, eem, "dds_reset")] (7, eem, "dds_reset_sync_in")]
if eem_aux is not None: if eem_aux is not None:
ttls += [(0, eem_aux, "sync_clk"), ttls += [(0, eem_aux, "sync_clk"),
(1, eem_aux, "sync_in"), (1, eem_aux, "sync_in"),
@ -113,7 +113,7 @@ class Urukul(_EEM):
), ),
] ]
ttls = [(6, eem0, "io_update"), ttls = [(6, eem0, "io_update"),
(7, eem0, "dds_reset"), (7, eem0, "dds_reset_sync_in"),
(4, eem1, "sw0"), (4, eem1, "sw0"),
(5, eem1, "sw1"), (5, eem1, "sw1"),
(6, eem1, "sw2"), (6, eem1, "sw2"),
@ -157,7 +157,7 @@ class Urukul(_EEM):
target.submodules += phy target.submodules += phy
target.rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=4)) target.rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=4))
pads = target.platform.request("urukul{}_dds_reset".format(eem)) pads = target.platform.request("urukul{}_dds_reset_sync_in".format(eem))
pad = Signal(reset=0) pad = Signal(reset=0)
target.specials += DifferentialOutput(pad, pads.p, pads.n) target.specials += DifferentialOutput(pad, pads.p, pads.n)
if sync_gen_cls is not None: # AD9910 variant and SYNC_IN from EEM if sync_gen_cls is not None: # AD9910 variant and SYNC_IN from EEM
@ -527,7 +527,7 @@ class SUServo(_EEM):
target.submodules += phy target.submodules += phy
target.rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=4)) target.rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=4))
pads = target.platform.request("{}_dds_reset".format(eem_urukul0)) pads = target.platform.request("{}_dds_reset_sync_in".format(eem_urukul0))
target.specials += DifferentialOutput(0, pads.p, pads.n) target.specials += DifferentialOutput(0, pads.p, pads.n)
for i, signal in enumerate("sw0 sw1 sw2 sw3".split()): for i, signal in enumerate("sw0 sw1 sw2 sw3".split()):