srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

kasli: integrate grabber

This commit is contained in:
Sebastien Bourdeauducq 2018-05-28 22:43:40 +08:00
parent 563e434e15
commit ad099edf63
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/examples/kasli_basic/device_db_mitll.py
View File

@ -144,12 +144,12 @@ device_db.update(
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 20} "arguments": {"channel": 22}
}, },
led1={ led1={
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 21} "arguments": {"channel": 23}
}, },
) )

4
artiq/examples/kasli_basic/device_db_ustc.py
View File

@ -178,12 +178,12 @@ device_db.update(
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 36} "arguments": {"channel": 38}
}, },
led1={ led1={
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 37} "arguments": {"channel": 39}
} }
) )

13
artiq/gateware/targets/kasli.py
View File

@ -339,12 +339,13 @@ class MITLL(_StandaloneBase):
self.comb += self.platform.request("clk_sel").eq(1) self.comb += self.platform.request("clk_sel").eq(1)
self.rtio_channels = [] self.rtio_channels = []
# TODO: grabber on eem0->eemB eem1->eemA self.grabber_csr_group = []
eem.DIO.add_std(self, 4, eem.DIO.add_std(self, 4,
ttl_serdes_7series.InOut_8X, ttl_serdes_7series.InOut_8X) ttl_serdes_7series.InOut_8X, ttl_serdes_7series.InOut_8X)
eem.Urukul.add_std(self, 3, 2, ttl_serdes_7series.Output_8X) eem.Urukul.add_std(self, 3, 2, ttl_serdes_7series.Output_8X)
eem.Zotino.add_std(self, 5, ttl_serdes_7series.Output_8X) eem.Zotino.add_std(self, 5, ttl_serdes_7series.Output_8X)
eem.Zotino.add_std(self, 6, ttl_serdes_7series.Output_8X) eem.Zotino.add_std(self, 6, ttl_serdes_7series.Output_8X)
eem.Grabber.add_std(self, 1, 0)
for i in (1, 2): for i in (1, 2):
sfp_ctl = self.platform.request("sfp_ctl", i) sfp_ctl = self.platform.request("sfp_ctl", i)
@ -357,6 +358,8 @@ class MITLL(_StandaloneBase):
self.rtio_channels.append(rtio.LogChannel()) self.rtio_channels.append(rtio.LogChannel())
self.add_rtio(self.rtio_channels) self.add_rtio(self.rtio_channels)
self.config["HAS_GRABBER"] = None
self.add_csr_group("grabber", self.grabber_csr_group)
class USTC(_StandaloneBase): class USTC(_StandaloneBase):
@ -372,7 +375,7 @@ class USTC(_StandaloneBase):
self.comb += self.platform.request("clk_sel").eq(1) self.comb += self.platform.request("clk_sel").eq(1)
self.rtio_channels = [] self.rtio_channels = []
# TODO: grabber on eem0->eemA self.grabber_csr_group = []
eem.DIO.add_std(self, 5, eem.DIO.add_std(self, 5,
ttl_serdes_7series.InOut_8X, ttl_serdes_7series.Output_8X) ttl_serdes_7series.InOut_8X, ttl_serdes_7series.Output_8X)
eem.DIO.add_std(self, 6, eem.DIO.add_std(self, 6,
@ -381,6 +384,7 @@ class USTC(_StandaloneBase):
ttl_serdes_7series.Output_8X, ttl_serdes_7series.Output_8X) ttl_serdes_7series.Output_8X, ttl_serdes_7series.Output_8X)
eem.Urukul.add_std(self, 2, 1, ttl_serdes_7series.Output_8X) eem.Urukul.add_std(self, 2, 1, ttl_serdes_7series.Output_8X)
eem.Urukul.add_std(self, 4, 3, ttl_serdes_7series.Output_8X) eem.Urukul.add_std(self, 4, 3, ttl_serdes_7series.Output_8X)
eem.Grabber.add_std(self, 0)
for i in (1, 2): for i in (1, 2):
sfp_ctl = self.platform.request("sfp_ctl", i) sfp_ctl = self.platform.request("sfp_ctl", i)
@ -393,6 +397,8 @@ class USTC(_StandaloneBase):
self.rtio_channels.append(rtio.LogChannel()) self.rtio_channels.append(rtio.LogChannel())
self.add_rtio(self.rtio_channels) self.add_rtio(self.rtio_channels)
self.config["HAS_GRABBER"] = None
self.add_csr_group("grabber", self.grabber_csr_group)
class PTB(_StandaloneBase): class PTB(_StandaloneBase):
@ -502,6 +508,7 @@ class LUH(_StandaloneBase):
self.comb += self.platform.request("clk_sel").eq(1) self.comb += self.platform.request("clk_sel").eq(1)
self.rtio_channels = [] self.rtio_channels = []
self.grabber_csr_group = []
eem.DIO.add_std(self, 0, eem.DIO.add_std(self, 0,
ttl_serdes_7series.InOut_8X, ttl_serdes_7series.Output_8X) ttl_serdes_7series.InOut_8X, ttl_serdes_7series.Output_8X)
eem.DIO.add_std(self, 1, eem.DIO.add_std(self, 1,
@ -526,6 +533,8 @@ class LUH(_StandaloneBase):
self.rtio_channels.append(rtio.LogChannel()) self.rtio_channels.append(rtio.LogChannel())
self.add_rtio(self.rtio_channels) self.add_rtio(self.rtio_channels)
self.config["HAS_GRABBER"] = None
self.add_csr_group("grabber", self.grabber_csr_group)
class Tester(_StandaloneBase): class Tester(_StandaloneBase):