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

tester: add urukul sync 

Signed-off-by: Robert Jördens <rj@quartiq.de>
This commit is contained in:
Robert Jördens 2018-11-01 12:02:04 +00:00
parent 60d3bc63a7
commit 4269d5ad5c
2 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
artiq/examples/kasli_tester/device_db.py
View File

@ -57,36 +57,42 @@ device_db.update(
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 8} "arguments": {"channel": 8}
}, },
ttl_urukul0_io_update={ ttl_urukul0_sync={
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLClockGen",
"arguments": {"channel": 9} "arguments": {"channel": 9, "acc_width": 4}
}, },
ttl_urukul0_sw0={ ttl_urukul0_io_update={
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 10} "arguments": {"channel": 10}
}, },
ttl_urukul0_sw1={ ttl_urukul0_sw0={
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 11} "arguments": {"channel": 11}
}, },
ttl_urukul0_sw2={ ttl_urukul0_sw1={
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 12} "arguments": {"channel": 12}
}, },
ttl_urukul0_sw3={ ttl_urukul0_sw2={
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 13} "arguments": {"channel": 13}
}, },
ttl_urukul0_sw3={
"type": "local",
"module": "artiq.coredevice.ttl",
"class": "TTLOut",
"arguments": {"channel": 14}
},
urukul0_cpld={ urukul0_cpld={
"type": "local", "type": "local",
"module": "artiq.coredevice.urukul", "module": "artiq.coredevice.urukul",
@ -94,6 +100,7 @@ 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": 125e6, "refclk": 125e6,
"clk_sel": 0 "clk_sel": 0
} }
@ -119,19 +126,19 @@ device_db["spi_sampler0_adc"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 14} "arguments": {"channel": 15}
} }
device_db["spi_sampler0_pgia"] = { device_db["spi_sampler0_pgia"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 15} "arguments": {"channel": 16}
} }
device_db["spi_sampler0_cnv"] = { device_db["spi_sampler0_cnv"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 16}, "arguments": {"channel": 17},
} }
device_db["sampler0"] = { device_db["sampler0"] = {
"type": "local", "type": "local",
@ -150,19 +157,19 @@ device_db["spi_zotino0"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 17} "arguments": {"channel": 18}
} }
device_db["ttl_zotino0_ldac"] = { device_db["ttl_zotino0_ldac"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 18} "arguments": {"channel": 19}
} }
device_db["ttl_zotino0_clr"] = { device_db["ttl_zotino0_clr"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 19} "arguments": {"channel": 20}
} }
device_db["zotino0"] = { device_db["zotino0"] = {
"type": "local", "type": "local",
@ -181,7 +188,7 @@ device_db["grabber0"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.grabber", "module": "artiq.coredevice.grabber",
"class": "Grabber", "class": "Grabber",
"arguments": {"channel_base": 20} "arguments": {"channel_base": 21}
} }
@ -191,13 +198,19 @@ device_db.update(
"type": "local", "type": "local",
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 22} "arguments": {"channel": 23}
},
ttl_urukul1_sync={
"type": "local",
"module": "artiq.coredevice.ttl",
"class": "TTLClockGen",
"arguments": {"channel": 24, "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": 23} "arguments": {"channel": 25}
}, },
urukul1_cpld={ urukul1_cpld={
"type": "local", "type": "local",
@ -206,6 +219,7 @@ device_db.update(
"arguments": { "arguments": {
"spi_device": "spi_urukul1", "spi_device": "spi_urukul1",
"io_update_device": "ttl_urukul1_io_update", "io_update_device": "ttl_urukul1_io_update",
"sync_device": "ttl_urukul1_sync",
"refclk": 100e6, "refclk": 100e6,
"clk_sel": 1 "clk_sel": 1
} }
@ -231,7 +245,7 @@ for i in range(8):
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 24 + i}, "arguments": {"channel": 26 + i},
} }
@ -241,7 +255,7 @@ for i in range(8):
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 32 + i}, "arguments": {"channel": 34 + i},
} }
@ -250,19 +264,19 @@ device_db["spi_sampler1_adc"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 40} "arguments": {"channel": 42}
} }
device_db["spi_sampler1_pgia"] = { device_db["spi_sampler1_pgia"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 41} "arguments": {"channel": 43}
} }
device_db["spi_sampler1_cnv"] = { device_db["spi_sampler1_cnv"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 42}, "arguments": {"channel": 44},
} }
device_db["sampler1"] = { device_db["sampler1"] = {
"type": "local", "type": "local",
@ -281,19 +295,19 @@ device_db["spi_zotino1"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 43} "arguments": {"channel": 45}
} }
device_db["ttl_zotino1_ldac"] = { device_db["ttl_zotino1_ldac"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 44} "arguments": {"channel": 46}
} }
device_db["ttl_zotino1_clr"] = { device_db["ttl_zotino1_clr"] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 45} "arguments": {"channel": 47}
} }
device_db["zotino1"] = { device_db["zotino1"] = {
"type": "local", "type": "local",
@ -312,13 +326,13 @@ device_db.update(
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 46} "arguments": {"channel": 48}
}, },
led1={ led1={
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 47} "arguments": {"channel": 49}
}, },
) )

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

@ -648,11 +648,13 @@ class Tester(_StandaloneBase):
self.grabber_csr_group = [] 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.Urukul.add_std(self, 0, 1, ttl_serdes_7series.Output_8X) eem.Urukul.add_std(self, 0, 1, ttl_serdes_7series.Output_8X,
ttl_simple.ClockGen)
eem.Sampler.add_std(self, 3, 2, ttl_serdes_7series.Output_8X) eem.Sampler.add_std(self, 3, 2, ttl_serdes_7series.Output_8X)
eem.Zotino.add_std(self, 4, ttl_serdes_7series.Output_8X) eem.Zotino.add_std(self, 4, ttl_serdes_7series.Output_8X)
eem.Grabber.add_std(self, 6) eem.Grabber.add_std(self, 6)
eem.Urukul.add_std(self, 7, None, ttl_serdes_7series.Output_8X) eem.Urukul.add_std(self, 7, None, ttl_serdes_7series.Output_8X,
ttl_simple.ClockGen)
eem.DIO.add_std(self, 8, eem.DIO.add_std(self, 8,
ttl_serdes_7series.Output_8X, ttl_serdes_7series.Output_8X) ttl_serdes_7series.Output_8X, ttl_serdes_7series.Output_8X)
eem.DIO.add_std(self, 9, eem.DIO.add_std(self, 9,