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

artiq_dashboard: remove references to core device in moninj

This commit is contained in:
Sebastien Bourdeauducq 2022-03-19 22:36:04 +08:00
parent 207717c740
commit 735133a2b4
1 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
artiq/dashboard/moninj.py
View File

@ -202,7 +202,7 @@ _WidgetDesc = namedtuple("_WidgetDesc", "uid comment cls arguments")
def setup_from_ddb(ddb): def setup_from_ddb(ddb):
core_addr = None mi_addr = None
dds_sysclk = None dds_sysclk = None
description = set() description = set()
@ -212,7 +212,7 @@ def setup_from_ddb(ddb):
comment = v.get("comment") comment = v.get("comment")
if v["type"] == "local": if v["type"] == "local":
if k == "core": if k == "core":
core_addr = v["arguments"]["host"] mi_addr = v["arguments"]["host"]
elif v["module"] == "artiq.coredevice.ttl": elif v["module"] == "artiq.coredevice.ttl":
channel = v["arguments"]["channel"] channel = v["arguments"]["channel"]
force_out = v["class"] == "TTLOut" force_out = v["class"] == "TTLOut"
@ -237,15 +237,15 @@ def setup_from_ddb(ddb):
description.add(widget) description.add(widget)
except KeyError: except KeyError:
pass pass
return core_addr, dds_sysclk, description return mi_addr, dds_sysclk, description
class _DeviceManager: class _DeviceManager:
def __init__(self): def __init__(self):
self.core_addr = None self.mi_addr = None
self.reconnect_core = asyncio.Event() self.reconnect_mi = asyncio.Event()
self.core_connection = None self.mi_connection = None
self.core_connector_task = asyncio.ensure_future(self.core_connector()) self.mi_connector_task = asyncio.ensure_future(self.mi_connector())
self.ddb = dict() self.ddb = dict()
self.description = set() self.description = set()
@ -264,11 +264,11 @@ class _DeviceManager:
return ddb return ddb
def notify(self, mod): def notify(self, mod):
core_addr, dds_sysclk, description = setup_from_ddb(self.ddb) mi_addr, dds_sysclk, description = setup_from_ddb(self.ddb)
if core_addr != self.core_addr: if mi_addr != self.mi_addr:
self.core_addr = core_addr self.mi_addr = mi_addr
self.reconnect_core.set() self.reconnect_mi.set()
self.dds_sysclk = dds_sysclk self.dds_sysclk = dds_sysclk
@ -318,44 +318,44 @@ class _DeviceManager:
self.description = description 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.mi_connection is not None:
widget = self.ttl_widgets[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
self.core_connection.inject(channel, TTLOverride.level.value, 0) self.mi_connection.inject(channel, TTLOverride.level.value, 0)
self.core_connection.inject(channel, TTLOverride.oe.value, 1) self.mi_connection.inject(channel, TTLOverride.oe.value, 1)
self.core_connection.inject(channel, TTLOverride.en.value, 1) self.mi_connection.inject(channel, TTLOverride.en.value, 1)
elif mode == "1": elif mode == "1":
widget.cur_override = True widget.cur_override = True
widget.cur_level = True widget.cur_level = True
self.core_connection.inject(channel, TTLOverride.level.value, 1) self.mi_connection.inject(channel, TTLOverride.level.value, 1)
self.core_connection.inject(channel, TTLOverride.oe.value, 1) self.mi_connection.inject(channel, TTLOverride.oe.value, 1)
self.core_connection.inject(channel, TTLOverride.en.value, 1) self.mi_connection.inject(channel, TTLOverride.en.value, 1)
elif mode == "exp": elif mode == "exp":
widget.cur_override = False widget.cur_override = False
self.core_connection.inject(channel, TTLOverride.en.value, 0) self.mi_connection.inject(channel, TTLOverride.en.value, 0)
else: else:
raise ValueError raise ValueError
# override state may have changed # override state may have changed
widget.refresh_display() widget.refresh_display()
def setup_ttl_monitoring(self, enable, channel): def setup_ttl_monitoring(self, enable, channel):
if self.core_connection is not None: if self.mi_connection is not None:
self.core_connection.monitor_probe(enable, channel, TTLProbe.level.value) self.mi_connection.monitor_probe(enable, channel, TTLProbe.level.value)
self.core_connection.monitor_probe(enable, channel, TTLProbe.oe.value) self.mi_connection.monitor_probe(enable, channel, TTLProbe.oe.value)
self.core_connection.monitor_injection(enable, channel, TTLOverride.en.value) self.mi_connection.monitor_injection(enable, channel, TTLOverride.en.value)
self.core_connection.monitor_injection(enable, channel, TTLOverride.level.value) self.mi_connection.monitor_injection(enable, channel, TTLOverride.level.value)
if enable: if enable:
self.core_connection.get_injection_status(channel, TTLOverride.en.value) self.mi_connection.get_injection_status(channel, TTLOverride.en.value)
def setup_dds_monitoring(self, enable, bus_channel, channel): def setup_dds_monitoring(self, enable, bus_channel, channel):
if self.core_connection is not None: if self.mi_connection is not None:
self.core_connection.monitor_probe(enable, bus_channel, channel) self.mi_connection.monitor_probe(enable, bus_channel, channel)
def setup_dac_monitoring(self, enable, spi_channel, channel): def setup_dac_monitoring(self, enable, spi_channel, channel):
if self.core_connection is not None: if self.mi_connection is not None:
self.core_connection.monitor_probe(enable, spi_channel, channel) self.mi_connection.monitor_probe(enable, spi_channel, channel)
def monitor_cb(self, channel, probe, value): def monitor_cb(self, channel, probe, value):
if channel in self.ttl_widgets: if channel in self.ttl_widgets:
@ -384,29 +384,29 @@ class _DeviceManager:
widget.refresh_display() widget.refresh_display()
def disconnect_cb(self): def disconnect_cb(self):
logger.error("lost connection to core device moninj") logger.error("lost connection to moninj")
self.reconnect_core.set() self.reconnect_mi.set()
async def core_connector(self): async def mi_connector(self):
while True: while True:
await self.reconnect_core.wait() await self.reconnect_mi.wait()
self.reconnect_core.clear() self.reconnect_mi.clear()
if self.core_connection is not None: if self.mi_connection is not None:
await self.core_connection.close() await self.mi_connection.close()
self.core_connection = None self.mi_connection = None
new_core_connection = CommMonInj(self.monitor_cb, self.injection_status_cb, new_mi_connection = CommMonInj(self.monitor_cb, self.injection_status_cb,
self.disconnect_cb) self.disconnect_cb)
try: try:
await new_core_connection.connect(self.core_addr, 1383) await new_mi_connection.connect(self.mi_addr, 1383)
except asyncio.CancelledError: except asyncio.CancelledError:
logger.info("cancelled connection to core device moninj") logger.info("cancelled connection to moninj")
break break
except: except:
logger.error("failed to connect to core device moninj", exc_info=True) logger.error("failed to connect to moninj", exc_info=True)
await asyncio.sleep(10.) await asyncio.sleep(10.)
self.reconnect_core.set() self.reconnect_mi.set()
else: else:
self.core_connection = new_core_connection self.mi_connection = new_mi_connection
for ttl_channel in self.ttl_widgets.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.keys(): for bus_channel, channel in self.dds_widgets.keys():
@ -415,13 +415,13 @@ class _DeviceManager:
self.setup_dac_monitoring(True, spi_channel, channel) self.setup_dac_monitoring(True, spi_channel, channel)
async def close(self): async def close(self):
self.core_connector_task.cancel() self.mi_connector_task.cancel()
try: try:
await asyncio.wait_for(self.core_connector_task, None) await asyncio.wait_for(self.mi_connector_task, None)
except asyncio.CancelledError: except asyncio.CancelledError:
pass pass
if self.core_connection is not None: if self.mi_connection is not None:
await self.core_connection.close() await self.mi_connection.close()
class _MonInjDock(QtWidgets.QDockWidget): class _MonInjDock(QtWidgets.QDockWidget):