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

dashboard moninj: check if ad9910 was init

This commit is contained in:
mwojcik 2022-09-08 15:55:20 +08:00 committed by Sébastien Bourdeauducq
parent f2c3f95040
commit 81ef484864
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
artiq/dashboard/moninj.py
View File

@ -8,7 +8,10 @@ from PyQt5 import QtCore, QtWidgets, QtGui
from sipyco.sync_struct import Subscriber from sipyco.sync_struct import Subscriber
from artiq.coredevice.comm_moninj import * from artiq.coredevice.comm_moninj import *
from artiq.coredevice.ad9910 import _AD9910_REG_PROFILE0, _AD9910_REG_PROFILE7, _AD9910_REG_FTW from artiq.coredevice.ad9910 import (
_AD9910_REG_PROFILE0, _AD9910_REG_PROFILE7,
_AD9910_REG_FTW, _AD9910_REG_CFR1
)
from artiq.coredevice.ad9912_reg import AD9912_POW1, AD9912_SER_CONF from artiq.coredevice.ad9912_reg import AD9912_POW1, AD9912_SER_CONF
from artiq.gui.tools import LayoutWidget from artiq.gui.tools import LayoutWidget
from artiq.gui.flowlayout import FlowLayout from artiq.gui.flowlayout import FlowLayout
@ -584,8 +587,12 @@ class _DeviceManager:
self.{dds_channel}.init() self.{dds_channel}.init()
""".format(dds_channel=dds_channel, cfgreg=AD9912_SER_CONF) """.format(dds_channel=dds_channel, cfgreg=AD9912_SER_CONF)
elif dds_model.dds_type == "AD9910": elif dds_model.dds_type == "AD9910":
# TODO: verify AD9910 behavior (when we have hardware) # -1 before init, 2 after
channel_init = "self.{dds_channel}.init()".format(dds_channel=dds_channel) channel_init = """
if self.{dds_channel}.read32({cfgreg}) == -1:
delay(10*ms)
self.{dds_channel}.init()
""".format(dds_channel=dds_channel, cfgreg=AD9912_SER_CONF)
else: else:
channel_init = "self.{dds_channel}.init()".format(dds_channel=dds_channel) channel_init = "self.{dds_channel}.init()".format(dds_channel=dds_channel)