From 03584bf53cf4d241bd312b89b700ad9679f2a214 Mon Sep 17 00:00:00 2001 From: Alexis Koralewski Date: Thu, 2 Mar 2023 17:18:30 +0100 Subject: [PATCH] Add symbol attributes for Channels & albums in obsconfig --- config/schemas/schema_observatory-2.0.yml | 6 ++++++ privatedev/config/default/observatory_default.yml | 2 ++ privatedev/config/pyros/config_pyros.yml | 6 ++++++ privatedev/config/tnc/observatory_tnc.yml | 35 ++++++++++++++++++++++++++--------- src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml | 2 ++ 5 files changed, 42 insertions(+), 9 deletions(-) diff --git a/config/schemas/schema_observatory-2.0.yml b/config/schemas/schema_observatory-2.0.yml index 9933431..d9f00d4 100644 --- a/config/schemas/schema_observatory-2.0.yml +++ b/config/schemas/schema_observatory-2.0.yml @@ -80,6 +80,9 @@ schema;schema_ALBUMS: schema;schema_ALBUM: mapping: + symbol: + type: str + required: True name: type: str required: True @@ -130,6 +133,9 @@ schema;schema_MOUNT: schema;schema_CHANNEL: type: map mapping: + symbol: + type: str + required: True name: type: str required: True diff --git a/privatedev/config/default/observatory_default.yml b/privatedev/config/default/observatory_default.yml index 024bd94..ae098f6 100644 --- a/privatedev/config/default/observatory_default.yml +++ b/privatedev/config/default/observatory_default.yml @@ -134,6 +134,7 @@ OBSERVATORY: CHANNELS: - CHANNEL: name: OpticalChannel + symbol: MCH COMPONENT_AGENTS: - OpticImager: optic - DetectorSensor: camera @@ -143,6 +144,7 @@ OBSERVATORY: - ALBUM : name: MainChannel + symbol: MCH description: "Album with one channel" CHANNELS: - OpticalChannel diff --git a/privatedev/config/pyros/config_pyros.yml b/privatedev/config/pyros/config_pyros.yml index 0bf44b4..0bb802c 100644 --- a/privatedev/config/pyros/config_pyros.yml +++ b/privatedev/config/pyros/config_pyros.yml @@ -10,5 +10,11 @@ OCF: ~ ENV: time_history: 2 time_before_plot: 10 + monitoring_names_to_be_plotted: + - Wind_direction + - Wind_speed + - Rain_boolean + - Temperature_outside + - Humidity_outside \ No newline at end of file diff --git a/privatedev/config/tnc/observatory_tnc.yml b/privatedev/config/tnc/observatory_tnc.yml index 0039c48..2c872f8 100644 --- a/privatedev/config/tnc/observatory_tnc.yml +++ b/privatedev/config/tnc/observatory_tnc.yml @@ -199,7 +199,7 @@ OBSERVATORY: install: shell: /bin/sh script: "guitastro/install/install.sh" - + MONITORING_DEVICES: - TAROT_meteo @@ -364,12 +364,13 @@ OBSERVATORY: name: AgentImagesProcessor_tnc_up1_ako computer: AKoralewskiPersoComputer protocol: privatedev/plugin/agent/AgentImagesProcessor_tnc_up1.py - + is_active: False - AGENT: name: AgentTriton computer: AKoralewskiPersoComputer protocol: private/plugin/agent/AgentTriton.py path: private/plugin/agent/triton + is_active: False - AGENT_DEVICE: name: AgentDevicePLC_ako @@ -378,7 +379,13 @@ OBSERVATORY: device: TAROT_meteo protocol: private/plugin/agent_devices/AgentDevicePLC.py is_real: false -# + + - AGENT: + name: AgentM_ako + computer: AKoralewskiPersoComputer + protocol: private/plugin/agent/AgentM.py + path: private/plugin/agent + - AGENT: name: AgentTriton_akz computer: AKlotzPersoComputer @@ -457,19 +464,20 @@ OBSERVATORY: protocol: private/plugin/agent/AgentTriton.py path: private/plugin/agent/triton - - AGENT: - name: AgentEnvMonitor - computer: astroguitaComputer - protocol: private/plugin/agent/AgentEnvMonitor.py - - AGENT_DEVICE: - name: AgentDevicePLC + name: AgentDevicePLC_astroguita computer: astroguitaComputer path: private/plugin/agent_devices device: TAROT_meteo protocol: private/plugin/agent_devices/AgentDevicePLC.py is_real: false + - AGENT: + name: AgentM_astroguita + computer: astroguitaComputer + protocol: private/plugin/agent/AgentM.py + path: private/plugin/agent + TOPOLOGY: @@ -488,6 +496,7 @@ OBSERVATORY: - CHANNEL: name: OpticalChannel_up1 + symbol: CH1 COMPONENT_AGENTS: - OpticImager: optic_up1 - DetectorFocuser: focuser_up1 @@ -497,6 +506,7 @@ OBSERVATORY: - CHANNEL: name: OpticalChannel_up2 + symbol: CH2 COMPONENT_AGENTS: - OpticImager: optic_up2 - DetectorFocuser: focuser_up2 @@ -506,6 +516,7 @@ OBSERVATORY: - CHANNEL: name: OpticalChannel_down1 + symbol: CH3 COMPONENT_AGENTS: - OpticImager: optic_down1 - DetectorFocuser: focuser_down1 @@ -515,6 +526,7 @@ OBSERVATORY: - CHANNEL: name: OpticalChannel_down2 + symbol: CH4 COMPONENT_AGENTS: - OpticImager: optic_down2 - DetectorFocuser: focuser_down2 @@ -526,6 +538,7 @@ OBSERVATORY: - ALBUM : name: Altogether + symbol: ATG description: All channels CHANNELS: - OpticalChannel_down2 @@ -535,12 +548,14 @@ OBSERVATORY: - ALBUM : name: TwoDown + symbol: 2DN description: Two channel of the down side CHANNELS: - OpticalChannel_down2 - OpticalChannel_down1 - ALBUM : name: TwoUp + symbol: 2UP description: Two channel of the up side CHANNELS: - OpticalChannel_up2 @@ -548,6 +563,7 @@ OBSERVATORY: - ALBUM : name: Three + symbol: 3A1 description: Two channel of the down side and one up side (2nd up) CHANNELS: - OpticalChannel_down2 @@ -556,6 +572,7 @@ OBSERVATORY: - ALBUM : name: One + symbol: ONE description: One up channel (first) CHANNELS: - OpticalChannel_up1 diff --git a/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml b/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml index db6f03a..861ed45 100644 --- a/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml +++ b/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml @@ -134,6 +134,7 @@ OBSERVATORY: - CHANNEL: name: OpticalChannel + symbol: test COMPONENT_AGENTS: - OpticImager: optic - DetectorSensor: camera @@ -142,6 +143,7 @@ OBSERVATORY: ALBUMS: - ALBUM: name: test_album + symbol: test CHANNELS: - OpticalChannel -- libgit2 0.21.2