From 247f10176a1b0742a238b57707e460206f0d84ad Mon Sep 17 00:00:00 2001 From: mwojcik Date: Thu, 8 Sep 2022 15:55:20 +0800 Subject: [PATCH] dashboard moninj: check if ad9910 was init --- artiq/dashboard/moninj.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/artiq/dashboard/moninj.py b/artiq/dashboard/moninj.py index ec987d874..b6c388022 100644 --- a/artiq/dashboard/moninj.py +++ b/artiq/dashboard/moninj.py @@ -8,7 +8,10 @@ from PyQt5 import QtCore, QtWidgets, QtGui from sipyco.sync_struct import Subscriber 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.gui.tools import LayoutWidget from artiq.gui.flowlayout import FlowLayout @@ -584,8 +587,12 @@ class _DeviceManager: self.{dds_channel}.init() """.format(dds_channel=dds_channel, cfgreg=AD9912_SER_CONF) elif dds_model.dds_type == "AD9910": - # TODO: verify AD9910 behavior (when we have hardware) - channel_init = "self.{dds_channel}.init()".format(dds_channel=dds_channel) + # -1 before init, 2 after + 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: channel_init = "self.{dds_channel}.init()".format(dds_channel=dds_channel)