mirror of https://github.com/m-labs/artiq.git
dashboard: handle device dependencies in moninj
This commit is contained in:
parent
c98fe70cfa
commit
dc9327e056
|
|
@ -1,6 +1,6 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
import logging
|
import logging
|
||||||
from itertools import chain
|
from collections import namedtuple
|
||||||
|
|
||||||
from PyQt5 import QtCore, QtWidgets, QtGui
|
from PyQt5 import QtCore, QtWidgets, QtGui
|
||||||
|
|
||||||
|
|
@ -14,11 +14,11 @@ logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class _TTLWidget(QtWidgets.QFrame):
|
class _TTLWidget(QtWidgets.QFrame):
|
||||||
def __init__(self, channel, set_mode, force_out, title):
|
def __init__(self, dm, channel, force_out, title):
|
||||||
QtWidgets.QFrame.__init__(self)
|
QtWidgets.QFrame.__init__(self)
|
||||||
|
|
||||||
self.channel = channel
|
self.channel = channel
|
||||||
self.set_mode = set_mode
|
self.set_mode = dm.ttl_set_mode
|
||||||
self.force_out = force_out
|
self.force_out = force_out
|
||||||
|
|
||||||
self.setFrameShape(QtWidgets.QFrame.Box)
|
self.setFrameShape(QtWidgets.QFrame.Box)
|
||||||
|
|
@ -165,7 +165,7 @@ class _SimpleDisplayWidget(QtWidgets.QFrame):
|
||||||
|
|
||||||
|
|
||||||
class _DDSWidget(_SimpleDisplayWidget):
|
class _DDSWidget(_SimpleDisplayWidget):
|
||||||
def __init__(self, bus_channel, channel, title):
|
def __init__(self, dm, bus_channel, channel, title):
|
||||||
self.bus_channel = bus_channel
|
self.bus_channel = bus_channel
|
||||||
self.channel = channel
|
self.channel = channel
|
||||||
self.cur_frequency = 0
|
self.cur_frequency = 0
|
||||||
|
|
@ -180,7 +180,7 @@ class _DDSWidget(_SimpleDisplayWidget):
|
||||||
|
|
||||||
|
|
||||||
class _DACWidget(_SimpleDisplayWidget):
|
class _DACWidget(_SimpleDisplayWidget):
|
||||||
def __init__(self, spi_channel, channel, title):
|
def __init__(self, dm, spi_channel, channel, title):
|
||||||
self.spi_channel = spi_channel
|
self.spi_channel = spi_channel
|
||||||
self.channel = channel
|
self.channel = channel
|
||||||
self.cur_value = 0
|
self.cur_value = 0
|
||||||
|
|
@ -194,106 +194,131 @@ class _DACWidget(_SimpleDisplayWidget):
|
||||||
return (self.spi_channel, self.channel)
|
return (self.spi_channel, self.channel)
|
||||||
|
|
||||||
|
|
||||||
|
_WidgetDesc = namedtuple("_WidgetDesc", "uid comment cls arguments")
|
||||||
|
|
||||||
|
|
||||||
|
def setup_from_ddb(ddb):
|
||||||
|
core_addr = None
|
||||||
|
dds_sysclk = None
|
||||||
|
description = set()
|
||||||
|
|
||||||
|
for k, v in ddb.items():
|
||||||
|
comment = None
|
||||||
|
if "comment" in v:
|
||||||
|
comment = v["comment"]
|
||||||
|
try:
|
||||||
|
if isinstance(v, dict) and v["type"] == "local":
|
||||||
|
if k == "core":
|
||||||
|
core_addr = v["arguments"]["host"]
|
||||||
|
elif v["module"] == "artiq.coredevice.ttl":
|
||||||
|
channel = v["arguments"]["channel"]
|
||||||
|
force_out = v["class"] == "TTLOut"
|
||||||
|
widget = _WidgetDesc(k, comment, _TTLWidget, (channel, force_out, k))
|
||||||
|
description.add(widget)
|
||||||
|
elif (v["module"] == "artiq.coredevice.dds"
|
||||||
|
and v["class"] == "DDSGroupAD9914"):
|
||||||
|
dds_sysclk = v["arguments"]["sysclk"]
|
||||||
|
elif (v["module"] == "artiq.coredevice.dds"
|
||||||
|
and v["class"] == "DDSChannelAD9914"):
|
||||||
|
bus_channel = v["arguments"]["bus_channel"]
|
||||||
|
channel = v["arguments"]["channel"]
|
||||||
|
widget = _WidgetDesc(k, comment, _DDSWidget, (bus_channel, channel, k))
|
||||||
|
description.add(widget)
|
||||||
|
elif (v["module"] == "artiq.coredevice.ad5360"
|
||||||
|
and v["class"] == "AD5360"):
|
||||||
|
spi_device = v["arguments"]["spi_device"]
|
||||||
|
spi_device = ddb[spi_device]
|
||||||
|
while isinstance(spi_device, str):
|
||||||
|
spi_device = ddb[spi_device]
|
||||||
|
spi_channel = spi_device["arguments"]["channel"]
|
||||||
|
for channel in range(32):
|
||||||
|
widget = _WidgetDesc((k, channel), comment, _DACWidget, (spi_channel, channel, k))
|
||||||
|
description.add(widget)
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
return core_addr, dds_sysclk, description
|
||||||
|
|
||||||
|
|
||||||
class _DeviceManager:
|
class _DeviceManager:
|
||||||
def __init__(self, init):
|
def __init__(self):
|
||||||
self.core_addr = None
|
self.core_addr = None
|
||||||
self.new_core_addr = asyncio.Event()
|
self.new_core_addr = asyncio.Event()
|
||||||
self.core_connection = None
|
self.core_connection = None
|
||||||
self.core_connector_task = asyncio.ensure_future(self.core_connector())
|
self.core_connector_task = asyncio.ensure_future(self.core_connector())
|
||||||
|
|
||||||
|
self.ddb = dict()
|
||||||
|
self.description = set()
|
||||||
|
self.widgets_by_uid = dict()
|
||||||
|
|
||||||
self.dds_sysclk = 0
|
self.dds_sysclk = 0
|
||||||
self.ttl_cb = lambda: None
|
self.ttl_cb = lambda: None
|
||||||
self.ttl_widgets = dict()
|
self.ttl_widgets = dict()
|
||||||
self.ttl_widgets_by_channel = dict()
|
|
||||||
self.dds_cb = lambda: None
|
self.dds_cb = lambda: None
|
||||||
self.dds_widgets = dict()
|
self.dds_widgets = dict()
|
||||||
self.dds_widgets_by_channel = dict()
|
|
||||||
self.dac_cb = lambda: None
|
self.dac_cb = lambda: None
|
||||||
self.dac_widgets = dict()
|
self.dac_widgets = dict()
|
||||||
self.dac_widgets_by_channel = dict()
|
|
||||||
for k, v in init.items():
|
|
||||||
self[k] = v
|
|
||||||
|
|
||||||
def __setitem__(self, k, v):
|
def init_ddb(self, ddb):
|
||||||
if k in self.ttl_widgets:
|
self.ddb = ddb
|
||||||
del self[k]
|
return ddb
|
||||||
if k in self.dds_widgets:
|
|
||||||
del self[k]
|
|
||||||
if k in self.dac_widgets:
|
|
||||||
del self[k]
|
|
||||||
if not isinstance(v, dict):
|
|
||||||
return
|
|
||||||
widgets = []
|
|
||||||
try:
|
|
||||||
if v["type"] == "local":
|
|
||||||
if k == "core":
|
|
||||||
self.core_addr = v["arguments"]["host"]
|
|
||||||
self.new_core_addr.set()
|
|
||||||
elif v["module"] == "artiq.coredevice.ttl":
|
|
||||||
channel = v["arguments"]["channel"]
|
|
||||||
force_out = v["class"] == "TTLOut"
|
|
||||||
widget = _TTLWidget(
|
|
||||||
channel, self.ttl_set_mode, force_out, k)
|
|
||||||
self.ttl_widgets[k] = widget
|
|
||||||
self.ttl_widgets_by_channel[channel] = widget
|
|
||||||
self.ttl_cb()
|
|
||||||
self.setup_ttl_monitoring(True, channel)
|
|
||||||
widgets.append(widget)
|
|
||||||
elif (v["module"] == "artiq.coredevice.dds"
|
|
||||||
and v["class"] == "DDSGroupAD9914"):
|
|
||||||
self.dds_sysclk = v["arguments"]["sysclk"]
|
|
||||||
elif (v["module"] == "artiq.coredevice.dds"
|
|
||||||
and v["class"] == "DDSChannelAD9914"):
|
|
||||||
bus_channel = v["arguments"]["bus_channel"]
|
|
||||||
channel = v["arguments"]["channel"]
|
|
||||||
widget = _DDSWidget(bus_channel, channel, k)
|
|
||||||
self.dds_widgets[k] = widget
|
|
||||||
self.dds_widgets_by_channel[(bus_channel, channel)] = widget
|
|
||||||
self.dds_cb()
|
|
||||||
self.setup_dds_monitoring(True, bus_channel, channel)
|
|
||||||
widgets.append(widget)
|
|
||||||
elif (v["module"] == "artiq.coredevice.ad5360"
|
|
||||||
and v["class"] == "AD5360"):
|
|
||||||
spi_channel = 27 # TODO/FIXME
|
|
||||||
for channel in range(32):
|
|
||||||
widget = _DACWidget(spi_channel, channel, k)
|
|
||||||
self.dac_widgets_by_channel[(spi_channel, channel)] = widget
|
|
||||||
self.setup_dds_monitoring(True, spi_channel, channel)
|
|
||||||
widgets.append(widget)
|
|
||||||
self.dac_widgets[k+str(channel)] = widgets
|
|
||||||
self.dac_cb()
|
|
||||||
except KeyError:
|
|
||||||
pass
|
|
||||||
if "comment" in v:
|
|
||||||
for widget in widgets:
|
|
||||||
widget.setToolTip(v["comment"])
|
|
||||||
|
|
||||||
def __delitem__(self, k):
|
def notify(self, mod):
|
||||||
if k in self.ttl_widgets:
|
core_addr, dds_sysclk, description = setup_from_ddb(self.ddb)
|
||||||
widget = self.ttl_widgets[k]
|
|
||||||
self.setup_ttl_monitoring(False, widget.channel)
|
if core_addr != self.core_addr:
|
||||||
widget.deleteLater()
|
self.core_addr = core_addr
|
||||||
del self.ttl_widgets_by_channel[widget.channel]
|
self.new_core_addr.set()
|
||||||
del self.ttl_widgets[k]
|
|
||||||
self.ttl_cb()
|
self.dds_sysclk = dds_sysclk
|
||||||
if k in self.dds_widgets:
|
|
||||||
widget = self.dds_widgets[k]
|
for to_remove in self.description - description:
|
||||||
self.setup_dds_monitoring(False, widget.bus_channel, widget.channel)
|
widget = self.widgets_by_uid[to_remove.uid]
|
||||||
widget.deleteLater()
|
del self.widgets_by_uid[to_remove.uid]
|
||||||
del self.dds_widgets_by_channel[(widget.bus_channel, widget.channel)]
|
|
||||||
del self.dds_widgets[k]
|
if isinstance(widget, _TTLWidget):
|
||||||
self.dds_cb()
|
self.setup_ttl_monitoring(False, widget.channel)
|
||||||
if k in self.dac_widgets:
|
widget.deleteLater()
|
||||||
for widget in self.dac_widgets[k]:
|
del self.ttl_widgets[widget.channel]
|
||||||
|
self.ttl_cb()
|
||||||
|
elif isinstance(widget, _DDSWidget):
|
||||||
|
self.setup_dds_monitoring(False, widget.bus_channel, widget.channel)
|
||||||
|
widget.deleteLater()
|
||||||
|
del self.dds_widgets[(widget.bus_channel, widget.channel)]
|
||||||
|
self.dds_cb()
|
||||||
|
elif isinstance(widget, _DACWidget):
|
||||||
self.setup_dac_monitoring(False, widget.spi_channel, widget.channel)
|
self.setup_dac_monitoring(False, widget.spi_channel, widget.channel)
|
||||||
widget.deleteLater()
|
widget.deleteLater()
|
||||||
del self.dac_widgets_by_channel[(widget.spi_channel, widget.channel)]
|
del self.dac_widgets[(widget.spi_channel, widget.channel)]
|
||||||
del self.dac_widgets[k]
|
self.dac_cb()
|
||||||
self.dds_cb()
|
else:
|
||||||
|
raise ValueError
|
||||||
|
|
||||||
|
for to_add in description - self.description:
|
||||||
|
widget = to_add.cls(self, *to_add.arguments)
|
||||||
|
if to_add.comment is not None:
|
||||||
|
widget.setToolTip(to_add.comment)
|
||||||
|
self.widgets_by_uid[to_add.uid] = widget
|
||||||
|
|
||||||
|
if isinstance(widget, _TTLWidget):
|
||||||
|
self.ttl_widgets[widget.channel] = widget
|
||||||
|
self.ttl_cb()
|
||||||
|
self.setup_ttl_monitoring(True, widget.channel)
|
||||||
|
elif isinstance(widget, _DDSWidget):
|
||||||
|
self.dds_widgets[(widget.bus_channel, widget.channel)] = widget
|
||||||
|
self.dds_cb()
|
||||||
|
self.setup_dds_monitoring(True, widget.bus_channel, widget.channel)
|
||||||
|
elif isinstance(widget, _DACWidget):
|
||||||
|
self.dac_widgets[(widget.spi_channel, widget.channel)] = widget
|
||||||
|
self.dac_cb()
|
||||||
|
self.setup_dac_monitoring(True, widget.spi_channel, widget.channel)
|
||||||
|
else:
|
||||||
|
raise ValueError
|
||||||
|
|
||||||
|
self.description = description
|
||||||
|
|
||||||
def ttl_set_mode(self, channel, mode):
|
def ttl_set_mode(self, channel, mode):
|
||||||
if self.core_connection is not None:
|
if self.core_connection is not None:
|
||||||
widget = self.ttl_widgets_by_channel[channel]
|
widget = self.ttl_widgets[channel]
|
||||||
if mode == "0":
|
if mode == "0":
|
||||||
widget.cur_override = True
|
widget.cur_override = True
|
||||||
widget.cur_level = False
|
widget.cur_level = False
|
||||||
|
|
@ -330,25 +355,25 @@ class _DeviceManager:
|
||||||
self.core_connection.monitor(enable, spi_channel, channel)
|
self.core_connection.monitor(enable, spi_channel, channel)
|
||||||
|
|
||||||
def monitor_cb(self, channel, probe, value):
|
def monitor_cb(self, channel, probe, value):
|
||||||
if channel in self.ttl_widgets_by_channel:
|
if channel in self.ttl_widgets:
|
||||||
widget = self.ttl_widgets_by_channel[channel]
|
widget = self.ttl_widgets[channel]
|
||||||
if probe == TTLProbe.level.value:
|
if probe == TTLProbe.level.value:
|
||||||
widget.cur_level = bool(value)
|
widget.cur_level = bool(value)
|
||||||
elif probe == TTLProbe.oe.value:
|
elif probe == TTLProbe.oe.value:
|
||||||
widget.cur_oe = bool(value)
|
widget.cur_oe = bool(value)
|
||||||
widget.refresh_display()
|
widget.refresh_display()
|
||||||
if (channel, probe) in self.dds_widgets_by_channel:
|
if (channel, probe) in self.dds_widgets:
|
||||||
widget = self.dds_widgets_by_channel[(channel, probe)]
|
widget = self.dds_widgets[(channel, probe)]
|
||||||
widget.cur_frequency = value*self.dds_sysclk/2**32
|
widget.cur_frequency = value*self.dds_sysclk/2**32
|
||||||
widget.refresh_display()
|
widget.refresh_display()
|
||||||
if (channel, probe) in self.dac_widgets_by_channel:
|
if (channel, probe) in self.dac_widgets:
|
||||||
widget = self.dac_widgets_by_channel[(channel, probe)]
|
widget = self.dac_widgets[(channel, probe)]
|
||||||
widget.cur_value = value
|
widget.cur_value = value
|
||||||
widget.refresh_display()
|
widget.refresh_display()
|
||||||
|
|
||||||
def injection_status_cb(self, channel, override, value):
|
def injection_status_cb(self, channel, override, value):
|
||||||
if channel in self.ttl_widgets_by_channel:
|
if channel in self.ttl_widgets:
|
||||||
self.ttl_widgets_by_channel[channel].cur_override = bool(value)
|
self.ttl_widgets[channel].cur_override = bool(value)
|
||||||
|
|
||||||
async def core_connector(self):
|
async def core_connector(self):
|
||||||
while True:
|
while True:
|
||||||
|
|
@ -365,11 +390,11 @@ class _DeviceManager:
|
||||||
logger.error("failed to connect to core device moninj", exc_info=True)
|
logger.error("failed to connect to core device moninj", exc_info=True)
|
||||||
else:
|
else:
|
||||||
self.core_connection = new_core_connection
|
self.core_connection = new_core_connection
|
||||||
for ttl_channel in self.ttl_widgets_by_channel.keys():
|
for ttl_channel in self.ttl_widgets.keys():
|
||||||
self.setup_ttl_monitoring(True, ttl_channel)
|
self.setup_ttl_monitoring(True, ttl_channel)
|
||||||
for bus_channel, channel in self.dds_widgets_by_channel.keys():
|
for bus_channel, channel in self.dds_widgets.keys():
|
||||||
self.setup_dds_monitoring(True, bus_channel, channel)
|
self.setup_dds_monitoring(True, bus_channel, channel)
|
||||||
for spi_channel, channel in self.dac_widgets_by_channel.keys():
|
for spi_channel, channel in self.dac_widgets.keys():
|
||||||
self.setup_dac_monitoring(True, spi_channel, channel)
|
self.setup_dac_monitoring(True, spi_channel, channel)
|
||||||
|
|
||||||
async def close(self):
|
async def close(self):
|
||||||
|
|
@ -389,7 +414,6 @@ class _MonInjDock(QtWidgets.QDockWidget):
|
||||||
self.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable |
|
self.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable |
|
||||||
QtWidgets.QDockWidget.DockWidgetFloatable)
|
QtWidgets.QDockWidget.DockWidgetFloatable)
|
||||||
|
|
||||||
|
|
||||||
def layout_widgets(self, widgets):
|
def layout_widgets(self, widgets):
|
||||||
scroll_area = QtWidgets.QScrollArea()
|
scroll_area = QtWidgets.QScrollArea()
|
||||||
self.setWidget(scroll_area)
|
self.setWidget(scroll_area)
|
||||||
|
|
@ -411,8 +435,15 @@ class MonInj:
|
||||||
self.dds_dock = _MonInjDock("DDS")
|
self.dds_dock = _MonInjDock("DDS")
|
||||||
self.dac_dock = _MonInjDock("DAC")
|
self.dac_dock = _MonInjDock("DAC")
|
||||||
|
|
||||||
self.subscriber = Subscriber("devices", self.init_devices)
|
self.dm = _DeviceManager()
|
||||||
self.dm = None
|
self.dm.ttl_cb = lambda: self.ttl_dock.layout_widgets(
|
||||||
|
self.dm.ttl_widgets.values())
|
||||||
|
self.dm.dds_cb = lambda: self.dds_dock.layout_widgets(
|
||||||
|
self.dm.dds_widgets.values())
|
||||||
|
self.dm.dac_cb = lambda: self.dac_dock.layout_widgets(
|
||||||
|
self.dm.dac_widgets.values())
|
||||||
|
|
||||||
|
self.subscriber = Subscriber("devices", self.dm.init_ddb, self.dm.notify)
|
||||||
|
|
||||||
async def start(self, server, port):
|
async def start(self, server, port):
|
||||||
await self.subscriber.connect(server, port)
|
await self.subscriber.connect(server, port)
|
||||||
|
|
@ -421,16 +452,3 @@ class MonInj:
|
||||||
await self.subscriber.close()
|
await self.subscriber.close()
|
||||||
if self.dm is not None:
|
if self.dm is not None:
|
||||||
await self.dm.close()
|
await self.dm.close()
|
||||||
|
|
||||||
def init_devices(self, d):
|
|
||||||
self.dm = _DeviceManager(d)
|
|
||||||
self.dm.ttl_cb = lambda: self.ttl_dock.layout_widgets(
|
|
||||||
self.dm.ttl_widgets.values())
|
|
||||||
self.dm.dds_cb = lambda: self.dds_dock.layout_widgets(
|
|
||||||
self.dm.dds_widgets.values())
|
|
||||||
self.dm.dac_cb = lambda: self.dac_dock.layout_widgets(
|
|
||||||
chain(*self.dm.dac_widgets.values()))
|
|
||||||
self.dm.ttl_cb()
|
|
||||||
self.dm.dds_cb()
|
|
||||||
self.dm.dac_cb()
|
|
||||||
return self.dm
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue