From 72f7f8386f609345fdfe293708d88a3898fe060a Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 10 May 2019 12:11:42 +0800 Subject: [PATCH] remove old Kasli device databases (#1289) --- artiq/examples/kasli_basic/device_db_hub.py | 176 ------------- artiq/examples/kasli_basic/device_db_luh.py | 183 -------------- artiq/examples/kasli_basic/device_db_ptb.py | 233 ------------------ artiq/examples/kasli_basic/device_db_ptb2.py | 246 ------------------- 4 files changed, 838 deletions(-) delete mode 100644 artiq/examples/kasli_basic/device_db_hub.py delete mode 100644 artiq/examples/kasli_basic/device_db_luh.py delete mode 100644 artiq/examples/kasli_basic/device_db_ptb.py delete mode 100644 artiq/examples/kasli_basic/device_db_ptb2.py diff --git a/artiq/examples/kasli_basic/device_db_hub.py b/artiq/examples/kasli_basic/device_db_hub.py deleted file mode 100644 index ea364ecfc..000000000 --- a/artiq/examples/kasli_basic/device_db_hub.py +++ /dev/null @@ -1,176 +0,0 @@ -core_addr = "staging.ber.quartiq.de" - -device_db = { - "core": { - "type": "local", - "module": "artiq.coredevice.core", - "class": "Core", - "arguments": {"host": core_addr, "ref_period": 1e-9} - }, - "core_log": { - "type": "controller", - "host": "::1", - "port": 1068, - "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr - }, - "core_cache": { - "type": "local", - "module": "artiq.coredevice.cache", - "class": "CoreCache" - }, - "core_dma": { - "type": "local", - "module": "artiq.coredevice.dma", - "class": "CoreDMA" - }, - - "i2c_switch0": { - "type": "local", - "module": "artiq.coredevice.i2c", - "class": "PCA9548", - "arguments": {"address": 0xe0} - }, - "i2c_switch1": { - "type": "local", - "module": "artiq.coredevice.i2c", - "class": "PCA9548", - "arguments": {"address": 0xe2} - }, -} - - -device_db.update({ - "ttl" + str(i): { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLInOut" if i < 4 else "TTLOut", - "arguments": {"channel": i}, - } for i in range(24) -}) - - -device_db.update({ - "spi_sampler0_adc": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 24} - }, - "spi_sampler0_pgia": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 25} - }, - "spi_sampler0_cnv": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 26}, - }, - "sampler0": { - "type": "local", - "module": "artiq.coredevice.sampler", - "class": "Sampler", - "arguments": { - "spi_adc_device": "spi_sampler0_adc", - "spi_pgia_device": "spi_sampler0_pgia", - "cnv_device": "spi_sampler0_cnv" - } - } -}) - -for j in range(3): - device_db.update({ - "spi_urukul{}".format(j): { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 27 + 3*j} - }, - "ttl_urukul{}_sync".format(j): { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLClockGen", - "arguments": {"channel": 28 + 3*j, "acc_width": 4} - }, - "ttl_urukul{}_io_update".format(j): { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 29 + 3*j} - }, - "urukul{}_cpld".format(j): { - "type": "local", - "module": "artiq.coredevice.urukul", - "class": "CPLD", - "arguments": { - "spi_device": "spi_urukul{}".format(j), - "sync_device": "ttl_urukul{}_sync".format(j), - "io_update_device": "ttl_urukul{}_io_update".format(j), - "refclk": 100e6, - "clk_sel": 0 - } - } - }) - - device_db.update({ - "urukul{}_ch{}".format(j, i): { - "type": "local", - "module": "artiq.coredevice.ad9910", - "class": "AD9910", - "arguments": { - "pll_n": 40, - "chip_select": 4 + i, - "cpld_device": "urukul{}_cpld".format(j) - } - } for i in range(4) - }) - - -device_db.update({ - "led0": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 36} - }, - "led1": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 37} - } -}) - - -device_db.update({ - "spi_zotino0": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 38} - }, - "ttl_zotino0_ldac": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 39} - }, - "ttl_zotino0_clr": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 40} - }, - "zotino0": { - "type": "local", - "module": "artiq.coredevice.zotino", - "class": "Zotino", - "arguments": { - "spi_device": "spi_zotino0", - "ldac_device": "ttl_zotino0_ldac", - "clr_device": "ttl_zotino0_clr" - } - } -}) diff --git a/artiq/examples/kasli_basic/device_db_luh.py b/artiq/examples/kasli_basic/device_db_luh.py deleted file mode 100644 index 9efdbd190..000000000 --- a/artiq/examples/kasli_basic/device_db_luh.py +++ /dev/null @@ -1,183 +0,0 @@ -core_addr = "staging.ber.quartiq.de" - -device_db = { - "core": { - "type": "local", - "module": "artiq.coredevice.core", - "class": "Core", - "arguments": {"host": core_addr, "ref_period": 1e-9} - }, - "core_log": { - "type": "controller", - "host": "::1", - "port": 1068, - "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr - }, - "core_cache": { - "type": "local", - "module": "artiq.coredevice.cache", - "class": "CoreCache" - }, - "core_dma": { - "type": "local", - "module": "artiq.coredevice.dma", - "class": "CoreDMA" - }, - - "i2c_switch0": { - "type": "local", - "module": "artiq.coredevice.i2c", - "class": "PCA9548", - "arguments": {"address": 0xe0} - }, - "i2c_switch1": { - "type": "local", - "module": "artiq.coredevice.i2c", - "class": "PCA9548", - "arguments": {"address": 0xe2} - }, -} - - -device_db.update({ - "ttl" + str(i): { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLInOut" if i < 4 else "TTLOut", - "arguments": {"channel": i}, - } for i in range(24) -}) - - -device_db.update({ - "spi_sampler0_adc": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 24} - }, - "spi_sampler0_pgia": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 25} - }, - "spi_sampler0_cnv": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 26}, - }, - "sampler0": { - "type": "local", - "module": "artiq.coredevice.sampler", - "class": "Sampler", - "arguments": { - "spi_adc_device": "spi_sampler0_adc", - "spi_pgia_device": "spi_sampler0_pgia", - "cnv_device": "spi_sampler0_cnv" - } - } -}) - -for j in range(2): - device_db.update({ - "spi_urukul{}".format(j): { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 27 + 3*j} - }, - "ttl_urukul{}_sync".format(j): { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLClockGen", - "arguments": {"channel": 28 + 3*j, "acc_width": 4} - }, - "ttl_urukul{}_io_update".format(j): { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 29 + 3*j} - }, - "urukul{}_cpld".format(j): { - "type": "local", - "module": "artiq.coredevice.urukul", - "class": "CPLD", - "arguments": { - "spi_device": "spi_urukul{}".format(j), - "sync_device": "ttl_urukul{}_sync".format(j), - "io_update_device": "ttl_urukul{}_io_update".format(j), - "refclk": 100e6, - "clk_sel": 0 - } - } - }) - - device_db.update({ - "urukul{}_ch{}".format(j, i): { - "type": "local", - "module": "artiq.coredevice.ad9910", - "class": "AD9910", - "arguments": { - "pll_n": 40, - "chip_select": 4 + i, - "cpld_device": "urukul{}_cpld".format(j) - } - } for i in range(4) - }) - -device_db.update({ - "grabber0": { - "type": "local", - "module": "artiq.coredevice.grabber", - "class": "grabber", - "arguments": {"channel_base": 33} - } -}) - -device_db.update({ - "led0": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 35} - }, - "led1": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 36} - } -}) - -device_db.update({ - "spi_zotino0": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 37} - }, - "ttl_zotino0_ldac": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 38} - }, - "ttl_zotino0_clr": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 39} - }, - "zotino0": { - "type": "local", - "module": "artiq.coredevice.zotino", - "class": "Zotino", - "arguments": { - "spi_device": "spi_zotino0", - "ldac_device": "ttl_zotino0_ldac", - "clr_device": "ttl_zotino0_clr" - } - } -}) diff --git a/artiq/examples/kasli_basic/device_db_ptb.py b/artiq/examples/kasli_basic/device_db_ptb.py deleted file mode 100644 index cc04d1090..000000000 --- a/artiq/examples/kasli_basic/device_db_ptb.py +++ /dev/null @@ -1,233 +0,0 @@ -core_addr = "staging.ber.quartiq.de" - -device_db = { - "core": { - "type": "local", - "module": "artiq.coredevice.core", - "class": "Core", - "arguments": {"host": core_addr, "ref_period": 1e-9} - }, - "core_log": { - "type": "controller", - "host": "::1", - "port": 1068, - "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr - }, - "core_cache": { - "type": "local", - "module": "artiq.coredevice.cache", - "class": "CoreCache" - }, - "core_dma": { - "type": "local", - "module": "artiq.coredevice.dma", - "class": "CoreDMA" - }, - - "i2c_switch0": { - "type": "local", - "module": "artiq.coredevice.i2c", - "class": "PCA9548", - "arguments": {"address": 0xe0} - }, - "i2c_switch1": { - "type": "local", - "module": "artiq.coredevice.i2c", - "class": "PCA9548", - "arguments": {"address": 0xe2} - }, -} - - -device_db.update({ - "ttl" + str(i): { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLInOut" if i < 4 else "TTLOut", - "arguments": {"channel": i}, - } for i in range(24) -}) - - -device_db.update({ - "spi_sampler0_adc": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 24} - }, - "spi_sampler0_pgia": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 25} - }, - "spi_sampler0_cnv": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 26}, - }, - "sampler0": { - "type": "local", - "module": "artiq.coredevice.sampler", - "class": "Sampler", - "arguments": { - "spi_adc_device": "spi_sampler0_adc", - "spi_pgia_device": "spi_sampler0_pgia", - "cnv_device": "spi_sampler0_cnv" - } - } -}) - -device_db.update({ - "spi_urukul0": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 27} - }, - "ttl_urukul0_io_update": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 28} - }, - "ttl_urukul0_sw0": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 29} - }, - "ttl_urukul0_sw1": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 30} - }, - "ttl_urukul0_sw2": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 31} - }, - "ttl_urukul0_sw3": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 32} - }, - "urukul0_cpld": { - "type": "local", - "module": "artiq.coredevice.urukul", - "class": "CPLD", - "arguments": { - "spi_device": "spi_urukul0", - "io_update_device": "ttl_urukul0_io_update", - "refclk": 100e6, - "clk_sel": 0 - } - } -}) - -device_db.update({ - "urukul0_ch" + str(i): { - "type": "local", - "module": "artiq.coredevice.ad9912", - "class": "AD9912", - "arguments": { - "pll_n": 10, - "chip_select": 4 + i, - "cpld_device": "urukul0_cpld", - "sw_device": "ttl_urukul0_sw" + str(i) - } - } for i in range(4) -}) - - -device_db.update({ - "spi_urukul1": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 33} - }, - "ttl_urukul1_io_update": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 34} - }, - "urukul1_cpld": { - "type": "local", - "module": "artiq.coredevice.urukul", - "class": "CPLD", - "arguments": { - "spi_device": "spi_urukul1", - "io_update_device": "ttl_urukul1_io_update", - "refclk": 100e6, - "clk_sel": 0 - } - } -}) - -device_db.update({ - "urukul1_ch" + str(i): { - "type": "local", - "module": "artiq.coredevice.ad9910", - "class": "AD9910", - "arguments": { - "pll_n": 40, - "chip_select": 4 + i, - "cpld_device": "urukul1_cpld" - } - } for i in range(4) -}) - - -device_db.update({ - "led0": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 35} - }, - "led1": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 36} - } -}) - - -device_db.update({ - "spi_zotino0": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 37} - }, - "ttl_zotino0_ldac": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 38} - }, - "ttl_zotino0_clr": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 39} - }, - "zotino0": { - "type": "local", - "module": "artiq.coredevice.zotino", - "class": "Zotino", - "arguments": { - "spi_device": "spi_zotino0", - "ldac_device": "ttl_zotino0_ldac", - "clr_device": "ttl_zotino0_clr" - } - } -}) diff --git a/artiq/examples/kasli_basic/device_db_ptb2.py b/artiq/examples/kasli_basic/device_db_ptb2.py deleted file mode 100644 index 78b4d28e1..000000000 --- a/artiq/examples/kasli_basic/device_db_ptb2.py +++ /dev/null @@ -1,246 +0,0 @@ -core_addr = "staging.ber.quartiq.de" - -device_db = { - "core": { - "type": "local", - "module": "artiq.coredevice.core", - "class": "Core", - "arguments": {"host": core_addr, "ref_period": 1e-9} - }, - "core_log": { - "type": "controller", - "host": "::1", - "port": 1068, - "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr - }, - "core_cache": { - "type": "local", - "module": "artiq.coredevice.cache", - "class": "CoreCache" - }, - "core_dma": { - "type": "local", - "module": "artiq.coredevice.dma", - "class": "CoreDMA" - }, - - "i2c_switch0": { - "type": "local", - "module": "artiq.coredevice.i2c", - "class": "PCA9548", - "arguments": {"address": 0xe0} - }, - "i2c_switch1": { - "type": "local", - "module": "artiq.coredevice.i2c", - "class": "PCA9548", - "arguments": {"address": 0xe2} - }, -} - - -device_db.update({ - "ttl" + str(i): { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLInOut" if i < 4 else "TTLOut", - "arguments": {"channel": i}, - } for i in range(24) -}) - - -device_db.update({ - "spi_sampler0_adc": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 24} - }, - "spi_sampler0_pgia": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 25} - }, - "spi_sampler0_cnv": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 26}, - }, - "sampler0": { - "type": "local", - "module": "artiq.coredevice.sampler", - "class": "Sampler", - "arguments": { - "spi_adc_device": "spi_sampler0_adc", - "spi_pgia_device": "spi_sampler0_pgia", - "cnv_device": "spi_sampler0_cnv" - } - } -}) - -device_db.update({ - "spi_urukul0": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 27} - }, - "ttl_urukul0_sync": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLClockGen", - "arguments": {"channel": 28, "acc_width": 4} - }, - "ttl_urukul0_io_update": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 29} - }, - "ttl_urukul0_sw0": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 30} - }, - "ttl_urukul0_sw1": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 31} - }, - "ttl_urukul0_sw2": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 32} - }, - "ttl_urukul0_sw3": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 33} - }, - "urukul0_cpld": { - "type": "local", - "module": "artiq.coredevice.urukul", - "class": "CPLD", - "arguments": { - "spi_device": "spi_urukul0", - "io_update_device": "ttl_urukul0_io_update", - "refclk": 100e6, - "clk_sel": 0 - } - } -}) - -device_db.update({ - "urukul0_ch" + str(i): { - "type": "local", - "module": "artiq.coredevice.ad9912", - "class": "AD9912", - "arguments": { - "pll_n": 10, - "chip_select": 4 + i, - "cpld_device": "urukul0_cpld", - "sw_device": "ttl_urukul0_sw" + str(i) - } - } for i in range(4) -}) - - -device_db.update({ - "spi_urukul1": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 34} - }, - "ttl_urukul1_sync": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLClockGen", - "arguments": {"channel": 35, "acc_width": 4} - }, - "ttl_urukul1_io_update": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 36} - }, - "urukul1_cpld": { - "type": "local", - "module": "artiq.coredevice.urukul", - "class": "CPLD", - "arguments": { - "spi_device": "spi_urukul1", - "sync_device": "ttl_urukul1_sync", - "io_update_device": "ttl_urukul1_io_update", - "refclk": 125e6, - "clk_sel": 0 - } - } -}) - -device_db.update({ - "urukul1_ch" + str(i): { - "type": "local", - "module": "artiq.coredevice.ad9910", - "class": "AD9910", - "arguments": { - "pll_n": 32, - "chip_select": 4 + i, - "cpld_device": "urukul1_cpld" - } - } for i in range(4) -}) - - -device_db.update({ - "led0": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 37} - }, - "led1": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 38} - } -}) - - -device_db.update({ - "spi_zotino0": { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 39} - }, - "ttl_zotino0_ldac": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 40} - }, - "ttl_zotino0_clr": { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 41} - }, - "zotino0": { - "type": "local", - "module": "artiq.coredevice.zotino", - "class": "Zotino", - "arguments": { - "spi_device": "spi_zotino0", - "ldac_device": "ttl_zotino0_ldac", - "clr_device": "ttl_zotino0_clr" - } - } -})