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

coredevice/analyzer: prefix channel names with their types

This commit is contained in:
Sebastien Bourdeauducq 2015-12-26 17:47:53 +08:00
parent 2b70fa14a6
commit a871194ee4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/coredevice/analyzer.py
View File

@ -136,7 +136,7 @@ class VCDManager:
class TTLHandler: class TTLHandler:
def __init__(self, vcd_manager, name): def __init__(self, vcd_manager, name):
self.name = name self.name = name
self.channel_value = vcd_manager.get_channel(name, 1) self.channel_value = vcd_manager.get_channel("ttl/" + name, 1)
self.last_value = "X" self.last_value = "X"
self.oe = True self.oe = True
@ -169,9 +169,9 @@ class DDSHandler:
def add_dds_channel(self, name, dds_channel_nr): def add_dds_channel(self, name, dds_channel_nr):
dds_channel = dict() dds_channel = dict()
dds_channel["vcd_frequency"] = \ dds_channel["vcd_frequency"] = \
self.vcd_manager.get_channel(name + "/frequency", 64) self.vcd_manager.get_channel("dds/" + name + "/frequency", 64)
dds_channel["vcd_phase"] = \ dds_channel["vcd_phase"] = \
self.vcd_manager.get_channel(name + "/phase", 64) self.vcd_manager.get_channel("dds/" + name + "/phase", 64)
if self.dds_type == "AD9858": if self.dds_type == "AD9858":
dds_channel["ftw"] = [None, None, None, None] dds_channel["ftw"] = [None, None, None, None]
dds_channel["pow"] = [None, None] dds_channel["pow"] = [None, None]