srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

ad9910 adding phase, freq in progress

This commit is contained in:
Simon Renblad 2024-07-11 16:37:49 +08:00
parent e72986eee8
commit 79dc8a6c5f
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
artiq/coredevice/comm_analyzer.py
View File

@ -10,6 +10,8 @@ import logging
import socket import socket
import math import math
from artiq.coredevice import spi2, urukul
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -469,6 +471,18 @@ class DDSHandler:
class AD9910Handler: class AD9910Handler:
_AD9910_REG_FTW = 0x07
# shifted by << 24 so need to shift >> by 24 to confirm
# also is a length 8 during the address
# and 32 for the actual value
# for the data transfer -> spi.SPI_END is ORed in with the flags
_AD9910_REG_POW = 0x08
# the spi flag is from urukul
# SPI_CONFIG = (0 * spi.SPI_OFFLINE | 0 * spi.SPI_END |
# 0 * spi.SPI_INPUT | 1 * spi.SPI_CS_POLARITY |
# 0 * spi.SPI_CLK_POLARITY | 0 * spi.SPI_CLK_PHASE |
# 0 * spi.SPI_LSB_FIRST | 0 * spi.SPI_HALF_DUPLEX)
def __init__(self, manager, cpld): def __init__(self, manager, cpld):
self.manager = manager self.manager = manager
self.dds_channels = dict() self.dds_channels = dict()
@ -476,8 +490,8 @@ class AD9910Handler:
# needs to change depending on the structure of the urukul driver # needs to change depending on the structure of the urukul driver
def add_dds_channel(self, name, dds_channel_nr): def add_dds_channel(self, name, dds_channel_nr):
dds_channel = dict() dds_channel = dict()
frequency_precision = max(0, math.ceil(math.log10(2**32 / self.sysclk) + 6)) # fixme # frequency_precision = max(0, math.ceil(math.log10(2**32 / self.sysclk) + 6)) # fixme
phase_precision = max(0, math.ceil(math.log10(2**16))) # phase_precision = max(0, math.ceil(math.log10(2**16)))
with self.manager.scope("dds", name): with self.manager.scope("dds", name):
dds_channel["vcd_frequency"] = \ dds_channel["vcd_frequency"] = \
self.manager.get_channel(name + "/frequency", 64, self.manager.get_channel(name + "/frequency", 64,
@ -492,6 +506,7 @@ class AD9910Handler:
dds_channel["pow"] = None dds_channel["pow"] = None
self.dds_channels[dds_channel_nr] = dds_channel self.dds_channels[dds_channel_nr] = dds_channel
self.selected_channel = None self.selected_channel = None
self.ftw_or_pow = None
def process_message(self, message): def process_message(self, message):
if isinstance(message, OutputMessage): if isinstance(message, OutputMessage):
@ -505,14 +520,21 @@ class AD9910Handler:
self.length = data >> 8 & 0x1f self.length = data >> 8 & 0x1f
self.flags = data & 0xff self.flags = data & 0xff
elif address == 0: # write elif address == 0: # write
# TODO determine the various conditions for a write dds_channel = self.dds_channels[self.chip_sel]
if self.flags == urukul.SPI_CONFIG:
# TODO determine if it is a config write (ie setting the address) # setting the address
if data == 0x07:
# check the values set for config dds_channel["ftw_or_pow"] = True
# ensure that config has SPI_END flag + there is a chip_select elif self.flags == urukul.SPI_CONFIG | spi2.SPI_END:
# only accept chip_sel with ftw word if dds_channel["ftw_or_pow"]:
self.channels["write"].set_value("{:032b}".format(data)) frequency = data / 2**32 # TODO: add the actual conversion from mu to freq
dds_channel["vcd_frequency"].set_value_double(frequency)
else:
addr = data >> 24
if addr == 0x08: # pow is being set
pow = (data >> 8) & 0xffff
phase_offset = pow / 2**16 # TODO: use the actual conversion
dds_channel["vcd_phase"].set_value_double(phase_offset)
else: else:
raise ValueError("bad address", address) raise ValueError("bad address", address)