Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b931096ec39d
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a871194ee4c4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 26, 2015

  1. coredevice/analyzer: update rtio_slack on output messages only

    @sbourdeauducq
    sbourdeauducq committed Dec 26, 2015
    Copy the full SHA
    2b70fa1 View commit details

  2. coredevice/analyzer: prefix channel names with their types

    @sbourdeauducq
    sbourdeauducq committed Dec 26, 2015
    Copy the full SHA
    a871194 View commit details
Showing with 4 additions and 5 deletions.
  1. +4 −5 artiq/coredevice/analyzer.py
9 changes: 4 additions & 5 deletions artiq/coredevice/analyzer.py
View file
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ def set_time(self, time):
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 @@ def __init__(self, vcd_manager, dds_type, onehot_sel, sysclk):
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]
@@ -312,7 +312,6 @@ def decoded_dump_to_vcd(fileobj, devices, dump):
vcd_manager.set_time(
get_message_time(message) - start_time)
channel_handlers[message.channel].process_message(message)
if (hasattr(message, "rtio_counter")
and hasattr(message, "timestamp")):
if isinstance(message, OutputMessage):
slack.set_value_double(
(message.timestamp - message.rtio_counter)*ref_period)