From a871194ee4c4cdce6ba3ba3b1d7c2a7826f42e5c Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 26 Dec 2015 17:47:53 +0800 Subject: [PATCH] coredevice/analyzer: prefix channel names with their types --- artiq/coredevice/analyzer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/coredevice/analyzer.py b/artiq/coredevice/analyzer.py index 0cdbe85f6..c2d31fc41 100644 --- a/artiq/coredevice/analyzer.py +++ b/artiq/coredevice/analyzer.py @@ -136,7 +136,7 @@ class VCDManager: class TTLHandler: def __init__(self, vcd_manager, 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.oe = True @@ -169,9 +169,9 @@ class DDSHandler: def add_dds_channel(self, name, dds_channel_nr): dds_channel = dict() 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"] = \ - self.vcd_manager.get_channel(name + "/phase", 64) + self.vcd_manager.get_channel("dds/" + name + "/phase", 64) if self.dds_type == "AD9858": dds_channel["ftw"] = [None, None, None, None] dds_channel["pow"] = [None, None]