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

coredevice/analyzer: support TTL clockgen

This commit is contained in:
Sebastien Bourdeauducq 2015-12-26 21:51:37 +08:00
parent 532204e5ff
commit 24fa74a8ab
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
artiq/coredevice/analyzer.py
View File

@ -155,9 +155,26 @@ class TTLHandler:
else: else:
self.channel_value.set_value("X") self.channel_value.set_value("X")
elif isinstance(message, InputMessage): elif isinstance(message, InputMessage):
logger.debug("TTL read @%d %d, name: %s",
message.timestamp, message.data, self.name)
self.channel_value.set_value(str(message.data)) self.channel_value.set_value(str(message.data))
class TTLClockGenHandler:
def __init__(self, vcd_manager, name, ref_period):
self.name = name
self.ref_period = ref_period
self.channel_frequency = vcd_manager.get_channel(
"ttl_clkgen/" + name, 64)
def process_message(self, message):
if isinstance(message, OutputMessage):
logger.debug("TTL_CLKGEN write @%d %d to %d, name: %s",
message.timestamp, message.data, message.address, self.name)
frequency = message.data/self.ref_period/2**24
self.channel_frequency.set_value_double(frequency)
class DDSHandler: class DDSHandler:
def __init__(self, vcd_manager, dds_type, onehot_sel, sysclk): def __init__(self, vcd_manager, dds_type, onehot_sel, sysclk):
self.vcd_manager = vcd_manager self.vcd_manager = vcd_manager
@ -260,8 +277,8 @@ def get_ref_period(devices):
return ref_period return ref_period
def create_channel_handlers(vcd_manager, devices, log_channel, def create_channel_handlers(vcd_manager, devices, ref_period,
dds_channel, dds_onehot_sel): log_channel, dds_channel, dds_onehot_sel):
channel_handlers = dict() channel_handlers = dict()
for name, desc in sorted(devices.items(), key=itemgetter(0)): for name, desc in sorted(devices.items(), key=itemgetter(0)):
if isinstance(desc, dict) and desc["type"] == "local": if isinstance(desc, dict) and desc["type"] == "local":
@ -269,6 +286,10 @@ def create_channel_handlers(vcd_manager, devices, log_channel,
and desc["class"] in {"TTLOut", "TTLInOut"}): and desc["class"] in {"TTLOut", "TTLInOut"}):
channel = desc["arguments"]["channel"] channel = desc["arguments"]["channel"]
channel_handlers[channel] = TTLHandler(vcd_manager, name) channel_handlers[channel] = TTLHandler(vcd_manager, name)
if (desc["module"] == "artiq.coredevice.ttl"
and desc["class"] == "TTLClockGen"):
channel = desc["arguments"]["channel"]
channel_handlers[channel] = TTLClockGenHandler(vcd_manager, name, ref_period)
if (desc["module"] == "artiq.coredevice.dds" if (desc["module"] == "artiq.coredevice.dds"
and desc["class"] in {"AD9858", "AD9914"}): and desc["class"] in {"AD9858", "AD9914"}):
sysclk = desc["arguments"]["sysclk"] sysclk = desc["arguments"]["sysclk"]
@ -301,7 +322,7 @@ def decoded_dump_to_vcd(fileobj, devices, dump):
ref_period = 1e-9 # guess ref_period = 1e-9 # guess
channel_handlers = create_channel_handlers( channel_handlers = create_channel_handlers(
vcd_manager, devices, vcd_manager, devices, ref_period,
dump.log_channel, dump.dds_channel, dump.dds_onehot_sel) dump.log_channel, dump.dds_channel, dump.dds_onehot_sel)
slack = vcd_manager.get_channel("rtio_slack", 64) slack = vcd_manager.get_channel("rtio_slack", 64)