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

analyzer: fix AD9914 FTW decoding

This commit is contained in:
Sebastien Bourdeauducq 2016-03-15 22:02:29 +08:00
parent 6a9957a2ac
commit 0076fc4216
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/coredevice/analyzer.py
View File

@ -230,13 +230,15 @@ class DDSHandler:
self.selected_dds_channels = self._gpio_to_channels(message.data) self.selected_dds_channels = self._gpio_to_channels(message.data)
for dds_channel_nr in self.selected_dds_channels: for dds_channel_nr in self.selected_dds_channels:
dds_channel = self.dds_channels[dds_channel_nr] dds_channel = self.dds_channels[dds_channel_nr]
if message.address in range(0x2d, 0x2f): if message.address == 0x2d:
dds_channel["ftw"][message.address - 0x2d] = message.data dds_channel["ftw"][0] = message.data
elif message.address == 0x2f:
dds_channel["ftw"][1] = message.data
elif message.address == 0x31: elif message.address == 0x31:
dds_channel["pow"] = message.data dds_channel["pow"] = message.data
elif message.address == 0x80: # FUD elif message.address == 0x80: # FUD
if None not in dds_channel["ftw"]: 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"])) for i, x in enumerate(dds_channel["ftw"]))
frequency = ftw*self.sysclk/2**32 frequency = ftw*self.sysclk/2**32
dds_channel["vcd_frequency"].set_value_double(frequency) dds_channel["vcd_frequency"].set_value_double(frequency)