From b78a72ac9bdbfcc1d89acbf4475a16f62bada04c Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 16 Jan 2024 16:19:35 +0800 Subject: [PATCH] artiq_dashboard: major refactor to proxy connectors --- artiq/frontend/artiq_dashboard.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/artiq/frontend/artiq_dashboard.py b/artiq/frontend/artiq_dashboard.py index 3b9b772b0..47d584ec5 100755 --- a/artiq/frontend/artiq_dashboard.py +++ b/artiq/frontend/artiq_dashboard.py @@ -216,8 +216,12 @@ def main(): broadcast_clients["ccb"].notify_cbs.append(d_applets.ccb_notify) d_waveform = waveform.WaveformDock() - loop.run_until_complete(d_waveform.proxy_client.start(args.server, args.port_notify)) - atexit_register_coroutine(d_waveform.proxy_client.stop, loop=loop) + loop.run_until_complete(d_waveform.devices_sub.connect(args.server, args.port_notify)) + atexit_register_coroutine(d_waveform.devices_sub.close, loop=loop) + for name in ["rpc_client", "receiver_client"]: + client = getattr(d_waveform, name) + loop.run_until_complete(client.start()) + atexit_register_coroutine(client.close, loop=loop) d_ttl_dds = moninj.MonInj(rpc_clients["schedule"]) loop.run_until_complete(d_ttl_dds.start(args.server, args.port_notify))