M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

dashboard: connect to moninj via proxy

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

6
artiq/dashboard/moninj.py
View File

@ -211,9 +211,7 @@ def setup_from_ddb(ddb):
if isinstance(v, dict): if isinstance(v, dict):
comment = v.get("comment") comment = v.get("comment")
if v["type"] == "local": if v["type"] == "local":
if k == "core": if v["module"] == "artiq.coredevice.ttl":
mi_addr = v["arguments"]["host"]
elif v["module"] == "artiq.coredevice.ttl":
channel = v["arguments"]["channel"] channel = v["arguments"]["channel"]
force_out = v["class"] == "TTLOut" force_out = v["class"] == "TTLOut"
widget = _WidgetDesc(k, comment, _TTLWidget, (channel, force_out, k)) widget = _WidgetDesc(k, comment, _TTLWidget, (channel, force_out, k))
@ -235,6 +233,8 @@ def setup_from_ddb(ddb):
for channel in range(32): for channel in range(32):
widget = _WidgetDesc((k, channel), comment, _DACWidget, (spi_channel, channel, k)) widget = _WidgetDesc((k, channel), comment, _DACWidget, (spi_channel, channel, k))
description.add(widget) description.add(widget)
elif v["type"] == "controller" and k == "core_moninj":
mi_addr = v["host"]
except KeyError: except KeyError:
pass pass
return mi_addr, dds_sysclk, description return mi_addr, dds_sysclk, description