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

urukul: don't deal with dds_reset for now

This commit is contained in:
Robert Jördens 2018-01-03 15:49:56 +00:00
parent e8608d12f5
commit d8dbab024d
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq/coredevice/urukul.py
View File

@ -88,7 +88,8 @@ CS_DDS_CH3 = 7
class CPLD: class CPLD:
def __init__(self, dmgr, spi_device, io_update_device, dds_reset_device, def __init__(self, dmgr, spi_device, io_update_device,
dds_reset_device=None,
refclk=100e6, core_device="core"): refclk=100e6, core_device="core"):
self.core = dmgr.get(core_device) self.core = dmgr.get(core_device)

7
artiq/examples/master/device_db.py
View File

@ -203,12 +203,6 @@ device_db = {
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 33} "arguments": {"channel": 33}
}, },
"ttl_urukul_dds_reset": {
"type": "local",
"module": "artiq.coredevice.ttl",
"class": "TTLOut",
"arguments": {"channel": 34}
},
"ttl_urukul_sw0": { "ttl_urukul_sw0": {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
@ -240,7 +234,6 @@ device_db = {
"arguments": { "arguments": {
"spi_device": "spi_urukul", "spi_device": "spi_urukul",
"io_update_device": "ttl_urukul_io_update", "io_update_device": "ttl_urukul_io_update",
"dds_reset_device": "ttl_urukul_dds_reset",
"refclk": 100e6 "refclk": 100e6
} }
}, },