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

ptb: back out urukul-sync 

... for backwards compatibility.

Signed-off-by: Robert Jördens <rj@quartiq.de>
This commit is contained in:
Robert Jördens 2018-11-01 11:55:11 +00:00
parent 06139c0f4d
commit 60d3bc63a7
2 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
artiq/examples/kasli_basic/device_db_ptb.py
View File

@ -87,41 +87,35 @@ device_db.update({
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 27} "arguments": {"channel": 27}
}, },
"ttl_urukul0_sync": {
"type": "local",
"module": "artiq.coredevice.ttl",
"class": "TTLClockGen",
"arguments": {"channel": 28, "acc_width": 4}
},
"ttl_urukul0_io_update": { "ttl_urukul0_io_update": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 29} "arguments": {"channel": 28}
}, },
"ttl_urukul0_sw0": { "ttl_urukul0_sw0": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 30} "arguments": {"channel": 29}
}, },
"ttl_urukul0_sw1": { "ttl_urukul0_sw1": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 31} "arguments": {"channel": 30}
}, },
"ttl_urukul0_sw2": { "ttl_urukul0_sw2": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 32} "arguments": {"channel": 31}
}, },
"ttl_urukul0_sw3": { "ttl_urukul0_sw3": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 33} "arguments": {"channel": 32}
}, },
"urukul0_cpld": { "urukul0_cpld": {
"type": "local", "type": "local",
@ -130,7 +124,6 @@ device_db.update({
"arguments": { "arguments": {
"spi_device": "spi_urukul0", "spi_device": "spi_urukul0",
"io_update_device": "ttl_urukul0_io_update", "io_update_device": "ttl_urukul0_io_update",
"sync_device": "ttl_urukul0_sync",
"refclk": 100e6, "refclk": 100e6,
"clk_sel": 0 "clk_sel": 0
} }
@ -157,19 +150,13 @@ device_db.update({
"type": "local", "type": "local",
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 34} "arguments": {"channel": 33}
},
"ttl_urukul1_sync": {
"type": "local",
"module": "artiq.coredevice.ttl",
"class": "TTLClockGen",
"arguments": {"channel": 35, "acc_width": 4}
}, },
"ttl_urukul1_io_update": { "ttl_urukul1_io_update": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 36} "arguments": {"channel": 34}
}, },
"urukul1_cpld": { "urukul1_cpld": {
"type": "local", "type": "local",
@ -203,13 +190,13 @@ device_db.update({
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 37} "arguments": {"channel": 35}
}, },
"led1": { "led1": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 38} "arguments": {"channel": 36}
} }
}) })
@ -219,19 +206,19 @@ device_db.update({
"type": "local", "type": "local",
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 39} "arguments": {"channel": 37}
}, },
"ttl_zotino0_ldac": { "ttl_zotino0_ldac": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 40} "arguments": {"channel": 38}
}, },
"ttl_zotino0_clr": { "ttl_zotino0_clr": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 41} "arguments": {"channel": 39}
}, },
"zotino0": { "zotino0": {
"type": "local", "type": "local",

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

@ -516,10 +516,8 @@ class PTB(_StandaloneBase):
eem.DIO.add_std(self, 2, eem.DIO.add_std(self, 2,
ttl_serdes_7series.Output_8X, ttl_serdes_7series.Output_8X) ttl_serdes_7series.Output_8X, ttl_serdes_7series.Output_8X)
eem.Sampler.add_std(self, 3, None, ttl_serdes_7series.Output_8X) eem.Sampler.add_std(self, 3, None, ttl_serdes_7series.Output_8X)
eem.Urukul.add_std(self, 5, 4, ttl_serdes_7series.Output_8X, eem.Urukul.add_std(self, 5, 4, ttl_serdes_7series.Output_8X)
ttl_simple.ClockGen) eem.Urukul.add_std(self, 6, None, ttl_serdes_7series.Output_8X)
eem.Urukul.add_std(self, 6, None, ttl_serdes_7series.Output_8X,
ttl_simple.ClockGen)
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)