From a9fde3e4624c57e70650d9dc0c3451013f49c156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Wed, 9 Jun 2021 14:29:25 +0200
Subject: [PATCH] Fixed ODH monitor LEDs and TS2 paths
---
.../embedded_displays/ODH_Monit_Sub.bob | 28 ++++++------
.../embedded_displays/TS2_ODH_Monit_Sub.bob | 45 +++++++++----------
.../odh/99-Shared/popups/ODH_Expert_Monit.bob | 14 +++---
NON-APPROVED/odh/ODH_Main.bob | 4 +-
4 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob b/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
index 8b4e3649..20727586 100644
--- a/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
@@ -17,8 +17,16 @@
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Percent sign</name>
+ <text>%</text>
+ <x>153</x>
+ <y>5</y>
+ <width>14</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="led" version="2.0.0">
- <name>LED_LA</name>
+ <name>LED_O2Lvl19_5</name>
<pv_name>$(P):O2Lvl19_5</pv_name>
<x>200</x>
<y>5</y>
@@ -32,7 +40,7 @@
</on_color>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_LB</name>
+ <name>LED_O2Lvl18</name>
<pv_name>$(P):O2Lvl18</pv_name>
<x>287</x>
<y>5</y>
@@ -46,7 +54,7 @@
</on_color>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_OK</name>
+ <name>LED_MonitHealthy</name>
<pv_name>$(P):MonitHealthy</pv_name>
<x>374</x>
<y>5</y>
@@ -60,7 +68,7 @@
</on_color>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_OK_1</name>
+ <name>LED_Maint</name>
<pv_name>$(P):Maint</pv_name>
<x>461</x>
<y>5</y>
@@ -78,9 +86,7 @@
<actions>
<action type="open_display">
<file>$(POPUPS)/ODH_Expert_Monit.bob</file>
- <macros>
- </macros>
- <target>standalone</target>
+ <target>window</target>
<description>ODH $(R)</description>
</action>
</actions>
@@ -90,12 +96,4 @@
<height>25</height>
<tooltip>$(actions)</tooltip>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label</name>
- <text>%</text>
- <x>153</x>
- <y>5</y>
- <width>14</width>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</display>
diff --git a/NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob b/NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob
index e56ca229..8aa9dc10 100644
--- a/NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>TS2 ODH monitor LEDs</name>
+ <macros>
+ <POPUPS>../popups</POPUPS>
+ </macros>
<width>490</width>
<height>30</height>
<widget type="textupdate" version="2.0.0">
<name>Text Update_O2Level</name>
- <pv_name>$(P)-$(R):O2Level</pv_name>
+ <pv_name>$(P):O2Level</pv_name>
<x>93</x>
<y>5</y>
<width>55</width>
@@ -14,9 +17,17 @@
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Percent sign</name>
+ <text>%</text>
+ <x>153</x>
+ <y>5</y>
+ <width>14</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="led" version="2.0.0">
- <name>LED_LA</name>
- <pv_name>$(P)-$(R):O2Lvl19_5</pv_name>
+ <name>LED_O2Lvl19_5</name>
+ <pv_name>$(P):O2Lvl19_5</pv_name>
<x>200</x>
<y>5</y>
<off_color>
@@ -29,8 +40,8 @@
</on_color>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_LB</name>
- <pv_name>$(P)-$(R):O2Lvl18</pv_name>
+ <name>LED_O2Lvl18</name>
+ <pv_name>$(P):O2Lvl18</pv_name>
<x>287</x>
<y>5</y>
<off_color>
@@ -43,8 +54,8 @@
</on_color>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_OK</name>
- <pv_name>$(P)-$(R):MonitHealthy</pv_name>
+ <name>LED_MonitHealthy</name>
+ <pv_name>$(P):MonitHealthy</pv_name>
<x>374</x>
<y>5</y>
<off_color>
@@ -57,8 +68,8 @@
</on_color>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_OK_1</name>
- <pv_name>$(P)-$(R):Maint</pv_name>
+ <name>LED_Maint</name>
+ <pv_name>$(P):Maint</pv_name>
<x>461</x>
<y>5</y>
<off_color>
@@ -74,12 +85,8 @@
<name>Action Button</name>
<actions>
<action type="open_display">
- <file>${TS2_PATH}/popups/odh_faceplate.bob</file>
- <macros>
- <P>$(P)-$(R)</P>
- <R>$(R)</R>
- </macros>
- <target>standalone</target>
+ <file>$(POPUPS)/TS2_ODH_Expert_Monit.bob</file>
+ <target>window</target>
<description>ODH $(R)</description>
</action>
</actions>
@@ -89,12 +96,4 @@
<height>25</height>
<tooltip>$(actions)</tooltip>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label</name>
- <text>%</text>
- <x>153</x>
- <y>5</y>
- <width>14</width>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</display>
diff --git a/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob
index b724e72e..16cb2a55 100644
--- a/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob
+++ b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob
@@ -128,7 +128,7 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_ODHAlarm</name>
+ <name>LB_O2Lvl18</name>
<text>ODH Alarm (18%)</text>
<x>72</x>
<y>118</y>
@@ -150,7 +150,7 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_ODHWarning</name>
+ <name>LB_O2Lvl19_5</name>
<text>ODH Warning (19.5%)</text>
<x>72</x>
<y>145</y>
@@ -172,7 +172,7 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_MonitHealtyErr</name>
+ <name>LB_MonitHealty</name>
<text>Monitor Healthy</text>
<x>72</x>
<y>172</y>
@@ -201,16 +201,16 @@
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
- <name>MonitHealthyCompat</name>
+ <name>MonitWarning</name>
<pv_name>$(P):MonitWarning</pv_name>
<x>24</x>
<y>227</y>
<off_color>
- <color name="LED-RED-ON" red="255" green="60" blue="46">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</off_color>
<on_color>
- <color name="Grid" red="169" green="169" blue="169">
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
</on_color>
</widget>
@@ -281,7 +281,7 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_ConnLost</name>
+ <name>LB_ConnStat</name>
<text>Lost Communication</text>
<x>72</x>
<y>308</y>
diff --git a/NON-APPROVED/odh/ODH_Main.bob b/NON-APPROVED/odh/ODH_Main.bob
index 55bd5139..37054cb4 100644
--- a/NON-APPROVED/odh/ODH_Main.bob
+++ b/NON-APPROVED/odh/ODH_Main.bob
@@ -812,7 +812,7 @@ $(pv_name)</tooltip>
<P>KG-GTA:ODH-O2iM-$(IDX)</P>
<R>$(IDX)</R>
</macros>
- <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/TS2_ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
@@ -825,7 +825,7 @@ $(pv_name)</tooltip>
<P>KG-GTA:ODH-O2iM-$(IDX)</P>
<R>$(IDX)</R>
</macros>
- <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/TS2_ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>
--
GitLab