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

minor cleanup

This commit is contained in:
Sebastien Bourdeauducq 2018-05-21 15:35:00 +08:00
parent 9b4ad8b5af
commit 8513f0b0d4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq/coredevice/sampler.py
View File

@ -1,4 +1,3 @@
from artiq.language.core import kernel, delay, portable from artiq.language.core import kernel, delay, portable
from artiq.language.units import ns from artiq.language.units import ns

6
artiq/examples/kasli_basic/device_db_mitll.py
View File

@ -115,19 +115,19 @@ for i in range(2):
"module": "artiq.coredevice.spi2", "module": "artiq.coredevice.spi2",
"class": "SPIMaster", "class": "SPIMaster",
"arguments": {"channel": 14+3*i+0} "arguments": {"channel": 14+3*i+0}
}, }
device_db["ttl_zotino{}_ldac".format(i)] = { device_db["ttl_zotino{}_ldac".format(i)] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 14+3*i+1} "arguments": {"channel": 14+3*i+1}
}, }
device_db["ttl_zotino{}_clr".format(i)] = { device_db["ttl_zotino{}_clr".format(i)] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.ttl", "module": "artiq.coredevice.ttl",
"class": "TTLOut", "class": "TTLOut",
"arguments": {"channel": 14+3*i+2} "arguments": {"channel": 14+3*i+2}
}, }
device_db["zotino{}".format(i)] = { device_db["zotino{}".format(i)] = {
"type": "local", "type": "local",
"module": "artiq.coredevice.zotino", "module": "artiq.coredevice.zotino",