From ec1efd7af990c4d2ad94c43a389374c7c1f94583 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 19 Mar 2022 22:50:36 +0800 Subject: [PATCH] dashboard: connect to moninj via proxy --- artiq/dashboard/moninj.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/dashboard/moninj.py b/artiq/dashboard/moninj.py index cdfd845dd..a9adc5678 100644 --- a/artiq/dashboard/moninj.py +++ b/artiq/dashboard/moninj.py @@ -211,9 +211,7 @@ def setup_from_ddb(ddb): if isinstance(v, dict): comment = v.get("comment") if v["type"] == "local": - if k == "core": - mi_addr = v["arguments"]["host"] - elif v["module"] == "artiq.coredevice.ttl": + if v["module"] == "artiq.coredevice.ttl": channel = v["arguments"]["channel"] force_out = v["class"] == "TTLOut" widget = _WidgetDesc(k, comment, _TTLWidget, (channel, force_out, k)) @@ -235,6 +233,8 @@ def setup_from_ddb(ddb): for channel in range(32): widget = _WidgetDesc((k, channel), comment, _DACWidget, (spi_channel, channel, k)) description.add(widget) + elif v["type"] == "controller" and k == "core_moninj": + mi_addr = v["host"] except KeyError: pass return mi_addr, dds_sysclk, description