From df1513f0e96d28b4abaa706b78bb50698c647c71 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 19 Mar 2022 19:25:21 +0800 Subject: [PATCH] add aqctl_moninj_proxy to device dbs --- artiq/examples/kasli/device_db.py | 7 +++++++ artiq/examples/kasli_drtioswitching/device_db.py | 7 +++++++ artiq/examples/kasli_sawgmaster/device_db.py | 7 +++++++ artiq/examples/kasli_suservo/device_db.py | 7 +++++++ artiq/examples/kc705_nist_clock/device_db.py | 7 +++++++ artiq/examples/metlino_sayma_ttl/device_db.py | 7 +++++++ artiq/examples/sayma_master/device_db.py | 7 +++++++ 7 files changed, 49 insertions(+) diff --git a/artiq/examples/kasli/device_db.py b/artiq/examples/kasli/device_db.py index f4d39293e..a0263ee24 100644 --- a/artiq/examples/kasli/device_db.py +++ b/artiq/examples/kasli/device_db.py @@ -15,6 +15,13 @@ device_db = { "port": 1068, "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr }, + "core_moninj": { + "type": "controller", + "host": "::1", + "port_proxy": 1383, + "port": 1384, + "command": "aqctl_moninj_proxy --port-proxy {port_proxy} --port-control {port} --bind {bind} " + core_addr + }, "core_cache": { "type": "local", "module": "artiq.coredevice.cache", diff --git a/artiq/examples/kasli_drtioswitching/device_db.py b/artiq/examples/kasli_drtioswitching/device_db.py index 433eaf7bc..f9486393d 100644 --- a/artiq/examples/kasli_drtioswitching/device_db.py +++ b/artiq/examples/kasli_drtioswitching/device_db.py @@ -13,6 +13,13 @@ device_db = { "port": 1068, "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr }, + "core_moninj": { + "type": "controller", + "host": "::1", + "port_proxy": 1383, + "port": 1384, + "command": "aqctl_moninj_proxy --port-proxy {port_proxy} --port-control {port} --bind {bind} " + core_addr + }, "core_cache": { "type": "local", "module": "artiq.coredevice.cache", diff --git a/artiq/examples/kasli_sawgmaster/device_db.py b/artiq/examples/kasli_sawgmaster/device_db.py index 4cba2bbd2..1c555fdea 100644 --- a/artiq/examples/kasli_sawgmaster/device_db.py +++ b/artiq/examples/kasli_sawgmaster/device_db.py @@ -13,6 +13,13 @@ device_db = { "port": 1068, "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr }, + "core_moninj": { + "type": "controller", + "host": "::1", + "port_proxy": 1383, + "port": 1384, + "command": "aqctl_moninj_proxy --port-proxy {port_proxy} --port-control {port} --bind {bind} " + core_addr + }, "core_cache": { "type": "local", "module": "artiq.coredevice.cache", diff --git a/artiq/examples/kasli_suservo/device_db.py b/artiq/examples/kasli_suservo/device_db.py index f0d3a48a2..c52b82a94 100644 --- a/artiq/examples/kasli_suservo/device_db.py +++ b/artiq/examples/kasli_suservo/device_db.py @@ -13,6 +13,13 @@ device_db = { "port": 1068, "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr }, + "core_moninj": { + "type": "controller", + "host": "::1", + "port_proxy": 1383, + "port": 1384, + "command": "aqctl_moninj_proxy --port-proxy {port_proxy} --port-control {port} --bind {bind} " + core_addr + }, "core_cache": { "type": "local", "module": "artiq.coredevice.cache", diff --git a/artiq/examples/kc705_nist_clock/device_db.py b/artiq/examples/kc705_nist_clock/device_db.py index bf9637d32..1930f584b 100644 --- a/artiq/examples/kc705_nist_clock/device_db.py +++ b/artiq/examples/kc705_nist_clock/device_db.py @@ -17,6 +17,13 @@ device_db = { "port": 1068, "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr }, + "core_moninj": { + "type": "controller", + "host": "::1", + "port_proxy": 1383, + "port": 1384, + "command": "aqctl_moninj_proxy --port-proxy {port_proxy} --port-control {port} --bind {bind} " + core_addr + }, "core_cache": { "type": "local", "module": "artiq.coredevice.cache", diff --git a/artiq/examples/metlino_sayma_ttl/device_db.py b/artiq/examples/metlino_sayma_ttl/device_db.py index c8c3acb8e..317173cd3 100644 --- a/artiq/examples/metlino_sayma_ttl/device_db.py +++ b/artiq/examples/metlino_sayma_ttl/device_db.py @@ -13,6 +13,13 @@ device_db = { "port": 1068, "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr }, + "core_moninj": { + "type": "controller", + "host": "::1", + "port_proxy": 1383, + "port": 1384, + "command": "aqctl_moninj_proxy --port-proxy {port_proxy} --port-control {port} --bind {bind} " + core_addr + }, "core_cache": { "type": "local", "module": "artiq.coredevice.cache", diff --git a/artiq/examples/sayma_master/device_db.py b/artiq/examples/sayma_master/device_db.py index 51eede704..4ce3f1be0 100644 --- a/artiq/examples/sayma_master/device_db.py +++ b/artiq/examples/sayma_master/device_db.py @@ -13,6 +13,13 @@ device_db = { "port": 1068, "command": "aqctl_corelog -p {port} --bind {bind} " + core_addr }, + "core_moninj": { + "type": "controller", + "host": "::1", + "port_proxy": 1383, + "port": 1384, + "command": "aqctl_moninj_proxy --port-proxy {port_proxy} --port-control {port} --bind {bind} " + core_addr + }, "core_cache": { "type": "local", "module": "artiq.coredevice.cache",