From d8dbab024dac7762471bf0b48ed672fc4c624a02 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Wed, 3 Jan 2018 15:49:56 +0000 Subject: [PATCH] urukul: don't deal with dds_reset for now --- artiq/coredevice/urukul.py | 3 ++- artiq/examples/master/device_db.py | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/artiq/coredevice/urukul.py b/artiq/coredevice/urukul.py index 750993eed..9d8caed20 100644 --- a/artiq/coredevice/urukul.py +++ b/artiq/coredevice/urukul.py @@ -88,7 +88,8 @@ CS_DDS_CH3 = 7 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"): self.core = dmgr.get(core_device) diff --git a/artiq/examples/master/device_db.py b/artiq/examples/master/device_db.py index 95ec6a482..b9b38188d 100644 --- a/artiq/examples/master/device_db.py +++ b/artiq/examples/master/device_db.py @@ -203,12 +203,6 @@ device_db = { "class": "TTLOut", "arguments": {"channel": 33} }, - "ttl_urukul_dds_reset": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 34} - }, "ttl_urukul_sw0": { "type": "local", "module": "artiq.coredevice.ttl", @@ -240,7 +234,6 @@ device_db = { "arguments": { "spi_device": "spi_urukul", "io_update_device": "ttl_urukul_io_update", - "dds_reset_device": "ttl_urukul_dds_reset", "refclk": 100e6 } },