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: 6a9957a2ace4
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: cb8e497ff6ea
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 15, 2016

  1. analyzer: fix AD9914 FTW decoding

    @sbourdeauducq
    sbourdeauducq committed Mar 15, 2016
    Copy the full SHA
    0076fc4 View commit details

  2. analyzer: fix DDSHandler setup

    @sbourdeauducq
    sbourdeauducq committed Mar 15, 2016
    Copy the full SHA
    cb8e497 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 artiq/coredevice/analyzer.py
10 changes: 6 additions & 4 deletions artiq/coredevice/analyzer.py
View file
Original file line number Diff line number Diff line change
@@ -230,13 +230,15 @@ def _decode_ad9914_write(self, message):
self.selected_dds_channels = self._gpio_to_channels(message.data)
for dds_channel_nr in self.selected_dds_channels:
dds_channel = self.dds_channels[dds_channel_nr]
if message.address in range(0x2d, 0x2f):
dds_channel["ftw"][message.address - 0x2d] = message.data
if message.address == 0x2d:
dds_channel["ftw"][0] = message.data
elif message.address == 0x2f:
dds_channel["ftw"][1] = message.data
elif message.address == 0x31:
dds_channel["pow"] = message.data
elif message.address == 0x80: # FUD
if None not in dds_channel["ftw"]:
ftw = sum(x << i*8
ftw = sum(x << i*16
for i, x in enumerate(dds_channel["ftw"]))
frequency = ftw*self.sysclk/2**32
dds_channel["vcd_frequency"].set_value_double(frequency)
@@ -354,7 +356,7 @@ def create_channel_handlers(vcd_manager, devices, ref_period,
raise ValueError("All DDS channels must have the same type")
else:
dds_handler = DDSHandler(vcd_manager, desc["class"],
dds_sysclk, dds_onehot_sel)
dds_onehot_sel, dds_sysclk)
channel_handlers[dds_bus_channel] = dds_handler
dds_handler.add_dds_channel(name, dds_channel)
return channel_handlers