From 79f4892e227e814da4d6d799221a0e17890d111e Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 17 Apr 2018 20:15:17 +0800 Subject: [PATCH] kasli/mitll: fix RTIO channel numbers --- artiq/examples/kasli_mitll/device_db.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/artiq/examples/kasli_mitll/device_db.py b/artiq/examples/kasli_mitll/device_db.py index f828fe8f1..45f13457b 100644 --- a/artiq/examples/kasli_mitll/device_db.py +++ b/artiq/examples/kasli_mitll/device_db.py @@ -51,37 +51,37 @@ device_db.update( "type": "local", "module": "artiq.coredevice.spi2", "class": "SPIMaster", - "arguments": {"channel": 9} + "arguments": {"channel": 8} }, ttl_urukul0_io_update={ "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 10} + "arguments": {"channel": 9} }, ttl_urukul0_sw0={ "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 11} + "arguments": {"channel": 10} }, ttl_urukul0_sw1={ "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 12} + "arguments": {"channel": 11} }, ttl_urukul0_sw2={ "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 13} + "arguments": {"channel": 12} }, ttl_urukul0_sw3={ "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 14} + "arguments": {"channel": 13} }, urukul0_cpld={ "type": "local", @@ -114,19 +114,19 @@ for i in range(2): "type": "local", "module": "artiq.coredevice.spi2", "class": "SPIMaster", - "arguments": {"channel": 15+3*i+0} + "arguments": {"channel": 14+3*i+0} }, device_db["ttl_zotino{}_ldac".format(i)] = { "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 15+3*i+1} + "arguments": {"channel": 14+3*i+1} }, device_db["ttl_zotino{}_clr".format(i)] = { "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 15+3*i+2} + "arguments": {"channel": 14+3*i+2} }, device_db["zotino{}".format(i)] = { "type": "local", @@ -144,12 +144,12 @@ device_db.update( "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 18} + "arguments": {"channel": 20} }, led1={ "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 19} - } + "arguments": {"channel": 21} + }, )