Skip to content
Snippets Groups Projects
Commit a9fde3e4 authored by Krisztián Löki's avatar Krisztián Löki
Browse files

Fixed ODH monitor LEDs and TS2 paths

parent b25287d6
No related branches found
No related tags found
1 merge request!280Updated ODH OPI after maintenance
Hide whitespace changes
Inline Side-by-side
NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
+ 13
− 15
View file @ a9fde3e4
...@@ -17,8 +17,16 @@ ...@@ -17,8 +17,16 @@
<vertical_alignment>1</vertical_alignment> <vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words> <wrap_words>false</wrap_words>
</widget> </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"> <widget type="led" version="2.0.0">
<name>LED_LA</name> <name>LED_O2Lvl19_5</name>
<pv_name>$(P):O2Lvl19_5</pv_name> <pv_name>$(P):O2Lvl19_5</pv_name>
<x>200</x> <x>200</x>
<y>5</y> <y>5</y>
...@@ -32,7 +40,7 @@ ...@@ -32,7 +40,7 @@
</on_color> </on_color>
</widget> </widget>
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>LED_LB</name> <name>LED_O2Lvl18</name>
<pv_name>$(P):O2Lvl18</pv_name> <pv_name>$(P):O2Lvl18</pv_name>
<x>287</x> <x>287</x>
<y>5</y> <y>5</y>
...@@ -46,7 +54,7 @@ ...@@ -46,7 +54,7 @@
</on_color> </on_color>
</widget> </widget>
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>LED_OK</name> <name>LED_MonitHealthy</name>
<pv_name>$(P):MonitHealthy</pv_name> <pv_name>$(P):MonitHealthy</pv_name>
<x>374</x> <x>374</x>
<y>5</y> <y>5</y>
...@@ -60,7 +68,7 @@ ...@@ -60,7 +68,7 @@
</on_color> </on_color>
</widget> </widget>
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>LED_OK_1</name> <name>LED_Maint</name>
<pv_name>$(P):Maint</pv_name> <pv_name>$(P):Maint</pv_name>
<x>461</x> <x>461</x>
<y>5</y> <y>5</y>
...@@ -78,9 +86,7 @@ ...@@ -78,9 +86,7 @@
<actions> <actions>
<action type="open_display"> <action type="open_display">
<file>$(POPUPS)/ODH_Expert_Monit.bob</file> <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<macros> <target>window</target>
</macros>
<target>standalone</target>
<description>ODH $(R)</description> <description>ODH $(R)</description>
</action> </action>
</actions> </actions>
...@@ -90,12 +96,4 @@ ...@@ -90,12 +96,4 @@
<height>25</height> <height>25</height>
<tooltip>$(actions)</tooltip> <tooltip>$(actions)</tooltip>
</widget> </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> </display>
NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob
+ 22
− 23
View file @ a9fde3e4
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0"> <display version="2.0.0">
<name>TS2 ODH monitor LEDs</name> <name>TS2 ODH monitor LEDs</name>
<macros>
<POPUPS>../popups</POPUPS>
</macros>
<width>490</width> <width>490</width>
<height>30</height> <height>30</height>
<widget type="textupdate" version="2.0.0"> <widget type="textupdate" version="2.0.0">
<name>Text Update_O2Level</name> <name>Text Update_O2Level</name>
<pv_name>$(P)-$(R):O2Level</pv_name> <pv_name>$(P):O2Level</pv_name>
<x>93</x> <x>93</x>
<y>5</y> <y>5</y>
<width>55</width> <width>55</width>
...@@ -14,9 +17,17 @@ ...@@ -14,9 +17,17 @@
<vertical_alignment>1</vertical_alignment> <vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words> <wrap_words>false</wrap_words>
</widget> </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"> <widget type="led" version="2.0.0">
<name>LED_LA</name> <name>LED_O2Lvl19_5</name>
<pv_name>$(P)-$(R):O2Lvl19_5</pv_name> <pv_name>$(P):O2Lvl19_5</pv_name>
<x>200</x> <x>200</x>
<y>5</y> <y>5</y>
<off_color> <off_color>
...@@ -29,8 +40,8 @@ ...@@ -29,8 +40,8 @@
</on_color> </on_color>
</widget> </widget>
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>LED_LB</name> <name>LED_O2Lvl18</name>
<pv_name>$(P)-$(R):O2Lvl18</pv_name> <pv_name>$(P):O2Lvl18</pv_name>
<x>287</x> <x>287</x>
<y>5</y> <y>5</y>
<off_color> <off_color>
...@@ -43,8 +54,8 @@ ...@@ -43,8 +54,8 @@
</on_color> </on_color>
</widget> </widget>
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>LED_OK</name> <name>LED_MonitHealthy</name>
<pv_name>$(P)-$(R):MonitHealthy</pv_name> <pv_name>$(P):MonitHealthy</pv_name>
<x>374</x> <x>374</x>
<y>5</y> <y>5</y>
<off_color> <off_color>
...@@ -57,8 +68,8 @@ ...@@ -57,8 +68,8 @@
</on_color> </on_color>
</widget> </widget>
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>LED_OK_1</name> <name>LED_Maint</name>
<pv_name>$(P)-$(R):Maint</pv_name> <pv_name>$(P):Maint</pv_name>
<x>461</x> <x>461</x>
<y>5</y> <y>5</y>
<off_color> <off_color>
...@@ -74,12 +85,8 @@ ...@@ -74,12 +85,8 @@
<name>Action Button</name> <name>Action Button</name>
<actions> <actions>
<action type="open_display"> <action type="open_display">
<file>${TS2_PATH}/popups/odh_faceplate.bob</file> <file>$(POPUPS)/TS2_ODH_Expert_Monit.bob</file>
<macros> <target>window</target>
<P>$(P)-$(R)</P>
<R>$(R)</R>
</macros>
<target>standalone</target>
<description>ODH $(R)</description> <description>ODH $(R)</description>
</action> </action>
</actions> </actions>
...@@ -89,12 +96,4 @@ ...@@ -89,12 +96,4 @@
<height>25</height> <height>25</height>
<tooltip>$(actions)</tooltip> <tooltip>$(actions)</tooltip>
</widget> </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> </display>
NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob
+ 7
− 7
View file @ a9fde3e4
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</on_color> </on_color>
</widget> </widget>
<widget type="label" version="2.0.0"> <widget type="label" version="2.0.0">
<name>LB_ODHAlarm</name> <name>LB_O2Lvl18</name>
<text>ODH Alarm (18%)</text> <text>ODH Alarm (18%)</text>
<x>72</x> <x>72</x>
<y>118</y> <y>118</y>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
</on_color> </on_color>
</widget> </widget>
<widget type="label" version="2.0.0"> <widget type="label" version="2.0.0">
<name>LB_ODHWarning</name> <name>LB_O2Lvl19_5</name>
<text>ODH Warning (19.5%)</text> <text>ODH Warning (19.5%)</text>
<x>72</x> <x>72</x>
<y>145</y> <y>145</y>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
</on_color> </on_color>
</widget> </widget>
<widget type="label" version="2.0.0"> <widget type="label" version="2.0.0">
<name>LB_MonitHealtyErr</name> <name>LB_MonitHealty</name>
<text>Monitor Healthy</text> <text>Monitor Healthy</text>
<x>72</x> <x>72</x>
<y>172</y> <y>172</y>
...@@ -201,16 +201,16 @@ ...@@ -201,16 +201,16 @@
<vertical_alignment>1</vertical_alignment> <vertical_alignment>1</vertical_alignment>
</widget> </widget>
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>MonitHealthyCompat</name> <name>MonitWarning</name>
<pv_name>$(P):MonitWarning</pv_name> <pv_name>$(P):MonitWarning</pv_name>
<x>24</x> <x>24</x>
<y>227</y> <y>227</y>
<off_color> <off_color>
<color name="LED-RED-ON" red="255" green="60" blue="46"> <color name="Grid" red="169" green="169" blue="169">
</color> </color>
</off_color> </off_color>
<on_color> <on_color>
<color name="Grid" red="169" green="169" blue="169"> <color name="LED-RED-ON" red="255" green="60" blue="46">
</color> </color>
</on_color> </on_color>
</widget> </widget>
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
</on_color> </on_color>
</widget> </widget>
<widget type="label" version="2.0.0"> <widget type="label" version="2.0.0">
<name>LB_ConnLost</name> <name>LB_ConnStat</name>
<text>Lost Communication</text> <text>Lost Communication</text>
<x>72</x> <x>72</x>
<y>308</y> <y>308</y>
......
NON-APPROVED/odh/ODH_Main.bob
+ 2
− 2
View file @ a9fde3e4
...@@ -812,7 +812,7 @@ $(pv_name)</tooltip> ...@@ -812,7 +812,7 @@ $(pv_name)</tooltip>
<P>KG-GTA:ODH-O2iM-$(IDX)</P> <P>KG-GTA:ODH-O2iM-$(IDX)</P>
<R>$(IDX)</R> <R>$(IDX)</R>
</macros> </macros>
<file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file> <file>$(EMBEDDED_DISPLAYS)/TS2_ODH_Monit_Sub.bob</file>
<x>10</x> <x>10</x>
<y>6</y> <y>6</y>
<width>510</width> <width>510</width>
...@@ -825,7 +825,7 @@ $(pv_name)</tooltip> ...@@ -825,7 +825,7 @@ $(pv_name)</tooltip>
<P>KG-GTA:ODH-O2iM-$(IDX)</P> <P>KG-GTA:ODH-O2iM-$(IDX)</P>
<R>$(IDX)</R> <R>$(IDX)</R>
</macros> </macros>
<file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file> <file>$(EMBEDDED_DISPLAYS)/TS2_ODH_Monit_Sub.bob</file>
<x>10</x> <x>10</x>
<y>38</y> <y>38</y>
<width>510</width> <width>510</width>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment