diff --git a/NON-APPROVED/odh/99-Shared/blockicons/odh.bob b/NON-APPROVED/odh/99-Shared/blockicons/odh.bob
new file mode 100644
index 0000000000000000000000000000000000000000..13b7060e7aa95f63445b6bb427e2193f875169c9
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/blockicons/odh.bob
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>ODH</name>
+ <macros>
+ <SYMBOLS>../symbols/odh</SYMBOLS>
+ </macros>
+ <width>84</width>
+ <height>80</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <x>34</x>
+ <width>50</width>
+ <height>50</height>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </line_color>
+ <transparent>true</transparent>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Symbol</name>
+ <pv_name>$(P):Stat</pv_name>
+ <symbols>
+ <symbol>$(SYMBOLS)/O2-detector_NEUTRAL.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_WARNING_2.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_ERROR.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_BLUE.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_INVALID.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_ERROR.svg</symbol>
+ </symbols>
+ <x>37</x>
+ <y>3</y>
+ <width>44</width>
+ <height>44</height>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="open_display">
+ <file>../popups/ODH_Expert_Monit.bob</file>
+ <target>standalone</target>
+ <description>Open Faceplate</description>
+ </action>
+ </actions>
+ <text>Details</text>
+ <x>2</x>
+ <y>52</y>
+ <width>80</width>
+ <height>26</height>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <text>$(R)</text>
+ <width>34</width>
+ <height>50</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+</display>
diff --git a/NON-APPROVED/odh/99-Shared/blockicons/odh_right.bob b/NON-APPROVED/odh/99-Shared/blockicons/odh_right.bob
new file mode 100644
index 0000000000000000000000000000000000000000..c23ce705627f007e417472117f893bcc7e71ab38
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/blockicons/odh_right.bob
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>ODH Details on the right</name>
+ <macros>
+ <SYMBOLS>../symbols/odh</SYMBOLS>
+ </macros>
+ <width>168</width>
+ <height>50</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <x>34</x>
+ <width>50</width>
+ <height>50</height>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </line_color>
+ <transparent>true</transparent>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Symbol</name>
+ <pv_name>$(P):Stat</pv_name>
+ <symbols>
+ <symbol>$(SYMBOLS)/O2-detector_NEUTRAL.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_WARNING_2.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_ERROR.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_BLUE.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_INVALID.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_ERROR.svg</symbol>
+ </symbols>
+ <x>37</x>
+ <y>3</y>
+ <width>44</width>
+ <height>44</height>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="open_display">
+ <file>../popups/ODH_Expert_Monit.bob</file>
+ <target>standalone</target>
+ <description>Open Faceplate</description>
+ </action>
+ </actions>
+ <text>Details</text>
+ <x>86</x>
+ <y>12</y>
+ <width>80</width>
+ <height>26</height>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <text>$(R)</text>
+ <width>34</width>
+ <height>50</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+</display>
diff --git a/NON-APPROVED/odh/99-Shared/blockicons/ts2_odh_right.bob b/NON-APPROVED/odh/99-Shared/blockicons/ts2_odh_right.bob
new file mode 100644
index 0000000000000000000000000000000000000000..423cade6fd737e2540a3d6019e62da65089e3374
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/blockicons/ts2_odh_right.bob
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>ODH Details on the right</name>
+ <macros>
+ <SYMBOLS>../symbols/odh</SYMBOLS>
+ </macros>
+ <width>168</width>
+ <height>50</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <x>34</x>
+ <width>50</width>
+ <height>50</height>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </line_color>
+ <transparent>true</transparent>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Symbol</name>
+ <pv_name>$(P):Stat</pv_name>
+ <symbols>
+ <symbol>$(SYMBOLS)/O2-detector_NEUTRAL.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_WARNING_2.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_ERROR.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_BLUE.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_INVALID.svg</symbol>
+ <symbol>$(SYMBOLS)/O2-detector_ERROR.svg</symbol>
+ </symbols>
+ <x>37</x>
+ <y>3</y>
+ <width>44</width>
+ <height>44</height>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="open_display">
+ <file>../popups/TS2_ODH_Expert_Monit.bob</file>
+ <target>standalone</target>
+ <description>Open Faceplate</description>
+ </action>
+ </actions>
+ <text>Details</text>
+ <x>86</x>
+ <y>12</y>
+ <width>80</width>
+ <height>26</height>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <text>$(R)</text>
+ <width>34</width>
+ <height>50</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+</display>
diff --git a/NON-APPROVED/odh/ODH_Monit_Sub.bob b/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
similarity index 75%
rename from NON-APPROVED/odh/ODH_Monit_Sub.bob
rename to NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
index 4c6a0c9728e3fccdb64f33a24be9634227f9b053..2072758644b5c02485810dd3ffeb21174adfef2c 100644
--- a/NON-APPROVED/odh/ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
@@ -1,66 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>ODH monitor LEDs</name>
+ <macros>
+ <POPUPS>../popups</POPUPS>
+ </macros>
<width>490</width>
- <height>40</height>
+ <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>4</y>
+ <y>5</y>
<width>55</width>
<precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<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):ODHWarning</pv_name>
+ <name>LED_O2Lvl19_5</name>
+ <pv_name>$(P):O2Lvl19_5</pv_name>
<x>200</x>
- <y>4</y>
+ <y>5</y>
<off_color>
- <color name="Grid" red="169" green="169" blue="169">
+ <color name="MINOR" red="252" green="242" blue="17">
</color>
</off_color>
<on_color>
- <color name="MINOR" red="252" green="242" blue="17">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</on_color>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_LB</name>
- <pv_name>$(P)-$(R):ODHAlarm</pv_name>
+ <name>LED_O2Lvl18</name>
+ <pv_name>$(P):O2Lvl18</pv_name>
<x>287</x>
- <y>4</y>
+ <y>5</y>
<off_color>
- <color name="Grid" red="169" green="169" blue="169">
+ <color name="MAJOR" red="252" green="13" blue="27">
</color>
</off_color>
<on_color>
- <color name="MAJOR" red="252" green="13" blue="27">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</on_color>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_OK</name>
- <pv_name>$(P)-$(R):MonitHealthyErr</pv_name>
+ <name>LED_MonitHealthy</name>
+ <pv_name>$(P):MonitHealthy</pv_name>
<x>374</x>
- <y>4</y>
+ <y>5</y>
<off_color>
- <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ <color name="MAJOR" red="252" green="13" blue="27">
</color>
</off_color>
<on_color>
- <color name="MAJOR" red="252" green="13" blue="27">
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
</color>
</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>4</y>
+ <y>5</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -74,27 +85,15 @@
<name>Action Button</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
- <macros>
- <P>$(P)-$(R)</P>
- <R>$(R)</R>
- </macros>
- <target>standalone</target>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
+ <target>window</target>
<description>ODH $(R)</description>
</action>
</actions>
<x>10</x>
- <y>4</y>
+ <y>2</y>
<width>60</width>
- <height>20</height>
+ <height>25</height>
<tooltip>$(actions)</tooltip>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label</name>
- <text>%</text>
- <x>153</x>
- <y>4</y>
- <width>14</width>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</display>
diff --git a/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob b/NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob
similarity index 75%
rename from NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob
rename to NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob
index 2e022eddc0ef03357ec04233b006b60a81e3b28b..8aa9dc106ee0fa750d9650171c52d89d024db441 100644
--- a/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob
@@ -1,24 +1,35 @@
<?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>40</height>
+ <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>4</y>
+ <y>5</y>
<width>55</width>
<precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<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>4</y>
+ <y>5</y>
<off_color>
<color name="MINOR" red="252" green="242" blue="17">
</color>
@@ -29,10 +40,10 @@
</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>4</y>
+ <y>5</y>
<off_color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
@@ -43,10 +54,10 @@
</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>4</y>
+ <y>5</y>
<off_color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
@@ -57,10 +68,10 @@
</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>4</y>
+ <y>5</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -74,27 +85,15 @@
<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>
<x>10</x>
- <y>4</y>
+ <y>2</y>
<width>60</width>
- <height>20</height>
+ <height>25</height>
<tooltip>$(actions)</tooltip>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label</name>
- <text>%</text>
- <x>153</x>
- <y>4</y>
- <width>14</width>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</display>
diff --git a/NON-APPROVED/odh/ODH_Expert_Diag.bob b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Diag.bob
similarity index 94%
rename from NON-APPROVED/odh/ODH_Expert_Diag.bob
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Diag.bob
index a772d7c0053e64bda895331e2e0e130141b14c5e..37c94215ffe9bf164808d8e51c46b4e7dc7d7a1a 100644
--- a/NON-APPROVED/odh/ODH_Expert_Diag.bob
+++ b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Diag.bob
@@ -3,6 +3,7 @@
<name>ODH Diagnostics</name>
<macros>
<PLC>KG-GTA:ODH-PLC-01</PLC>
+ <SYMBOLS>../symbols</SYMBOLS>
</macros>
<width>1900</width>
<height>900</height>
@@ -26,7 +27,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_12</name>
- <file>symbols/diagnostics/ODH_RIO1.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_RIO1.PNG</file>
<x>40</x>
<y>580</y>
<width>590</width>
@@ -55,7 +56,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_4</name>
- <file>symbols/diagnostics/ODH_RIO1.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_RIO1.PNG</file>
<x>1270</x>
<y>580</y>
<width>590</width>
@@ -63,7 +64,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_6</name>
- <file>symbols/diagnostics/ODH_CPU.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_CPU.PNG</file>
<x>627</x>
<y>100</y>
<width>249</width>
@@ -71,7 +72,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_8</name>
- <file>symbols/diagnostics/ODH_Switch.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_Switch.PNG</file>
<x>1068</x>
<y>110</y>
<width>120</width>
@@ -79,7 +80,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_9</name>
- <file>symbols/diagnostics/ODH_Switch.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_Switch.PNG</file>
<x>1228</x>
<y>110</y>
<width>120</width>
@@ -87,7 +88,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_10</name>
- <file>symbols/diagnostics/ODH_Switch.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_Switch.PNG</file>
<x>1378</x>
<y>110</y>
<width>120</width>
@@ -95,7 +96,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_11</name>
- <file>symbols/diagnostics/ODH_RIO1.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_RIO1.PNG</file>
<x>650</x>
<y>580</y>
<width>590</width>
@@ -124,7 +125,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_73</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -142,7 +143,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_74</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -161,7 +162,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_75</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -190,7 +191,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_76</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -208,7 +209,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_77</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -227,7 +228,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_78</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -256,7 +257,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_79</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -274,7 +275,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_80</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -293,7 +294,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_81</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -322,7 +323,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_82</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -340,7 +341,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_83</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -359,7 +360,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_84</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -388,7 +389,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_85</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -406,7 +407,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_86</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -425,7 +426,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_87</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -454,7 +455,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_88</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -472,7 +473,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_89</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -491,7 +492,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_90</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -520,7 +521,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_91</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -538,7 +539,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_92</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -557,7 +558,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_93</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -586,7 +587,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_94</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -604,7 +605,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_95</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -623,7 +624,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_96</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -652,7 +653,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_97</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -670,7 +671,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_98</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -689,7 +690,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_99</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -718,7 +719,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_100</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -736,7 +737,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_101</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -755,7 +756,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_102</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -784,7 +785,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_103</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -802,7 +803,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_104</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -821,7 +822,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_105</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -850,7 +851,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_106</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -868,7 +869,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_107</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -887,7 +888,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_108</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -916,7 +917,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_109</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -934,7 +935,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_110</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -953,7 +954,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_111</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -994,7 +995,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_196</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1012,7 +1013,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_197</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1031,7 +1032,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_198</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1060,7 +1061,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_199</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1078,7 +1079,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_200</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1097,7 +1098,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_201</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1126,7 +1127,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_202</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1144,7 +1145,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_203</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1163,7 +1164,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_204</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1192,7 +1193,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_205</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1210,7 +1211,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_206</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1229,7 +1230,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_207</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1258,7 +1259,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_208</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1276,7 +1277,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_209</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1295,7 +1296,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_210</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1324,7 +1325,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_211</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1342,7 +1343,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_212</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1361,7 +1362,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_213</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1390,7 +1391,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_214</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1408,7 +1409,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_215</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1427,7 +1428,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_216</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1456,7 +1457,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_217</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1474,7 +1475,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_218</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1493,7 +1494,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_219</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1522,7 +1523,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_220</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1540,7 +1541,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_221</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1559,7 +1560,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_222</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1588,7 +1589,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_223</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1606,7 +1607,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_224</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1625,7 +1626,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_225</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1654,7 +1655,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_226</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1672,7 +1673,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_227</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1691,7 +1692,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_228</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1720,7 +1721,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_229</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1738,7 +1739,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_230</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1757,7 +1758,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_231</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1786,7 +1787,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_232</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1804,7 +1805,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_233</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1823,7 +1824,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_234</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1864,7 +1865,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_235</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1882,7 +1883,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_236</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1901,7 +1902,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_237</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1930,7 +1931,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_238</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1948,7 +1949,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_239</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1967,7 +1968,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_240</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1996,7 +1997,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_241</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2014,7 +2015,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_242</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2033,7 +2034,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_243</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2062,7 +2063,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_244</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2080,7 +2081,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_245</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2099,7 +2100,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_246</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2128,7 +2129,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_247</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2146,7 +2147,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_248</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2165,7 +2166,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_249</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2194,7 +2195,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_250</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2212,7 +2213,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_251</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2231,7 +2232,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_252</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2260,7 +2261,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_253</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2278,7 +2279,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_254</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2297,7 +2298,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_255</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2326,7 +2327,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_256</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2344,7 +2345,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_257</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2363,7 +2364,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_258</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2392,7 +2393,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_259</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2410,7 +2411,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_260</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2429,7 +2430,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_261</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2458,7 +2459,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_262</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2476,7 +2477,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_263</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2495,7 +2496,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_264</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2524,7 +2525,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_265</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2542,7 +2543,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_266</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2561,7 +2562,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_267</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2590,7 +2591,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_268</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2608,7 +2609,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_269</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2627,7 +2628,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_270</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2656,7 +2657,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_271</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2674,7 +2675,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_272</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2693,7 +2694,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_273</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2724,7 +2725,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_274</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2742,7 +2743,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_275</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2761,7 +2762,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_276</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2791,7 +2792,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_277</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2809,7 +2810,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_278</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2828,7 +2829,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_279</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2858,7 +2859,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_280</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2876,7 +2877,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_281</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2895,7 +2896,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_282</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2925,7 +2926,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_283</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2943,7 +2944,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_284</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>34</y>
<width>30</width>
<height>30</height>
@@ -2962,7 +2963,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_285</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
diff --git a/NON-APPROVED/odh/ODH_Expert_Monit.bob b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob
similarity index 87%
rename from NON-APPROVED/odh/ODH_Expert_Monit.bob
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob
index 629320d086b90e37f5613c79411c735ed00c45fb..16cb2a551c3e41b8f24564535d760eda64358bd6 100644
--- a/NON-APPROVED/odh/ODH_Expert_Monit.bob
+++ b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>ODH #$(R)</name>
+ <name>$(AREA) ODH Monitor #$(R)</name>
<width>300</width>
<height>450</height>
<widget type="group" version="2.0.0">
@@ -10,10 +10,6 @@
<width>280</width>
<height>430</height>
<style>3</style>
- <background_color>
- <color name="BACKGROUND" red="220" green="225" blue="221">
- </color>
- </background_color>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_1</name>
<width>280</width>
@@ -26,6 +22,22 @@
<corner_width>10</corner_width>
<corner_height>10</corner_height>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey03-title</name>
+ <text>$(AREA) ODH Monitor #$(R)</text>
+ <width>280</width>
+ <height>50</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="group" version="2.0.0">
<name>Monitor</name>
<x>10</x>
@@ -58,15 +70,14 @@
<text>Oxygen Level:</text>
<x>20</x>
<y>20</y>
- <vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_O2Level</name>
<pv_name>$(P):O2Level</pv_name>
- <x>126</x>
+ <x>148</x>
<y>20</y>
- <width>62</width>
- <precision>1</precision>
+ <width>75</width>
+ <precision>2</precision>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
@@ -83,7 +94,7 @@
<text>Open Trend Window</text>
<x>20</x>
<y>59</y>
- <width>168</width>
+ <width>203</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="rectangle" version="2.0.0">
@@ -103,49 +114,73 @@
</background_color>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_LA</name>
- <pv_name>$(P):ODHAlarm</pv_name>
+ <name>O2Lvl18</name>
+ <pv_name>$(P):O2Lvl18</pv_name>
<x>24</x>
<y>118</y>
<off_color>
- <color name="Grid" red="169" green="169" blue="169">
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
</off_color>
<on_color>
- <color name="LED-RED-ON" red="255" green="60" blue="46">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</on_color>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_O2Lvl18</name>
+ <text>ODH Alarm (18%)</text>
+ <x>72</x>
+ <y>118</y>
+ <width>116</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="led" version="2.0.0">
- <name>LED_LB</name>
- <pv_name>$(P):ODHWarning</pv_name>
+ <name>O2Lvl19_5</name>
+ <pv_name>$(P):O2Lvl19_5</pv_name>
<x>24</x>
<y>145</y>
<off_color>
- <color name="Grid" red="169" green="169" blue="169">
+ <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
</color>
</off_color>
<on_color>
- <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</on_color>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_O2Lvl19_5</name>
+ <text>ODH Warning (19.5%)</text>
+ <x>72</x>
+ <y>145</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="led" version="2.0.0">
- <name>LED_OK</name>
- <pv_name>$(P):MonitHealthyErr</pv_name>
+ <name>MonitHealthy</name>
+ <pv_name>$(P):MonitHealthy</pv_name>
<x>24</x>
<y>172</y>
<off_color>
- <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
</off_color>
<on_color>
- <color name="LED-RED-ON" red="255" green="60" blue="46">
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
</color>
</on_color>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_MonitHealty</name>
+ <text>Monitor Healthy</text>
+ <x>72</x>
+ <y>172</y>
+ <width>108</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="led" version="2.0.0">
- <name>LED_WARNING</name>
+ <name>Maint</name>
<pv_name>$(P):Maint</pv_name>
<x>24</x>
<y>200</y>
@@ -158,8 +193,15 @@
</color>
</on_color>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_Maint</name>
+ <text>Maintenance</text>
+ <x>72</x>
+ <y>200</y>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="led" version="2.0.0">
- <name>LED_ALARM</name>
+ <name>MonitWarning</name>
<pv_name>$(P):MonitWarning</pv_name>
<x>24</x>
<y>227</y>
@@ -173,38 +215,7 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_LA</name>
- <text>ODH Alarm (18%)</text>
- <x>72</x>
- <y>118</y>
- <width>116</width>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>LB_LB</name>
- <text>ODH Warning (19.5%)</text>
- <x>72</x>
- <y>145</y>
- <width>160</width>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>LB_OK</name>
- <text>Monitor Healthy</text>
- <x>72</x>
- <y>172</y>
- <width>108</width>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>LB_WARNING</name>
- <text>Maintenance</text>
- <x>72</x>
- <y>200</y>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>LB_ALARM</name>
+ <name>LB_MonitWarning</name>
<text>Monitor Warning</text>
<x>72</x>
<y>227</y>
@@ -212,7 +223,7 @@
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_ALARM_1</name>
+ <name>WarmUp</name>
<pv_name>$(P):WarmUp</pv_name>
<x>24</x>
<y>255</y>
@@ -226,7 +237,7 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_ALARM_1</name>
+ <name>LB_WarmUp</name>
<text>Warm-Up Status</text>
<x>72</x>
<y>255</y>
@@ -234,12 +245,12 @@
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_ALARM_2</name>
+ <name>SysOK</name>
<pv_name>$(P):SysOK</pv_name>
<x>24</x>
<y>282</y>
<off_color>
- <color name="Grid" red="169" green="169" blue="169">
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
</off_color>
<on_color>
@@ -248,7 +259,7 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_ALARM_2</name>
+ <name>LB_SysOK</name>
<text>SysOK</text>
<x>72</x>
<y>282</y>
@@ -256,21 +267,21 @@
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
- <name>LED_ALARM_3</name>
- <pv_name>$(P):ConnLost</pv_name>
+ <name>ConnStat</name>
+ <pv_name>$(P):ConnStat</pv_name>
<x>24</x>
<y>308</y>
<off_color>
- <color name="Grid" red="169" green="169" blue="169">
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
</off_color>
<on_color>
- <color name="MAJOR" red="252" green="13" blue="27">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_ALARM_3</name>
+ <name>LB_ConnStat</name>
<text>Lost Communication</text>
<x>72</x>
<y>308</y>
@@ -279,21 +290,5 @@
</widget>
</widget>
</widget>
- <widget type="label" version="2.0.0">
- <name>BGGrey03-title</name>
- <text>ODH Monitor #$(R)</text>
- <width>280</width>
- <height>50</height>
- <font>
- <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
- </font>
- </font>
- <foreground_color>
- <color name="TEXT-LIGHT" red="230" green="230" blue="230">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</widget>
</display>
diff --git a/NON-APPROVED/odh/ODH_Expert_Racks.bob b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Racks.bob
similarity index 100%
rename from NON-APPROVED/odh/ODH_Expert_Racks.bob
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Racks.bob
diff --git a/NON-APPROVED/odh/ODH_Trend.bob b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend.bob
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend.bob
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend.bob
diff --git a/NON-APPROVED/odh/ODH_Trend.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend.plt
diff --git a/NON-APPROVED/odh/ODH_Trend_CTL.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend_CTL.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend_CTL.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend_CTL.plt
diff --git a/NON-APPROVED/odh/ODH_Trend_CXB.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend_CXB.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend_CXB.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend_CXB.plt
diff --git a/NON-APPROVED/odh/ODH_Trend_HCB.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend_HCB.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend_HCB.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend_HCB.plt
diff --git a/NON-APPROVED/odh/ODH_Trend_TS2.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend_TS2.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend_TS2.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend_TS2.plt
diff --git a/NON-APPROVED/odh/99-Shared/popups/TS2_ODH_Expert_Monit.bob b/NON-APPROVED/odh/99-Shared/popups/TS2_ODH_Expert_Monit.bob
new file mode 100644
index 0000000000000000000000000000000000000000..e376d57d939b2e3309245f6088966e2a410761b8
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/popups/TS2_ODH_Expert_Monit.bob
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>$(AREA) ODH Monitor #$(R)</name>
+ <width>300</width>
+ <height>450</height>
+ <widget type="group" version="2.0.0">
+ <name>Monitors Panel</name>
+ <x>10</x>
+ <y>10</y>
+ <width>280</width>
+ <height>430</height>
+ <style>3</style>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey03-titlebar_1</name>
+ <width>280</width>
+ <height>430</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey03-title</name>
+ <text>$(AREA) ODH Monitor #$(R)</text>
+ <width>280</width>
+ <height>50</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Monitor</name>
+ <x>10</x>
+ <y>50</y>
+ <width>260</width>
+ <height>370</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey03-background_1</name>
+ <width>260</width>
+ <height>370</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <corner_width>5</corner_width>
+ <corner_height>5</corner_height>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Signals</name>
+ <x>10</x>
+ <y>10</y>
+ <width>240</width>
+ <height>350</height>
+ <style>3</style>
+ <widget type="label" version="2.0.0">
+ <name>LB_O2LEVEL</name>
+ <text>Oxygen Level:</text>
+ <x>20</x>
+ <y>20</y>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_O2Level</name>
+ <pv_name>$(P):O2Level</pv_name>
+ <x>148</x>
+ <y>20</y>
+ <width>75</width>
+ <precision>2</precision>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="open_display">
+ <file>odh_trend.bob</file>
+ <target>standalone</target>
+ <description>Open Trend window</description>
+ </action>
+ </actions>
+ <text>Open Trend Window</text>
+ <x>20</x>
+ <y>59</y>
+ <width>203</width>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle_3</name>
+ <x>20</x>
+ <y>98</y>
+ <width>200</width>
+ <height>1</height>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>O2Lvl18</name>
+ <pv_name>$(P):O2Lvl18</pv_name>
+ <x>24</x>
+ <y>118</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ODHAlarm</name>
+ <text>ODH Alarm (18%)</text>
+ <x>72</x>
+ <y>118</y>
+ <width>116</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>O2Lvl19_5</name>
+ <pv_name>$(P):O2Lvl19_5</pv_name>
+ <x>24</x>
+ <y>145</y>
+ <off_color>
+ <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ODHWarning</name>
+ <text>ODH Warning (19.5%)</text>
+ <x>72</x>
+ <y>145</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>MonitHealthy</name>
+ <pv_name>$(P):MonitHealthy</pv_name>
+ <x>24</x>
+ <y>172</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_MonitHealtyErr</name>
+ <text>Monitor Healthy</text>
+ <x>72</x>
+ <y>172</y>
+ <width>108</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>Maint</name>
+ <pv_name>$(P):Maint</pv_name>
+ <x>24</x>
+ <y>200</y>
+ <off_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-BLUE-ON" red="81" green="232" blue="255">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_Maint</name>
+ <text>Maintenance</text>
+ <x>72</x>
+ <y>200</y>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>MonitHealthyCompat</name>
+ <pv_name>$(P):MonitHealthyCompat</pv_name>
+ <x>24</x>
+ <y>227</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_MonitWarning</name>
+ <text>Monitor Warning</text>
+ <x>72</x>
+ <y>227</y>
+ <width>150</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>WarmUp</name>
+ <pv_name>$(P):WarmUp</pv_name>
+ <x>24</x>
+ <y>255</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_WarmUp</name>
+ <text>Warm-Up Status</text>
+ <x>72</x>
+ <y>255</y>
+ <width>110</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>SysOK</name>
+ <pv_name>$(P):SysOK</pv_name>
+ <x>24</x>
+ <y>282</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_SysOK</name>
+ <text>SysOK</text>
+ <x>72</x>
+ <y>282</y>
+ <width>43</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ConnStat</name>
+ <pv_name>$(P):ConnStat</pv_name>
+ <x>24</x>
+ <y>308</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ConnLost</name>
+ <text>Lost Communication</text>
+ <x>72</x>
+ <y>308</y>
+ <width>140</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_CTL.png b/NON-APPROVED/odh/99-Shared/symbols/AreaLayout_CTL.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/AreaLayout_CTL.png
rename to NON-APPROVED/odh/99-Shared/symbols/AreaLayout_CTL.png
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_CXH.png b/NON-APPROVED/odh/99-Shared/symbols/AreaLayout_CXH.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/AreaLayout_CXH.png
rename to NON-APPROVED/odh/99-Shared/symbols/AreaLayout_CXH.png
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_HCB.png b/NON-APPROVED/odh/99-Shared/symbols/AreaLayout_HCB.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/AreaLayout_HCB.png
rename to NON-APPROVED/odh/99-Shared/symbols/AreaLayout_HCB.png
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_TS2.png b/NON-APPROVED/odh/99-Shared/symbols/AreaLayout_TS2.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/AreaLayout_TS2.png
rename to NON-APPROVED/odh/99-Shared/symbols/AreaLayout_TS2.png
diff --git a/NON-APPROVED/odh/symbols/custom/Connected.png b/NON-APPROVED/odh/99-Shared/symbols/custom/Connected.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/Connected.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/Connected.png
diff --git a/NON-APPROVED/odh/symbols/custom/ConnectedNew.png b/NON-APPROVED/odh/99-Shared/symbols/custom/ConnectedNew.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/ConnectedNew.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/ConnectedNew.png
diff --git a/NON-APPROVED/odh/symbols/custom/ConnectedPNG.png b/NON-APPROVED/odh/99-Shared/symbols/custom/ConnectedPNG.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/ConnectedPNG.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/ConnectedPNG.png
diff --git a/NON-APPROVED/odh/symbols/custom/Disconnected.png b/NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/Disconnected.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected.png
diff --git a/NON-APPROVED/odh/symbols/custom/Disconnected.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/Disconnected.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected.svg
diff --git a/NON-APPROVED/odh/symbols/custom/Disconnected2.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected2.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/Disconnected2.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected2.svg
diff --git a/NON-APPROVED/odh/symbols/custom/DisconnectedPNG.png b/NON-APPROVED/odh/99-Shared/symbols/custom/DisconnectedPNG.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/DisconnectedPNG.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/DisconnectedPNG.png
diff --git a/NON-APPROVED/odh/symbols/custom/PressureTransmitter_ERROR.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_ERROR.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/PressureTransmitter_ERROR.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_ERROR.svg
diff --git a/NON-APPROVED/odh/symbols/custom/PressureTransmitter_OK.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_OK.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/PressureTransmitter_OK.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_OK.svg
diff --git a/NON-APPROVED/odh/symbols/custom/PressureTransmitter_WARNING.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_WARNING.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/PressureTransmitter_WARNING.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_WARNING.svg
diff --git a/NON-APPROVED/odh/symbols/custom/closing.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/closing.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/closing.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/closing.svg
diff --git a/NON-APPROVED/odh/symbols/custom/conn_disc.jpg b/NON-APPROVED/odh/99-Shared/symbols/custom/conn_disc.jpg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/conn_disc.jpg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/conn_disc.jpg
diff --git a/NON-APPROVED/odh/symbols/custom/error.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/error.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/error.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/error.svg
diff --git a/NON-APPROVED/odh/symbols/custom/gas cylinder.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/gas cylinder.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/gas cylinder.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/gas cylinder.svg
diff --git a/NON-APPROVED/odh/symbols/custom/interlock healthy.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/interlock healthy.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/interlock healthy.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/interlock healthy.svg
diff --git a/NON-APPROVED/odh/symbols/custom/interlock off.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/interlock off.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/interlock off.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/interlock off.svg
diff --git a/NON-APPROVED/odh/symbols/custom/interlock overridden disabled.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/interlock overridden disabled.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/interlock overridden disabled.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/interlock overridden disabled.svg
diff --git a/NON-APPROVED/odh/symbols/custom/interlock tripped.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/interlock tripped.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/interlock tripped.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/interlock tripped.svg
diff --git a/NON-APPROVED/odh/symbols/custom/lock.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/lock.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/lock.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/lock.svg
diff --git a/NON-APPROVED/odh/symbols/custom/lock_open.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/lock_open.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/lock_open.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/lock_open.svg
diff --git a/NON-APPROVED/odh/symbols/custom/opening.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/opening.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/opening.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/opening.svg
diff --git a/NON-APPROVED/odh/symbols/custom/pump_default.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/pump_default.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/pump_default.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/pump_default.svg
diff --git a/NON-APPROVED/odh/symbols/custom/pump_disabled.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/pump_disabled.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/pump_disabled.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/pump_disabled.svg
diff --git a/NON-APPROVED/odh/symbols/custom/pump_error.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/pump_error.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/pump_error.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/pump_error.svg
diff --git a/NON-APPROVED/odh/symbols/custom/pump_notcontrolled.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/pump_notcontrolled.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/pump_notcontrolled.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/pump_notcontrolled.svg
diff --git a/NON-APPROVED/odh/symbols/custom/ramp.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/ramp.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/ramp.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/ramp.svg
diff --git a/NON-APPROVED/odh/symbols/custom/start.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/start.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/start.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/start.svg
diff --git a/NON-APPROVED/odh/symbols/custom/stop.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/stop.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/stop.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/stop.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve (opened).svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve (opened).svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve (opened).svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve (opened).svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_analog.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_analog.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_analog.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_analog.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_closed.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_closed.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_closed.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_closed.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_error.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_error.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_error.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_error.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_general.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_general.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_general.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_general.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_opened.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_opened.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_opened.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_opened.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_solenoid_OFF.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_solenoid_OFF.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_solenoid_OFF.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_solenoid_OFF.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_solenoid_ON.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_solenoid_ON.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_solenoid_ON.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_solenoid_ON.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_undefined.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_undefined.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_undefined.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_undefined.svg
diff --git a/NON-APPROVED/odh/symbols/custom/warning.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/warning.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/warning.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/warning.svg
diff --git a/NON-APPROVED/odh/symbols/custom/wrench.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/wrench.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/wrench.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/wrench.svg
diff --git a/NON-APPROVED/odh/symbols/custom/wrenchred.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/wrenchred.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/wrenchred.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/wrenchred.svg
diff --git a/NON-APPROVED/odh/symbols/diagnostics/ODH_CPU.PNG b/NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_CPU.PNG
similarity index 100%
rename from NON-APPROVED/odh/symbols/diagnostics/ODH_CPU.PNG
rename to NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_CPU.PNG
diff --git a/NON-APPROVED/odh/symbols/diagnostics/ODH_RIO1.PNG b/NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_RIO1.PNG
similarity index 100%
rename from NON-APPROVED/odh/symbols/diagnostics/ODH_RIO1.PNG
rename to NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_RIO1.PNG
diff --git a/NON-APPROVED/odh/symbols/diagnostics/ODH_Switch.PNG b/NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_Switch.PNG
similarity index 100%
rename from NON-APPROVED/odh/symbols/diagnostics/ODH_Switch.PNG
rename to NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_Switch.PNG
diff --git a/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_BLUE.svg b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_BLUE.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2ee06d2ec07d9b854fdd555a59fa39433a383643
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_BLUE.svg
@@ -0,0 +1 @@
+<svg id="Layer_4" data-name="Layer 4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 133.64375 133.64375"><defs><style>.cls-1{fill:#4fe4fa;}.cls-2,.cls-3{fill:none;}.cls-3{stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:3.35756px;}.cls-4{fill:#2f8794;}</style></defs><title>O2-detector</title><circle class="cls-1" cx="66.66685" cy="65.61681" r="60.31013"/><rect class="cls-2" x="-0.17314" y="0.125" width="134" height="134"/><path d="M71.31316,63.80241a16.12323,16.12323,0,0,1-.67339,4.84835,9.7756,9.7756,0,0,1-2.00323,3.62783,8.62334,8.62334,0,0,1-3.29123,2.27265,12.17764,12.17764,0,0,1-4.53682.78271,13.39586,13.39586,0,0,1-4.436-.66492A7.69033,7.69033,0,0,1,53.216,72.64055a8.68419,8.68419,0,0,1-1.89383-3.46792,17.44224,17.44224,0,0,1-.63127-4.983,15.62659,15.62659,0,0,1,.6733-4.75582,9.71311,9.71311,0,0,1,2.00333-3.59419A8.74666,8.74666,0,0,1,56.6587,53.567a12.11407,12.11407,0,0,1,4.55387-.79119,13.319,13.319,0,0,1,4.36851.65653,7.68476,7.68476,0,0,1,3.16476,2.0202A8.803,8.803,0,0,1,70.665,58.89516,16.56321,16.56321,0,0,1,71.31316,63.80241Zm-4.64631.23568a16.67147,16.67147,0,0,0-.26932-3.12283,6.72178,6.72178,0,0,0-.91747-2.40731,4.38314,4.38314,0,0,0-1.72562-1.54883A5.92024,5.92024,0,0,0,61.061,56.412a5.50763,5.50763,0,0,0-2.72723.6145,5.01493,5.01493,0,0,0-1.76765,1.64138,6.78318,6.78318,0,0,0-.9512,2.39892,14.61755,14.61755,0,0,0-.27771,2.90392,17.3163,17.3163,0,0,0,.26932,3.207,6.89983,6.89983,0,0,0,.90908,2.43256,4.176,4.176,0,0,0,1.71714,1.54036,6.11978,6.11978,0,0,0,2.71027.53035,5.5723,5.5723,0,0,0,2.72733-.606A4.89282,4.89282,0,0,0,65.438,69.42508a6.95938,6.95938,0,0,0,.951-2.43256A15.04263,15.04263,0,0,0,66.66685,64.03809Z"/><path d="M83.38363,77.03431a3.28492,3.28492,0,0,1-.1095,1.01q-.10959.303-.36185.303H74.73067a2.44054,2.44054,0,0,1-.48833-.042.56418.56418,0,0,1-.31983-.17679.82663.82663,0,0,1-.1683-.38711,3.69028,3.69028,0,0,1-.05051-.69036,4.6401,4.6401,0,0,1,.042-.68169A2.07992,2.07992,0,0,1,73.889,75.856a1.75508,1.75508,0,0,1,.26932-.43781q.168-.20214.42085-.47136l2.222-2.1885q.589-.58905.97646-1.06061a5.00906,5.00906,0,0,0,.59763-.88372,3.1388,3.1388,0,0,0,.28629-.77442,3.40525,3.40525,0,0,0,.07557-.69866,1.35687,1.35687,0,0,0-.40389-1.02687,1.63972,1.63972,0,0,0-1.17849-.38721,2.91477,2.91477,0,0,0-.95949.15153,6.0824,6.0824,0,0,0-.78291.32822q-.34527.17684-.60592.32831a.9105.9105,0,0,1-.41256.15153.28847.28847,0,0,1-.18507-.06738.51174.51174,0,0,1-.14324-.23568,1.90638,1.90638,0,0,1-.08406-.4461q-.02515-.27775-.02525-.73229a3.87928,3.87928,0,0,1,.0588-.766.8694.8694,0,0,1,.22729-.4461,2.51477,2.51477,0,0,1,.55561-.37873,6.00156,6.00156,0,0,1,.93424-.39559,9.15255,9.15255,0,0,1,1.20375-.31145,7.30007,7.30007,0,0,1,1.38034-.12627,6.82742,6.82742,0,0,1,1.99494.26093,4.0269,4.0269,0,0,1,1.42256.74068,2.96436,2.96436,0,0,1,.85018,1.15324,3.80555,3.80555,0,0,1,.27781,1.46459,5.876,5.876,0,0,1-.118,1.17,4.45039,4.45039,0,0,1-.51339,1.27941,9.51083,9.51083,0,0,1-1.14475,1.54874,26.069,26.069,0,0,1-2.01172,1.99485l-1.212,1.128h5.01666q.20184,0,.35357.30306A2.42934,2.42934,0,0,1,83.38363,77.03431Z"/><path d="M66.82686,102.30324A36.68648,36.68648,0,1,1,103.5133,65.61681,36.728,36.728,0,0,1,66.82686,102.30324Zm0-70.01542a33.32894,33.32894,0,1,0,33.32889,33.329A33.36678,33.36678,0,0,0,66.82686,32.28782Z"/><circle cx="51.0339" cy="85.35801" r="2.46765"/><circle cx="58.93038" cy="85.35801" r="2.46765"/><circle cx="66.82686" cy="85.35801" r="2.46765"/><circle cx="74.72334" cy="85.35801" r="2.46765"/><circle cx="82.61982" cy="85.35801" r="2.46765"/><circle cx="51.0339" cy="45.87561" r="2.46765"/><circle cx="58.93038" cy="45.87561" r="2.46765"/><circle cx="66.82686" cy="45.87561" r="2.46765"/><circle cx="74.72334" cy="45.87561" r="2.46765"/><circle cx="82.61982" cy="45.87561" r="2.46765"/><path d="M114.55063,52.49016a1.67957,1.67957,0,0,1-1.603-1.18235A48.2413,48.2413,0,0,0,81.13576,19.49749a1.67875,1.67875,0,1,1,.994-3.207A51.59738,51.59738,0,0,1,116.1548,50.314a1.68,1.68,0,0,1-1.60417,2.17616Z"/><path d="M19.103,52.49016A1.68012,1.68012,0,0,1,17.49893,50.314,51.59737,51.59737,0,0,1,51.524,16.29051a1.67875,1.67875,0,1,1,.994,3.207A48.24093,48.24093,0,0,0,20.7061,51.30781,1.67968,1.67968,0,0,1,19.103,52.49016Z"/><path d="M106.88569,52.49016a1.67954,1.67954,0,0,1-1.57487-1.097A40.99212,40.99212,0,0,0,81.05055,27.13236,1.67876,1.67876,0,1,1,82.215,23.98322,44.34627,44.34627,0,0,1,108.46016,50.2287a1.68,1.68,0,0,1-1.57447,2.26146Z"/><path d="M26.768,52.49016a1.68,1.68,0,0,1-1.57438-2.26146A44.34637,44.34637,0,0,1,51.43875,23.98322a1.67876,1.67876,0,1,1,1.16442,3.14914A40.99328,40.99328,0,0,0,28.3428,51.39312,1.6794,1.6794,0,0,1,26.768,52.49016Z"/><path class="cls-3" d="M19.10249,80.42271A50.07,50.07,0,0,0,52.021,113.33958"/><path class="cls-3" d="M81.63276,113.33958a50.07,50.07,0,0,0,32.91847-32.91687"/><path class="cls-3" d="M26.76823,80.42271A42.82408,42.82408,0,0,0,52.021,105.67582"/><path class="cls-3" d="M81.63276,105.67582a42.82406,42.82406,0,0,0,25.25273-25.25311"/><path class="cls-4" d="M66.82681,125.92694A60.31015,60.31015,0,0,1,24.1811,22.97109a60.31008,60.31008,0,1,1,85.29133,85.29133A59.91535,59.91535,0,0,1,66.82681,125.92694Zm0-117.26272A56.95259,56.95259,0,1,0,123.7794,65.61681,57.01712,57.01712,0,0,0,66.82681,8.66422Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_ERROR.svg b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_ERROR.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5fc8d0377bd0b5e3b546fbc196f6d656e9015954
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_ERROR.svg
@@ -0,0 +1 @@
+<svg id="Layer_4" data-name="Layer 4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 133.64375 133.64375"><defs><style>.cls-1{fill:#fc0d11;}.cls-2{fill:none;}.cls-3{fill:#fff;}.cls-4{fill:#960810;}</style></defs><title>O2-detector</title><circle class="cls-1" cx="66.59248" cy="65.61681" r="60.31013"/><rect class="cls-2" x="-0.24751" y="0.125" width="134" height="134"/><path class="cls-3" d="M71.2388,63.80241a16.12322,16.12322,0,0,1-.6734,4.84835,9.7756,9.7756,0,0,1-2.00323,3.62783,8.62318,8.62318,0,0,1-3.29123,2.27265,12.17762,12.17762,0,0,1-4.53681.78271,13.39592,13.39592,0,0,1-4.436-.66492,7.6904,7.6904,0,0,1-3.15647-2.02848,8.68419,8.68419,0,0,1-1.89383-3.46792,17.44224,17.44224,0,0,1-.63127-4.983,15.6269,15.6269,0,0,1,.6733-4.75582,9.71325,9.71325,0,0,1,2.00333-3.59419A8.74666,8.74666,0,0,1,56.58433,53.567a12.11407,12.11407,0,0,1,4.55387-.79119,13.319,13.319,0,0,1,4.36852.65653,7.68483,7.68483,0,0,1,3.16476,2.0202,8.80308,8.80308,0,0,1,1.91917,3.44266A16.56319,16.56319,0,0,1,71.2388,63.80241Zm-4.64632.23568a16.67147,16.67147,0,0,0-.26932-3.12283A6.72159,6.72159,0,0,0,65.4057,58.508a4.38327,4.38327,0,0,0-1.72562-1.54883,5.9203,5.9203,0,0,0-2.6934-.54713,5.50764,5.50764,0,0,0-2.72724.6145,5.01493,5.01493,0,0,0-1.76765,1.64138,6.78336,6.78336,0,0,0-.9512,2.39892,14.61755,14.61755,0,0,0-.27771,2.90392,17.31539,17.31539,0,0,0,.26933,3.207,6.89963,6.89963,0,0,0,.90907,2.43256,4.176,4.176,0,0,0,1.71714,1.54036,6.11978,6.11978,0,0,0,2.71027.53035,5.57228,5.57228,0,0,0,2.72733-.606,4.89282,4.89282,0,0,0,1.76765-1.64986,6.95938,6.95938,0,0,0,.951-2.43256A15.04263,15.04263,0,0,0,66.59248,64.03809Z"/><path class="cls-3" d="M83.30927,77.03431a3.28523,3.28523,0,0,1-.1095,1.01q-.10961.303-.36186.303H74.6563a2.44054,2.44054,0,0,1-.48833-.042.56421.56421,0,0,1-.31983-.17679.82673.82673,0,0,1-.1683-.38711,3.69028,3.69028,0,0,1-.05051-.69036,4.6401,4.6401,0,0,1,.042-.68169,2.07992,2.07992,0,0,1,.14324-.51339,1.75537,1.75537,0,0,1,.26932-.43781q.168-.20214.42085-.47136l2.222-2.1885q.58905-.58905.97646-1.06061a5.00851,5.00851,0,0,0,.59763-.88372,3.1384,3.1384,0,0,0,.28629-.77442,3.40525,3.40525,0,0,0,.07557-.69866,1.35683,1.35683,0,0,0-.40389-1.02687,1.63972,1.63972,0,0,0-1.17849-.38721,2.91477,2.91477,0,0,0-.95949.15153,6.08163,6.08163,0,0,0-.7829.32822q-.34529.17684-.60593.32831a.91046.91046,0,0,1-.41256.15153.28849.28849,0,0,1-.18507-.06738.51183.51183,0,0,1-.14324-.23568,1.90593,1.90593,0,0,1-.08405-.4461q-.02517-.27775-.02526-.73229a3.87928,3.87928,0,0,1,.0588-.766.8694.8694,0,0,1,.22729-.4461,2.51477,2.51477,0,0,1,.55561-.37873,6.002,6.002,0,0,1,.93424-.39559,9.153,9.153,0,0,1,1.20375-.31145,7.30007,7.30007,0,0,1,1.38034-.12627,6.82737,6.82737,0,0,1,1.99494.26093,4.02672,4.02672,0,0,1,1.42256.74068,2.96436,2.96436,0,0,1,.85018,1.15324,3.80555,3.80555,0,0,1,.27781,1.46459,5.87522,5.87522,0,0,1-.118,1.17,4.45034,4.45034,0,0,1-.51338,1.27941,9.51155,9.51155,0,0,1-1.14476,1.54874,26.0686,26.0686,0,0,1-2.01171,1.99485l-1.21205,1.128h5.01666q.20184,0,.35357.30306A2.42931,2.42931,0,0,1,83.30927,77.03431Z"/><path class="cls-3" d="M66.75249,102.30324a36.68648,36.68648,0,1,1,36.68644-36.68643A36.728,36.728,0,0,1,66.75249,102.30324Zm0-70.01542a33.32894,33.32894,0,1,0,33.32889,33.329A33.36678,33.36678,0,0,0,66.75249,32.28782Z"/><circle class="cls-3" cx="50.95953" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="58.85601" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="66.75249" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="74.64897" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="82.54545" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="50.95953" cy="45.87561" r="2.46765"/><circle class="cls-3" cx="58.85601" cy="45.87561" r="2.46765"/><circle class="cls-3" cx="66.75249" cy="45.87561" r="2.46765"/><circle class="cls-3" cx="74.64897" cy="45.87561" r="2.46765"/><circle class="cls-3" cx="82.54545" cy="45.87561" r="2.46765"/><path class="cls-3" d="M114.47626,52.49016a1.67957,1.67957,0,0,1-1.603-1.18235A48.2413,48.2413,0,0,0,81.06139,19.49749a1.67875,1.67875,0,1,1,.994-3.207,51.59736,51.59736,0,0,1,34.025,34.02349,1.68,1.68,0,0,1-1.60417,2.17616Z"/><path class="cls-3" d="M19.02863,52.49016A1.68012,1.68012,0,0,1,17.42456,50.314a51.59737,51.59737,0,0,1,34.025-34.02349,1.67875,1.67875,0,1,1,.994,3.207A48.24093,48.24093,0,0,0,20.63173,51.30781,1.67968,1.67968,0,0,1,19.02863,52.49016Z"/><path class="cls-3" d="M106.81132,52.49016a1.67953,1.67953,0,0,1-1.57486-1.097A40.99217,40.99217,0,0,0,80.97618,27.13236a1.67876,1.67876,0,1,1,1.16442-3.14914A44.34627,44.34627,0,0,1,108.38579,50.2287a1.68,1.68,0,0,1-1.57447,2.26146Z"/><path class="cls-3" d="M26.69367,52.49016a1.68,1.68,0,0,1-1.57438-2.26146A44.3464,44.3464,0,0,1,51.36438,23.98322a1.67876,1.67876,0,1,1,1.16443,3.14914A40.99327,40.99327,0,0,0,28.26843,51.39312,1.6794,1.6794,0,0,1,26.69367,52.49016Z"/><path class="cls-3" d="M51.94707,115.01855a1.67979,1.67979,0,0,1-.49756-.07568,51.59672,51.59672,0,0,1-34.0249-34.02295,1.67879,1.67879,0,0,1,3.207-.99414,48.24084,48.24084,0,0,0,31.812,31.81006,1.679,1.679,0,0,1-.49658,3.28271Z"/><path class="cls-3" d="M81.55791,115.01855a1.679,1.679,0,0,1-.49658-3.28271,48.24084,48.24084,0,0,0,31.812-31.81006,1.67879,1.67879,0,0,1,3.207.99414,51.5967,51.5967,0,0,1-34.0249,34.02295A1.67979,1.67979,0,0,1,81.55791,115.01855Z"/><path class="cls-3" d="M51.94658,107.355a1.67728,1.67728,0,0,1-.582-.10449A44.34732,44.34732,0,0,1,25.119,81.00488a1.67883,1.67883,0,1,1,3.14941-1.16406,40.99161,40.99161,0,0,0,24.26025,24.26025,1.67906,1.67906,0,0,1-.582,3.25391Z"/><path class="cls-3" d="M81.5584,107.355a1.67906,1.67906,0,0,1-.582-3.25391,40.99158,40.99158,0,0,0,24.26025-24.26025,1.67883,1.67883,0,0,1,3.14942,1.16406,44.34731,44.34731,0,0,1-26.24561,26.24561A1.67921,1.67921,0,0,1,81.5584,107.355Z"/><path class="cls-4" d="M66.75245,125.92694A60.31015,60.31015,0,0,1,24.10673,22.97109a60.31008,60.31008,0,1,1,85.29133,85.29133A59.91532,59.91532,0,0,1,66.75245,125.92694Zm0-117.26272A56.95259,56.95259,0,1,0,123.705,65.61681,57.01712,57.01712,0,0,0,66.75245,8.66422Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_INVALID.svg b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_INVALID.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ae85b8e26c140e7453ba6af4d2e06604058664e1
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_INVALID.svg
@@ -0,0 +1 @@
+<svg id="Layer_4" data-name="Layer 4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 133.64375 133.64375"><defs><style>.cls-1{fill:#956edd;}.cls-2{fill:none;}.cls-3{fill:#694da4;}</style></defs><title>O2-detector</title><circle class="cls-1" cx="66.66186" cy="65.61681" r="60.31013"/><rect class="cls-2" x="-0.17813" y="0.125" width="134" height="134"/><path d="M71.30818,63.80241a16.12322,16.12322,0,0,1-.6734,4.84835,9.7756,9.7756,0,0,1-2.00323,3.62783,8.62318,8.62318,0,0,1-3.29123,2.27265,12.17762,12.17762,0,0,1-4.53681.78271,13.39592,13.39592,0,0,1-4.436-.66492,7.6904,7.6904,0,0,1-3.15647-2.02848,8.68418,8.68418,0,0,1-1.89382-3.46792,17.44222,17.44222,0,0,1-.63128-4.983,15.6269,15.6269,0,0,1,.6733-4.75582,9.71325,9.71325,0,0,1,2.00333-3.59419A8.74681,8.74681,0,0,1,56.65371,53.567a12.11409,12.11409,0,0,1,4.55388-.79119,13.319,13.319,0,0,1,4.36851.65653,7.68483,7.68483,0,0,1,3.16476,2.0202A8.80308,8.80308,0,0,1,70.66,58.89516,16.56286,16.56286,0,0,1,71.30818,63.80241Zm-4.64632.23568a16.67147,16.67147,0,0,0-.26932-3.12283,6.72159,6.72159,0,0,0-.91746-2.40731,4.38327,4.38327,0,0,0-1.72562-1.54883,5.9203,5.9203,0,0,0-2.6934-.54713,5.50767,5.50767,0,0,0-2.72724.6145,5.01493,5.01493,0,0,0-1.76765,1.64138,6.78336,6.78336,0,0,0-.9512,2.39892,14.61756,14.61756,0,0,0-.2777,2.90392,17.31544,17.31544,0,0,0,.26932,3.207,6.89963,6.89963,0,0,0,.90907,2.43256,4.176,4.176,0,0,0,1.71714,1.54036,6.11978,6.11978,0,0,0,2.71027.53035,5.57228,5.57228,0,0,0,2.72733-.606,4.89282,4.89282,0,0,0,1.76765-1.64986,6.95919,6.95919,0,0,0,.951-2.43256A15.04187,15.04187,0,0,0,66.66186,64.03809Z"/><path d="M83.37865,77.03431a3.28523,3.28523,0,0,1-.1095,1.01q-.10961.303-.36186.303H74.72568a2.44054,2.44054,0,0,1-.48833-.042.56421.56421,0,0,1-.31983-.17679.82673.82673,0,0,1-.1683-.38711,3.69114,3.69114,0,0,1-.05051-.69036,4.6401,4.6401,0,0,1,.042-.68169A2.07992,2.07992,0,0,1,73.884,75.856a1.75537,1.75537,0,0,1,.26932-.43781q.168-.20214.42085-.47136l2.222-2.1885q.58907-.58905.97646-1.06061a5.00851,5.00851,0,0,0,.59763-.88372,3.1384,3.1384,0,0,0,.28629-.77442,3.40525,3.40525,0,0,0,.07557-.69866,1.35686,1.35686,0,0,0-.40388-1.02687,1.63975,1.63975,0,0,0-1.1785-.38721,2.91477,2.91477,0,0,0-.95949.15153,6.08163,6.08163,0,0,0-.7829.32822q-.34528.17684-.60593.32831a.91046.91046,0,0,1-.41256.15153.28849.28849,0,0,1-.18507-.06738.51183.51183,0,0,1-.14324-.23568,1.90593,1.90593,0,0,1-.08405-.4461q-.02517-.27775-.02526-.73229a3.87928,3.87928,0,0,1,.0588-.766.8694.8694,0,0,1,.22729-.4461,2.515,2.515,0,0,1,.55561-.37873,6.002,6.002,0,0,1,.93424-.39559,9.15337,9.15337,0,0,1,1.20375-.31145,7.30007,7.30007,0,0,1,1.38034-.12627,6.82737,6.82737,0,0,1,1.99494.26093,4.02672,4.02672,0,0,1,1.42256.74068,2.96448,2.96448,0,0,1,.85019,1.15324,3.80574,3.80574,0,0,1,.2778,1.46459,5.87522,5.87522,0,0,1-.118,1.17,4.45034,4.45034,0,0,1-.51338,1.27941,9.51155,9.51155,0,0,1-1.14476,1.54874,26.0686,26.0686,0,0,1-2.01171,1.99485l-1.212,1.128h5.01665q.20184,0,.35357.30306A2.42931,2.42931,0,0,1,83.37865,77.03431Z"/><path d="M66.82187,102.30324a36.68648,36.68648,0,1,1,36.68644-36.68643A36.728,36.728,0,0,1,66.82187,102.30324Zm0-70.01542a33.32894,33.32894,0,1,0,33.32889,33.329A33.36678,33.36678,0,0,0,66.82187,32.28782Z"/><circle cx="51.02892" cy="85.35801" r="2.46765"/><circle cx="58.92539" cy="85.35801" r="2.46765"/><circle cx="66.82187" cy="85.35801" r="2.46765"/><circle cx="74.71835" cy="85.35801" r="2.46765"/><circle cx="82.61483" cy="85.35801" r="2.46765"/><circle cx="51.02892" cy="45.87561" r="2.46765"/><circle cx="58.92539" cy="45.87561" r="2.46765"/><circle cx="66.82187" cy="45.87561" r="2.46765"/><circle cx="74.71835" cy="45.87561" r="2.46765"/><circle cx="82.61483" cy="45.87561" r="2.46765"/><path d="M114.54564,52.49016a1.67955,1.67955,0,0,1-1.603-1.18235A48.24133,48.24133,0,0,0,81.13077,19.49749a1.67875,1.67875,0,1,1,.994-3.207,51.59736,51.59736,0,0,1,34.025,34.02349,1.68,1.68,0,0,1-1.60417,2.17616Z"/><path d="M19.098,52.49016A1.68012,1.68012,0,0,1,17.49394,50.314,51.59736,51.59736,0,0,1,51.519,16.29051a1.67875,1.67875,0,1,1,.994,3.207A48.24093,48.24093,0,0,0,20.70111,51.30781,1.67968,1.67968,0,0,1,19.098,52.49016Z"/><path d="M106.8807,52.49016a1.67953,1.67953,0,0,1-1.57486-1.097A40.99214,40.99214,0,0,0,81.04556,27.13236,1.67876,1.67876,0,1,1,82.21,23.98322a44.34631,44.34631,0,0,1,26.2452,26.24548,1.68,1.68,0,0,1-1.57448,2.26146Z"/><path d="M26.76305,52.49016a1.68,1.68,0,0,1-1.57438-2.26146A44.3464,44.3464,0,0,1,51.43376,23.98322a1.67876,1.67876,0,1,1,1.16443,3.14914A40.99327,40.99327,0,0,0,28.33781,51.39312,1.67939,1.67939,0,0,1,26.76305,52.49016Z"/><path d="M52.01645,115.01855a1.67979,1.67979,0,0,1-.49756-.07568A51.59672,51.59672,0,0,1,17.494,80.91992a1.67879,1.67879,0,0,1,3.207-.99414,48.24088,48.24088,0,0,0,31.812,31.81006,1.679,1.679,0,0,1-.49658,3.28271Z"/><path d="M81.62729,115.01855a1.679,1.679,0,0,1-.49658-3.28271,48.24084,48.24084,0,0,0,31.812-31.81006,1.67879,1.67879,0,0,1,3.207.99414,51.5967,51.5967,0,0,1-34.0249,34.02295A1.67979,1.67979,0,0,1,81.62729,115.01855Z"/><path d="M52.016,107.355a1.67728,1.67728,0,0,1-.582-.10449,44.34732,44.34732,0,0,1-26.2456-26.24561,1.67883,1.67883,0,1,1,3.14941-1.16406A40.9916,40.9916,0,0,0,52.598,104.10107a1.67906,1.67906,0,0,1-.582,3.25391Z"/><path d="M81.62778,107.355a1.67906,1.67906,0,0,1-.582-3.25391A40.99158,40.99158,0,0,0,105.306,79.84082a1.67883,1.67883,0,1,1,3.14942,1.16406,44.34731,44.34731,0,0,1-26.24561,26.24561A1.67921,1.67921,0,0,1,81.62778,107.355Z"/><path class="cls-3" d="M66.82183,125.92694A60.31015,60.31015,0,0,1,24.17611,22.97109a60.31008,60.31008,0,1,1,85.29133,85.29133A59.91531,59.91531,0,0,1,66.82183,125.92694Zm0-117.26272a56.95259,56.95259,0,1,0,56.95258,56.95259A57.01712,57.01712,0,0,0,66.82183,8.66422Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_NEUTRAL.svg b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_NEUTRAL.svg
new file mode 100644
index 0000000000000000000000000000000000000000..edef5fb65177f35c9565a03f4361222ca17b92ef
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_NEUTRAL.svg
@@ -0,0 +1 @@
+<svg id="Layer_4" data-name="Layer 4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 133.64375 133.64375"><defs><style>.cls-1{fill:#c8cdc9;}.cls-2{fill:none;}</style></defs><title>O2-detector</title><circle class="cls-1" cx="66.66186" cy="65.61681" r="60.31013"/><rect class="cls-2" x="-0.17812" y="0.125" width="134" height="134"/><path d="M71.30818,63.80241a16.12322,16.12322,0,0,1-.6734,4.84835,9.77546,9.77546,0,0,1-2.00323,3.62783,8.62318,8.62318,0,0,1-3.29123,2.27265,12.17759,12.17759,0,0,1-4.53681.78271,13.39592,13.39592,0,0,1-4.436-.66492,7.6904,7.6904,0,0,1-3.15647-2.02848,8.68418,8.68418,0,0,1-1.89382-3.46792,17.44222,17.44222,0,0,1-.63128-4.983,15.6269,15.6269,0,0,1,.6733-4.75582,9.71339,9.71339,0,0,1,2.00333-3.59419A8.74681,8.74681,0,0,1,56.65371,53.567a12.11409,12.11409,0,0,1,4.55388-.79119,13.319,13.319,0,0,1,4.36851.65653,7.68476,7.68476,0,0,1,3.16476,2.0202A8.80308,8.80308,0,0,1,70.66,58.89516,16.56286,16.56286,0,0,1,71.30818,63.80241Zm-4.64632.23568a16.67147,16.67147,0,0,0-.26932-3.12283,6.72159,6.72159,0,0,0-.91746-2.40731,4.38327,4.38327,0,0,0-1.72562-1.54883,5.9203,5.9203,0,0,0-2.6934-.54713,5.50767,5.50767,0,0,0-2.72724.6145,5.01482,5.01482,0,0,0-1.76764,1.64138A6.78319,6.78319,0,0,0,55.61,61.06679a14.61756,14.61756,0,0,0-.2777,2.90392,17.31544,17.31544,0,0,0,.26932,3.207,6.89944,6.89944,0,0,0,.90908,2.43256,4.17592,4.17592,0,0,0,1.71713,1.54036,6.11981,6.11981,0,0,0,2.71027.53035,5.57228,5.57228,0,0,0,2.72733-.606,4.89282,4.89282,0,0,0,1.76765-1.64986,6.95919,6.95919,0,0,0,.951-2.43256A15.04187,15.04187,0,0,0,66.66186,64.03809Z"/><path d="M83.37865,77.03431a3.28523,3.28523,0,0,1-.1095,1.01q-.10961.303-.36186.303H74.72568a2.44037,2.44037,0,0,1-.48832-.042.56414.56414,0,0,1-.31983-.17679.82663.82663,0,0,1-.16831-.38711,3.69114,3.69114,0,0,1-.05051-.69036,4.6401,4.6401,0,0,1,.042-.68169A2.08078,2.08078,0,0,1,73.884,75.856a1.75537,1.75537,0,0,1,.26932-.43781q.168-.20214.42085-.47136l2.222-2.1885q.58907-.58905.97646-1.06061a5.00851,5.00851,0,0,0,.59763-.88372,3.1384,3.1384,0,0,0,.28629-.77442,3.40525,3.40525,0,0,0,.07557-.69866,1.35686,1.35686,0,0,0-.40388-1.02687,1.63973,1.63973,0,0,0-1.1785-.38721,2.91477,2.91477,0,0,0-.95949.15153,6.08163,6.08163,0,0,0-.7829.32822q-.34528.17684-.60592.32831a.91054.91054,0,0,1-.41256.15153.2885.2885,0,0,1-.18508-.06738.51183.51183,0,0,1-.14324-.23568,1.90593,1.90593,0,0,1-.08405-.4461q-.02515-.27775-.02526-.73229a3.87928,3.87928,0,0,1,.0588-.766.86941.86941,0,0,1,.2273-.4461,2.51466,2.51466,0,0,1,.5556-.37873,6.002,6.002,0,0,1,.93424-.39559,9.15337,9.15337,0,0,1,1.20375-.31145,7.30007,7.30007,0,0,1,1.38034-.12627,6.82737,6.82737,0,0,1,1.99494.26093,4.02672,4.02672,0,0,1,1.42256.74068,2.96448,2.96448,0,0,1,.85019,1.15324,3.80574,3.80574,0,0,1,.2778,1.46459,5.87595,5.87595,0,0,1-.118,1.17,4.45039,4.45039,0,0,1-.51339,1.27941,9.511,9.511,0,0,1-1.14476,1.54874,26.0686,26.0686,0,0,1-2.01171,1.99485l-1.212,1.128h5.01665q.20186,0,.35357.30306A2.42931,2.42931,0,0,1,83.37865,77.03431Z"/><path d="M66.82188,102.30324a36.68648,36.68648,0,1,1,36.68643-36.68643A36.728,36.728,0,0,1,66.82188,102.30324Zm0-70.01542a33.32894,33.32894,0,1,0,33.32888,33.329A33.36679,33.36679,0,0,0,66.82188,32.28782Z"/><circle cx="51.02892" cy="85.35801" r="2.46765"/><circle cx="58.9254" cy="85.35801" r="2.46765"/><circle cx="66.82188" cy="85.35801" r="2.46765"/><circle cx="74.71835" cy="85.35801" r="2.46765"/><circle cx="82.61483" cy="85.35801" r="2.46765"/><circle cx="51.02892" cy="45.87561" r="2.46765"/><circle cx="58.9254" cy="45.87561" r="2.46765"/><circle cx="66.82188" cy="45.87561" r="2.46765"/><circle cx="74.71835" cy="45.87561" r="2.46765"/><circle cx="82.61483" cy="45.87561" r="2.46765"/><path d="M114.54564,52.49016a1.67956,1.67956,0,0,1-1.603-1.18235A48.24133,48.24133,0,0,0,81.13077,19.49749a1.67875,1.67875,0,1,1,.994-3.207,51.59736,51.59736,0,0,1,34.025,34.02349,1.68,1.68,0,0,1-1.60417,2.17616Z"/><path d="M19.098,52.49016A1.68012,1.68012,0,0,1,17.49394,50.314,51.59736,51.59736,0,0,1,51.519,16.29051a1.67875,1.67875,0,1,1,.994,3.207A48.24093,48.24093,0,0,0,20.70111,51.30781,1.67967,1.67967,0,0,1,19.098,52.49016Z"/><path d="M106.8807,52.49016a1.67953,1.67953,0,0,1-1.57486-1.097A40.99211,40.99211,0,0,0,81.04556,27.13236,1.67876,1.67876,0,1,1,82.21,23.98322,44.34632,44.34632,0,0,1,108.45518,50.2287a1.68,1.68,0,0,1-1.57448,2.26146Z"/><path d="M26.76305,52.49016a1.68,1.68,0,0,1-1.57438-2.26146,44.34641,44.34641,0,0,1,26.2451-26.24548,1.67876,1.67876,0,1,1,1.16442,3.14914A40.99323,40.99323,0,0,0,28.33782,51.39312,1.67942,1.67942,0,0,1,26.76305,52.49016Z"/><path d="M52.01645,115.01855a1.67968,1.67968,0,0,1-.49755-.07568A51.59671,51.59671,0,0,1,17.494,80.91992a1.67879,1.67879,0,0,1,3.207-.99414,48.24087,48.24087,0,0,0,31.812,31.81006,1.679,1.679,0,0,1-.49659,3.28271Z"/><path d="M81.62729,115.01855a1.679,1.679,0,0,1-.49658-3.28271,48.24084,48.24084,0,0,0,31.812-31.81006,1.67879,1.67879,0,0,1,3.207.99414,51.59668,51.59668,0,0,1-34.0249,34.02295A1.67979,1.67979,0,0,1,81.62729,115.01855Z"/><path d="M52.016,107.355a1.67729,1.67729,0,0,1-.582-.10449,44.34732,44.34732,0,0,1-26.2456-26.24561,1.67883,1.67883,0,1,1,3.14941-1.16406A40.9916,40.9916,0,0,0,52.598,104.10107a1.67906,1.67906,0,0,1-.582,3.25391Z"/><path d="M81.62778,107.355a1.67906,1.67906,0,0,1-.582-3.25391A40.99158,40.99158,0,0,0,105.306,79.84082a1.67883,1.67883,0,1,1,3.14942,1.16406,44.34731,44.34731,0,0,1-26.24561,26.24561A1.67921,1.67921,0,0,1,81.62778,107.355Z"/><path d="M66.82183,125.92694A60.31014,60.31014,0,0,1,24.17612,22.97109a60.31007,60.31007,0,1,1,85.29132,85.29133A59.91531,59.91531,0,0,1,66.82183,125.92694Zm0-117.26272a56.95259,56.95259,0,1,0,56.95258,56.95259A57.01712,57.01712,0,0,0,66.82183,8.66422Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_NEUTRAL_w.svg b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_NEUTRAL_w.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e8974cbf680233e6885c89e3300a8c31c60efd3a
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_NEUTRAL_w.svg
@@ -0,0 +1 @@
+<svg id="Layer_4" data-name="Layer 4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 133.64375 133.64375"><defs><style>.cls-1{fill:#3c3f41;}.cls-2{fill:none;}.cls-3{fill:#fff;}</style></defs><title>O2-detector</title><circle class="cls-1" cx="66.66186" cy="65.61681" r="57.77421"/><rect class="cls-2" x="-0.17813" y="0.125" width="134" height="134"/><path class="cls-3" d="M71.30818,63.80241a16.12322,16.12322,0,0,1-.6734,4.84835,9.7756,9.7756,0,0,1-2.00323,3.62783,8.62318,8.62318,0,0,1-3.29123,2.27265,12.17762,12.17762,0,0,1-4.53681.78271,13.39592,13.39592,0,0,1-4.436-.66492,7.6904,7.6904,0,0,1-3.15647-2.02848,8.68418,8.68418,0,0,1-1.89382-3.46792,17.44222,17.44222,0,0,1-.63128-4.983,15.6269,15.6269,0,0,1,.6733-4.75582,9.71325,9.71325,0,0,1,2.00333-3.59419A8.74681,8.74681,0,0,1,56.65371,53.567a12.11409,12.11409,0,0,1,4.55388-.79119,13.319,13.319,0,0,1,4.36851.65653,7.68483,7.68483,0,0,1,3.16476,2.0202A8.80308,8.80308,0,0,1,70.66,58.89516,16.56286,16.56286,0,0,1,71.30818,63.80241Zm-4.64632.23568a16.67147,16.67147,0,0,0-.26932-3.12283,6.72159,6.72159,0,0,0-.91746-2.40731,4.38327,4.38327,0,0,0-1.72562-1.54883,5.9203,5.9203,0,0,0-2.6934-.54713,5.50767,5.50767,0,0,0-2.72724.6145,5.01493,5.01493,0,0,0-1.76765,1.64138,6.78336,6.78336,0,0,0-.9512,2.39892,14.61756,14.61756,0,0,0-.2777,2.90392,17.31544,17.31544,0,0,0,.26932,3.207,6.89963,6.89963,0,0,0,.90907,2.43256,4.176,4.176,0,0,0,1.71714,1.54036,6.11978,6.11978,0,0,0,2.71027.53035,5.57228,5.57228,0,0,0,2.72733-.606,4.89282,4.89282,0,0,0,1.76765-1.64986,6.95919,6.95919,0,0,0,.951-2.43256A15.04187,15.04187,0,0,0,66.66186,64.03809Z"/><path class="cls-3" d="M83.37865,77.03431a3.28523,3.28523,0,0,1-.1095,1.01q-.10961.303-.36186.303H74.72568a2.44054,2.44054,0,0,1-.48833-.042.56421.56421,0,0,1-.31983-.17679.82673.82673,0,0,1-.1683-.38711,3.69114,3.69114,0,0,1-.05051-.69036,4.6401,4.6401,0,0,1,.042-.68169A2.07992,2.07992,0,0,1,73.884,75.856a1.75537,1.75537,0,0,1,.26932-.43781q.168-.20214.42085-.47136l2.222-2.1885q.58907-.58905.97646-1.06061a5.00851,5.00851,0,0,0,.59763-.88372,3.1384,3.1384,0,0,0,.28629-.77442,3.40525,3.40525,0,0,0,.07557-.69866,1.35686,1.35686,0,0,0-.40388-1.02687,1.63975,1.63975,0,0,0-1.1785-.38721,2.91477,2.91477,0,0,0-.95949.15153,6.08163,6.08163,0,0,0-.7829.32822q-.34528.17684-.60593.32831a.91046.91046,0,0,1-.41256.15153.28849.28849,0,0,1-.18507-.06738.51183.51183,0,0,1-.14324-.23568,1.90593,1.90593,0,0,1-.08405-.4461q-.02517-.27775-.02526-.73229a3.87928,3.87928,0,0,1,.0588-.766.8694.8694,0,0,1,.22729-.4461,2.515,2.515,0,0,1,.55561-.37873,6.002,6.002,0,0,1,.93424-.39559,9.15337,9.15337,0,0,1,1.20375-.31145,7.30007,7.30007,0,0,1,1.38034-.12627,6.82737,6.82737,0,0,1,1.99494.26093,4.02672,4.02672,0,0,1,1.42256.74068,2.96448,2.96448,0,0,1,.85019,1.15324,3.80574,3.80574,0,0,1,.2778,1.46459,5.87522,5.87522,0,0,1-.118,1.17,4.45034,4.45034,0,0,1-.51338,1.27941,9.51155,9.51155,0,0,1-1.14476,1.54874,26.0686,26.0686,0,0,1-2.01171,1.99485l-1.212,1.128h5.01665q.20184,0,.35357.30306A2.42931,2.42931,0,0,1,83.37865,77.03431Z"/><path class="cls-3" d="M66.82187,102.30324a36.68648,36.68648,0,1,1,36.68644-36.68643A36.728,36.728,0,0,1,66.82187,102.30324Zm0-70.01542a33.32894,33.32894,0,1,0,33.32889,33.329A33.36678,33.36678,0,0,0,66.82187,32.28782Z"/><circle class="cls-3" cx="51.02892" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="58.92539" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="66.82187" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="74.71835" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="82.61483" cy="85.35801" r="2.46765"/><circle class="cls-3" cx="51.02892" cy="45.87561" r="2.46765"/><circle class="cls-3" cx="58.92539" cy="45.87561" r="2.46765"/><circle class="cls-3" cx="66.82187" cy="45.87561" r="2.46765"/><circle class="cls-3" cx="74.71835" cy="45.87561" r="2.46765"/><circle class="cls-3" cx="82.61483" cy="45.87561" r="2.46765"/><path class="cls-3" d="M114.54564,52.49016a1.67955,1.67955,0,0,1-1.603-1.18235A48.24133,48.24133,0,0,0,81.13077,19.49749a1.67875,1.67875,0,1,1,.994-3.207,51.59736,51.59736,0,0,1,34.025,34.02349,1.68,1.68,0,0,1-1.60417,2.17616Z"/><path class="cls-3" d="M19.098,52.49016A1.68012,1.68012,0,0,1,17.49394,50.314,51.59736,51.59736,0,0,1,51.519,16.29051a1.67875,1.67875,0,1,1,.994,3.207A48.24093,48.24093,0,0,0,20.70111,51.30781,1.67968,1.67968,0,0,1,19.098,52.49016Z"/><path class="cls-3" d="M106.8807,52.49016a1.67953,1.67953,0,0,1-1.57486-1.097A40.99214,40.99214,0,0,0,81.04556,27.13236,1.67876,1.67876,0,1,1,82.21,23.98322a44.34631,44.34631,0,0,1,26.2452,26.24548,1.68,1.68,0,0,1-1.57448,2.26146Z"/><path class="cls-3" d="M26.76305,52.49016a1.68,1.68,0,0,1-1.57438-2.26146A44.3464,44.3464,0,0,1,51.43376,23.98322a1.67876,1.67876,0,1,1,1.16443,3.14914A40.99327,40.99327,0,0,0,28.33781,51.39312,1.67939,1.67939,0,0,1,26.76305,52.49016Z"/><path class="cls-3" d="M52.01645,115.01855a1.67979,1.67979,0,0,1-.49756-.07568A51.59672,51.59672,0,0,1,17.494,80.91992a1.67879,1.67879,0,0,1,3.207-.99414,48.24088,48.24088,0,0,0,31.812,31.81006,1.679,1.679,0,0,1-.49658,3.28271Z"/><path class="cls-3" d="M81.62729,115.01855a1.679,1.679,0,0,1-.49658-3.28271,48.24084,48.24084,0,0,0,31.812-31.81006,1.67879,1.67879,0,0,1,3.207.99414,51.5967,51.5967,0,0,1-34.0249,34.02295A1.67979,1.67979,0,0,1,81.62729,115.01855Z"/><path class="cls-3" d="M52.016,107.355a1.67728,1.67728,0,0,1-.582-.10449,44.34732,44.34732,0,0,1-26.2456-26.24561,1.67883,1.67883,0,1,1,3.14941-1.16406A40.9916,40.9916,0,0,0,52.598,104.10107a1.67906,1.67906,0,0,1-.582,3.25391Z"/><path class="cls-3" d="M81.62778,107.355a1.67906,1.67906,0,0,1-.582-3.25391A40.99158,40.99158,0,0,0,105.306,79.84082a1.67883,1.67883,0,1,1,3.14942,1.16406,44.34731,44.34731,0,0,1-26.24561,26.24561A1.67921,1.67921,0,0,1,81.62778,107.355Z"/><path class="cls-3" d="M66.82183,125.92694A60.31015,60.31015,0,0,1,24.17611,22.97109a60.31008,60.31008,0,1,1,85.29133,85.29133A59.91531,59.91531,0,0,1,66.82183,125.92694Zm0-117.26272a56.95259,56.95259,0,1,0,56.95258,56.95259A57.01712,57.01712,0,0,0,66.82183,8.66422Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_NOT_CONTROLED.svg b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_NOT_CONTROLED.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2d2db9d4579b16813e3ffa0f0c03ea14e379c5aa
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_NOT_CONTROLED.svg
@@ -0,0 +1 @@
+<svg id="Layer_4" data-name="Layer 4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 133.64375 133.64375"><defs><style>.cls-1{fill:#a9a9a9;}.cls-2{fill:none;}.cls-3{fill:#797979;}</style></defs><title>O2-detector</title><circle class="cls-1" cx="66.83999" cy="65.61681" r="60.31013"/><rect class="cls-2" y="0.125" width="134" height="134"/><path d="M71.4863,63.80241a16.1229,16.1229,0,0,1-.6734,4.84835,9.77532,9.77532,0,0,1-2.00323,3.62783,8.62322,8.62322,0,0,1-3.29122,2.27265,12.17764,12.17764,0,0,1-4.53682.78271,13.39586,13.39586,0,0,1-4.436-.66492,7.69033,7.69033,0,0,1-3.15647-2.02848,8.68419,8.68419,0,0,1-1.89383-3.46792,17.44224,17.44224,0,0,1-.63127-4.983,15.62659,15.62659,0,0,1,.6733-4.75582,9.71311,9.71311,0,0,1,2.00333-3.59419A8.74666,8.74666,0,0,1,56.83184,53.567a12.11407,12.11407,0,0,1,4.55387-.79119,13.319,13.319,0,0,1,4.36851.65653A7.68476,7.68476,0,0,1,68.919,55.4525a8.80309,8.80309,0,0,1,1.91918,3.44266A16.56321,16.56321,0,0,1,71.4863,63.80241ZM66.84,64.03809a16.67147,16.67147,0,0,0-.26932-3.12283A6.72178,6.72178,0,0,0,65.6532,58.508a4.38314,4.38314,0,0,0-1.72562-1.54883,5.92024,5.92024,0,0,0-2.6934-.54713,5.50763,5.50763,0,0,0-2.72723.6145,5.01493,5.01493,0,0,0-1.76765,1.64138,6.783,6.783,0,0,0-.9512,2.39892,14.61755,14.61755,0,0,0-.27771,2.90392,17.3163,17.3163,0,0,0,.26932,3.207,6.89983,6.89983,0,0,0,.90908,2.43256,4.17588,4.17588,0,0,0,1.71714,1.54036,6.11978,6.11978,0,0,0,2.71027.53035,5.5723,5.5723,0,0,0,2.72733-.606,4.89282,4.89282,0,0,0,1.76765-1.64986,6.95918,6.95918,0,0,0,.951-2.43256A15.04185,15.04185,0,0,0,66.84,64.03809Z"/><path d="M83.55677,77.03431a3.28523,3.28523,0,0,1-.1095,1.01q-.10959.303-.36186.303h-8.1816a2.44054,2.44054,0,0,1-.48833-.042.56418.56418,0,0,1-.31983-.17679.82663.82663,0,0,1-.1683-.38711,3.69028,3.69028,0,0,1-.05051-.69036,4.6401,4.6401,0,0,1,.042-.68169,2.07992,2.07992,0,0,1,.14324-.51339,1.75508,1.75508,0,0,1,.26932-.43781q.168-.20214.42085-.47136l2.222-2.1885q.589-.58905.97645-1.06061a5.00861,5.00861,0,0,0,.59764-.88372,3.13874,3.13874,0,0,0,.28628-.77442,3.40528,3.40528,0,0,0,.07558-.69866,1.35687,1.35687,0,0,0-.40389-1.02687,1.63972,1.63972,0,0,0-1.17849-.38721,2.91487,2.91487,0,0,0-.9595.15153,6.08223,6.08223,0,0,0-.7829.32822q-.34527.17684-.60592.32831a.9105.9105,0,0,1-.41256.15153.28847.28847,0,0,1-.18507-.06738.51166.51166,0,0,1-.14324-.23568,1.90586,1.90586,0,0,1-.08406-.4461q-.02515-.27775-.02525-.73229a3.87928,3.87928,0,0,1,.0588-.766.86932.86932,0,0,1,.22729-.4461,2.51477,2.51477,0,0,1,.55561-.37873,6.00142,6.00142,0,0,1,.93423-.39559,9.15337,9.15337,0,0,1,1.20375-.31145,7.30018,7.30018,0,0,1,1.38035-.12627,6.82742,6.82742,0,0,1,1.99494.26093,4.0269,4.0269,0,0,1,1.42256.74068,2.96446,2.96446,0,0,1,.85018,1.15324,3.80574,3.80574,0,0,1,.2778,1.46459,5.87595,5.87595,0,0,1-.118,1.17,4.45039,4.45039,0,0,1-.51339,1.27941,9.51037,9.51037,0,0,1-1.14476,1.54874,26.06678,26.06678,0,0,1-2.01171,1.99485l-1.212,1.128h5.01666q.20184,0,.35356.30306A2.42931,2.42931,0,0,1,83.55677,77.03431Z"/><path d="M67,102.30324a36.68648,36.68648,0,1,1,36.68643-36.68643A36.728,36.728,0,0,1,67,102.30324Zm0-70.01542a33.32894,33.32894,0,1,0,33.32889,33.329A33.36678,33.36678,0,0,0,67,32.28782Z"/><circle cx="51.20704" cy="85.35801" r="2.46765"/><circle cx="59.10352" cy="85.35801" r="2.46765"/><circle cx="67" cy="85.35801" r="2.46765"/><circle cx="74.89648" cy="85.35801" r="2.46765"/><circle cx="82.79296" cy="85.35801" r="2.46765"/><circle cx="51.20704" cy="45.87561" r="2.46765"/><circle cx="59.10352" cy="45.87561" r="2.46765"/><circle cx="67" cy="45.87561" r="2.46765"/><circle cx="74.89648" cy="45.87561" r="2.46765"/><circle cx="82.79296" cy="45.87561" r="2.46765"/><path class="cls-3" d="M114.72377,52.49016a1.67957,1.67957,0,0,1-1.603-1.18235A48.2413,48.2413,0,0,0,81.3089,19.49749a1.67875,1.67875,0,1,1,.994-3.207,51.59737,51.59737,0,0,1,34.025,34.02349,1.68,1.68,0,0,1-1.60416,2.17616Z"/><path class="cls-3" d="M19.27613,52.49016A1.68012,1.68012,0,0,1,17.67207,50.314a51.59737,51.59737,0,0,1,34.025-34.02349,1.67875,1.67875,0,1,1,.994,3.207A48.24091,48.24091,0,0,0,20.87924,51.30781,1.67968,1.67968,0,0,1,19.27613,52.49016Z"/><path class="cls-3" d="M107.05882,52.49016a1.67953,1.67953,0,0,1-1.57486-1.097A40.99212,40.99212,0,0,0,81.22369,27.13236a1.67876,1.67876,0,1,1,1.16442-3.14914A44.34627,44.34627,0,0,1,108.6333,50.2287a1.68,1.68,0,0,1-1.57448,2.26146Z"/><path class="cls-3" d="M26.94118,52.49016A1.68,1.68,0,0,1,25.3668,50.2287,44.34637,44.34637,0,0,1,51.61189,23.98322a1.67876,1.67876,0,1,1,1.16442,3.14914A40.99328,40.99328,0,0,0,28.51594,51.39312,1.6794,1.6794,0,0,1,26.94118,52.49016Z"/><path class="cls-3" d="M52.19458,115.01855a1.67979,1.67979,0,0,1-.49756-.07568,51.5967,51.5967,0,0,1-34.0249-34.02295,1.67879,1.67879,0,0,1,3.207-.99414,48.24084,48.24084,0,0,0,31.812,31.81006,1.679,1.679,0,0,1-.49658,3.28271Z"/><path class="cls-3" d="M81.80542,115.01855a1.679,1.679,0,0,1-.49658-3.28271,48.24084,48.24084,0,0,0,31.812-31.81006,1.67879,1.67879,0,0,1,3.207.99414A51.59672,51.59672,0,0,1,82.303,114.94287,1.67979,1.67979,0,0,1,81.80542,115.01855Z"/><path class="cls-3" d="M52.19409,107.355a1.6772,1.6772,0,0,1-.582-.10449A44.34731,44.34731,0,0,1,25.36645,81.00488a1.67883,1.67883,0,0,1,3.14942-1.16406,40.99158,40.99158,0,0,0,24.26025,24.26025,1.67906,1.67906,0,0,1-.582,3.25391Z"/><path class="cls-3" d="M81.80591,107.355a1.67906,1.67906,0,0,1-.582-3.25391,40.99161,40.99161,0,0,0,24.26025-24.26025,1.67883,1.67883,0,1,1,3.14941,1.16406,44.34732,44.34732,0,0,1-26.2456,26.24561A1.67926,1.67926,0,0,1,81.80591,107.355Z"/><path class="cls-3" d="M67,125.92694A60.31015,60.31015,0,0,1,24.35424,22.97109a60.31008,60.31008,0,1,1,85.29133,85.29133A59.91535,59.91535,0,0,1,67,125.92694ZM67,8.66422a56.95259,56.95259,0,1,0,56.95259,56.95259A57.01713,57.01713,0,0,0,67,8.66422Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_OK.svg b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_OK.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9d3ed09c6e13160f6d9311e37d6eedfead539b41
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_OK.svg
@@ -0,0 +1 @@
+<svg id="Layer_4" data-name="Layer 4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 133.64375 133.64375"><defs><style>.cls-1{fill:#3dd83d;}.cls-2{fill:none;}.cls-3{fill:#288c28;}</style></defs><title>O2-detector</title><circle class="cls-1" cx="66.93905" cy="65.61681" r="60.31013"/><rect class="cls-2" x="0.09906" y="0.125" width="134" height="134"/><path d="M71.58536,63.80241a16.12323,16.12323,0,0,1-.67339,4.84835,9.77548,9.77548,0,0,1-2.00324,3.62783,8.62322,8.62322,0,0,1-3.29122,2.27265,12.17764,12.17764,0,0,1-4.53682.78271,13.39586,13.39586,0,0,1-4.436-.66492,7.69033,7.69033,0,0,1-3.15647-2.02848,8.68419,8.68419,0,0,1-1.89383-3.46792,17.44224,17.44224,0,0,1-.63127-4.983,15.62659,15.62659,0,0,1,.6733-4.75582,9.71311,9.71311,0,0,1,2.00333-3.59419A8.74666,8.74666,0,0,1,56.9309,53.567a12.11407,12.11407,0,0,1,4.55387-.79119,13.319,13.319,0,0,1,4.36851.65653A7.68476,7.68476,0,0,1,69.018,55.4525a8.80309,8.80309,0,0,1,1.91918,3.44266A16.56321,16.56321,0,0,1,71.58536,63.80241Zm-4.64631.23568a16.67147,16.67147,0,0,0-.26932-3.12283,6.72178,6.72178,0,0,0-.91747-2.40731,4.38314,4.38314,0,0,0-1.72562-1.54883,5.92024,5.92024,0,0,0-2.6934-.54713,5.50763,5.50763,0,0,0-2.72723.6145,5.01493,5.01493,0,0,0-1.76765,1.64138,6.78318,6.78318,0,0,0-.9512,2.39892,14.61755,14.61755,0,0,0-.27771,2.90392,17.3163,17.3163,0,0,0,.26932,3.207,6.89983,6.89983,0,0,0,.90908,2.43256A4.176,4.176,0,0,0,58.505,71.15061a6.11978,6.11978,0,0,0,2.71027.53035,5.5723,5.5723,0,0,0,2.72733-.606,4.89282,4.89282,0,0,0,1.76765-1.64986,6.95938,6.95938,0,0,0,.951-2.43256A15.04263,15.04263,0,0,0,66.93905,64.03809Z"/><path d="M83.65583,77.03431a3.28523,3.28523,0,0,1-.1095,1.01q-.10959.303-.36186.303h-8.1816a2.44054,2.44054,0,0,1-.48833-.042.56418.56418,0,0,1-.31983-.17679.82663.82663,0,0,1-.1683-.38711,3.69028,3.69028,0,0,1-.05051-.69036,4.6401,4.6401,0,0,1,.042-.68169,2.07992,2.07992,0,0,1,.14324-.51339,1.75508,1.75508,0,0,1,.26932-.43781q.168-.20214.42085-.47136l2.222-2.1885q.58905-.58905.97645-1.06061a5.00861,5.00861,0,0,0,.59764-.88372,3.13834,3.13834,0,0,0,.28628-.77442,3.40528,3.40528,0,0,0,.07558-.69866,1.35687,1.35687,0,0,0-.40389-1.02687,1.63972,1.63972,0,0,0-1.17849-.38721,2.91487,2.91487,0,0,0-.9595.15153,6.08283,6.08283,0,0,0-.7829.32822q-.34527.17684-.60592.32831a.9105.9105,0,0,1-.41256.15153.28847.28847,0,0,1-.18507-.06738.51174.51174,0,0,1-.14324-.23568,1.90638,1.90638,0,0,1-.08406-.4461q-.02515-.27775-.02525-.73229a3.87928,3.87928,0,0,1,.0588-.766.8694.8694,0,0,1,.22729-.4461,2.51477,2.51477,0,0,1,.55561-.37873,6.00183,6.00183,0,0,1,.93423-.39559,9.15313,9.15313,0,0,1,1.20376-.31145,7.30007,7.30007,0,0,1,1.38034-.12627,6.82742,6.82742,0,0,1,1.99494.26093,4.0269,4.0269,0,0,1,1.42256.74068,2.96446,2.96446,0,0,1,.85018,1.15324,3.80555,3.80555,0,0,1,.2778,1.46459,5.87595,5.87595,0,0,1-.118,1.17,4.45039,4.45039,0,0,1-.51339,1.27941,9.51083,9.51083,0,0,1-1.14475,1.54874,26.069,26.069,0,0,1-2.01172,1.99485l-1.212,1.128h5.01666q.20184,0,.35357.30306A2.42951,2.42951,0,0,1,83.65583,77.03431Z"/><path d="M67.09906,102.30324a36.68648,36.68648,0,1,1,36.68643-36.68643A36.728,36.728,0,0,1,67.09906,102.30324Zm0-70.01542a33.32894,33.32894,0,1,0,33.32889,33.329A33.36678,33.36678,0,0,0,67.09906,32.28782Z"/><circle cx="51.3061" cy="85.35801" r="2.46765"/><circle cx="59.20258" cy="85.35801" r="2.46765"/><circle cx="67.09906" cy="85.35801" r="2.46765"/><circle cx="74.99554" cy="85.35801" r="2.46765"/><circle cx="82.89202" cy="85.35801" r="2.46765"/><circle cx="51.3061" cy="45.87561" r="2.46765"/><circle cx="59.20258" cy="45.87561" r="2.46765"/><circle cx="67.09906" cy="45.87561" r="2.46765"/><circle cx="74.99554" cy="45.87561" r="2.46765"/><circle cx="82.89202" cy="45.87561" r="2.46765"/><path d="M114.82283,52.49016a1.67957,1.67957,0,0,1-1.603-1.18235A48.2413,48.2413,0,0,0,81.408,19.49749a1.67875,1.67875,0,1,1,.994-3.207A51.59737,51.59737,0,0,1,116.427,50.314a1.68,1.68,0,0,1-1.60416,2.17616Z"/><path d="M19.37519,52.49016A1.68012,1.68012,0,0,1,17.77113,50.314a51.59737,51.59737,0,0,1,34.025-34.02349,1.67875,1.67875,0,1,1,.994,3.207A48.24091,48.24091,0,0,0,20.9783,51.30781,1.67968,1.67968,0,0,1,19.37519,52.49016Z"/><path d="M107.15789,52.49016a1.67954,1.67954,0,0,1-1.57487-1.097A40.99212,40.99212,0,0,0,81.32275,27.13236a1.67876,1.67876,0,1,1,1.16442-3.14914A44.34627,44.34627,0,0,1,108.73236,50.2287a1.68,1.68,0,0,1-1.57447,2.26146Z"/><path d="M27.04024,52.49016a1.68,1.68,0,0,1-1.57438-2.26146A44.34637,44.34637,0,0,1,51.71095,23.98322a1.67876,1.67876,0,1,1,1.16442,3.14914A40.99328,40.99328,0,0,0,28.615,51.39312,1.6794,1.6794,0,0,1,27.04024,52.49016Z"/><path d="M52.29364,115.01855a1.67979,1.67979,0,0,1-.49756-.07568,51.5967,51.5967,0,0,1-34.0249-34.02295,1.67879,1.67879,0,0,1,3.207-.99414,48.24084,48.24084,0,0,0,31.812,31.81006,1.679,1.679,0,0,1-.49658,3.28271Z"/><path d="M81.90448,115.01855a1.679,1.679,0,0,1-.49658-3.28271,48.24084,48.24084,0,0,0,31.812-31.81006,1.67879,1.67879,0,0,1,3.207.99414A51.59672,51.59672,0,0,1,82.402,114.94287,1.67979,1.67979,0,0,1,81.90448,115.01855Z"/><path d="M52.29315,107.355a1.6772,1.6772,0,0,1-.582-.10449A44.34734,44.34734,0,0,1,25.46551,81.00488a1.67883,1.67883,0,1,1,3.14942-1.16406,40.99158,40.99158,0,0,0,24.26025,24.26025,1.67906,1.67906,0,0,1-.582,3.25391Z"/><path d="M81.905,107.355a1.67906,1.67906,0,0,1-.582-3.25391,40.99158,40.99158,0,0,0,24.26025-24.26025,1.67883,1.67883,0,1,1,3.14941,1.16406A44.34732,44.34732,0,0,1,82.487,107.25049,1.67926,1.67926,0,0,1,81.905,107.355Z"/><path class="cls-3" d="M67.099,125.92694A60.31015,60.31015,0,0,1,24.4533,22.97109a60.31008,60.31008,0,1,1,85.29133,85.29133A59.91535,59.91535,0,0,1,67.099,125.92694Zm0-117.26272A56.95259,56.95259,0,1,0,124.0516,65.61681,57.01712,57.01712,0,0,0,67.099,8.66422Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_WARNING_2.svg b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_WARNING_2.svg
new file mode 100644
index 0000000000000000000000000000000000000000..637d73b9a2ab696a374985267f14d02c3e69af3b
--- /dev/null
+++ b/NON-APPROVED/odh/99-Shared/symbols/odh/O2-detector_WARNING_2.svg
@@ -0,0 +1 @@
+<svg id="Layer_4" data-name="Layer 4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 133.64375 133.64375"><defs><style>.cls-1{fill:#ffcf00;}.cls-2{fill:none;}.cls-3{fill:#7f6700;}</style></defs><title>O2-detector</title><circle class="cls-1" cx="66.66186" cy="65.61681" r="60.31013"/><rect class="cls-2" x="-0.17813" y="0.125" width="134" height="134"/><path d="M71.30818,63.80241a16.12322,16.12322,0,0,1-.6734,4.84835,9.7756,9.7756,0,0,1-2.00323,3.62783,8.62318,8.62318,0,0,1-3.29123,2.27265,12.17762,12.17762,0,0,1-4.53681.78271,13.39592,13.39592,0,0,1-4.436-.66492,7.6904,7.6904,0,0,1-3.15647-2.02848,8.68418,8.68418,0,0,1-1.89382-3.46792,17.44222,17.44222,0,0,1-.63128-4.983,15.6269,15.6269,0,0,1,.6733-4.75582,9.71325,9.71325,0,0,1,2.00333-3.59419A8.74681,8.74681,0,0,1,56.65371,53.567a12.11409,12.11409,0,0,1,4.55388-.79119,13.319,13.319,0,0,1,4.36851.65653,7.68483,7.68483,0,0,1,3.16476,2.0202A8.80308,8.80308,0,0,1,70.66,58.89516,16.56286,16.56286,0,0,1,71.30818,63.80241Zm-4.64632.23568a16.67147,16.67147,0,0,0-.26932-3.12283,6.72159,6.72159,0,0,0-.91746-2.40731,4.38327,4.38327,0,0,0-1.72562-1.54883,5.9203,5.9203,0,0,0-2.6934-.54713,5.50767,5.50767,0,0,0-2.72724.6145,5.01493,5.01493,0,0,0-1.76765,1.64138,6.78336,6.78336,0,0,0-.9512,2.39892,14.61756,14.61756,0,0,0-.2777,2.90392,17.31544,17.31544,0,0,0,.26932,3.207,6.89963,6.89963,0,0,0,.90907,2.43256,4.176,4.176,0,0,0,1.71714,1.54036,6.11978,6.11978,0,0,0,2.71027.53035,5.57228,5.57228,0,0,0,2.72733-.606,4.89282,4.89282,0,0,0,1.76765-1.64986,6.95919,6.95919,0,0,0,.951-2.43256A15.04187,15.04187,0,0,0,66.66186,64.03809Z"/><path d="M83.37865,77.03431a3.28523,3.28523,0,0,1-.1095,1.01q-.10961.303-.36186.303H74.72568a2.44054,2.44054,0,0,1-.48833-.042.56421.56421,0,0,1-.31983-.17679.82673.82673,0,0,1-.1683-.38711,3.69114,3.69114,0,0,1-.05051-.69036,4.6401,4.6401,0,0,1,.042-.68169A2.07992,2.07992,0,0,1,73.884,75.856a1.75537,1.75537,0,0,1,.26932-.43781q.168-.20214.42085-.47136l2.222-2.1885q.58907-.58905.97646-1.06061a5.00851,5.00851,0,0,0,.59763-.88372,3.1384,3.1384,0,0,0,.28629-.77442,3.40525,3.40525,0,0,0,.07557-.69866,1.35686,1.35686,0,0,0-.40388-1.02687,1.63975,1.63975,0,0,0-1.1785-.38721,2.91477,2.91477,0,0,0-.95949.15153,6.08163,6.08163,0,0,0-.7829.32822q-.34528.17684-.60593.32831a.91046.91046,0,0,1-.41256.15153.28849.28849,0,0,1-.18507-.06738.51183.51183,0,0,1-.14324-.23568,1.90593,1.90593,0,0,1-.08405-.4461q-.02517-.27775-.02526-.73229a3.87928,3.87928,0,0,1,.0588-.766.8694.8694,0,0,1,.22729-.4461,2.515,2.515,0,0,1,.55561-.37873,6.002,6.002,0,0,1,.93424-.39559,9.15337,9.15337,0,0,1,1.20375-.31145,7.30007,7.30007,0,0,1,1.38034-.12627,6.82737,6.82737,0,0,1,1.99494.26093,4.02672,4.02672,0,0,1,1.42256.74068,2.96448,2.96448,0,0,1,.85019,1.15324,3.80574,3.80574,0,0,1,.2778,1.46459,5.87522,5.87522,0,0,1-.118,1.17,4.45034,4.45034,0,0,1-.51338,1.27941,9.51155,9.51155,0,0,1-1.14476,1.54874,26.0686,26.0686,0,0,1-2.01171,1.99485l-1.212,1.128h5.01665q.20184,0,.35357.30306A2.42931,2.42931,0,0,1,83.37865,77.03431Z"/><path d="M66.82187,102.30324a36.68648,36.68648,0,1,1,36.68644-36.68643A36.728,36.728,0,0,1,66.82187,102.30324Zm0-70.01542a33.32894,33.32894,0,1,0,33.32889,33.329A33.36678,33.36678,0,0,0,66.82187,32.28782Z"/><circle cx="51.02892" cy="85.35801" r="2.46765"/><circle cx="58.92539" cy="85.35801" r="2.46765"/><circle cx="66.82187" cy="85.35801" r="2.46765"/><circle cx="74.71835" cy="85.35801" r="2.46765"/><circle cx="82.61483" cy="85.35801" r="2.46765"/><circle cx="51.02892" cy="45.87561" r="2.46765"/><circle cx="58.92539" cy="45.87561" r="2.46765"/><circle cx="66.82187" cy="45.87561" r="2.46765"/><circle cx="74.71835" cy="45.87561" r="2.46765"/><circle cx="82.61483" cy="45.87561" r="2.46765"/><path d="M114.54564,52.49016a1.67955,1.67955,0,0,1-1.603-1.18235A48.24133,48.24133,0,0,0,81.13077,19.49749a1.67875,1.67875,0,1,1,.994-3.207,51.59736,51.59736,0,0,1,34.025,34.02349,1.68,1.68,0,0,1-1.60417,2.17616Z"/><path d="M19.098,52.49016A1.68012,1.68012,0,0,1,17.49394,50.314,51.59736,51.59736,0,0,1,51.519,16.29051a1.67875,1.67875,0,1,1,.994,3.207A48.24093,48.24093,0,0,0,20.70111,51.30781,1.67968,1.67968,0,0,1,19.098,52.49016Z"/><path d="M106.8807,52.49016a1.67953,1.67953,0,0,1-1.57486-1.097A40.99214,40.99214,0,0,0,81.04556,27.13236,1.67876,1.67876,0,1,1,82.21,23.98322a44.34631,44.34631,0,0,1,26.2452,26.24548,1.68,1.68,0,0,1-1.57448,2.26146Z"/><path d="M26.76305,52.49016a1.68,1.68,0,0,1-1.57438-2.26146A44.3464,44.3464,0,0,1,51.43376,23.98322a1.67876,1.67876,0,1,1,1.16443,3.14914A40.99327,40.99327,0,0,0,28.33781,51.39312,1.67939,1.67939,0,0,1,26.76305,52.49016Z"/><path d="M52.01645,115.01855a1.67979,1.67979,0,0,1-.49756-.07568A51.59672,51.59672,0,0,1,17.494,80.91992a1.67879,1.67879,0,0,1,3.207-.99414,48.24088,48.24088,0,0,0,31.812,31.81006,1.679,1.679,0,0,1-.49658,3.28271Z"/><path d="M81.62729,115.01855a1.679,1.679,0,0,1-.49658-3.28271,48.24084,48.24084,0,0,0,31.812-31.81006,1.67879,1.67879,0,0,1,3.207.99414,51.5967,51.5967,0,0,1-34.0249,34.02295A1.67979,1.67979,0,0,1,81.62729,115.01855Z"/><path d="M52.016,107.355a1.67728,1.67728,0,0,1-.582-.10449,44.34732,44.34732,0,0,1-26.2456-26.24561,1.67883,1.67883,0,1,1,3.14941-1.16406A40.9916,40.9916,0,0,0,52.598,104.10107a1.67906,1.67906,0,0,1-.582,3.25391Z"/><path d="M81.62778,107.355a1.67906,1.67906,0,0,1-.582-3.25391A40.99158,40.99158,0,0,0,105.306,79.84082a1.67883,1.67883,0,1,1,3.14942,1.16406,44.34731,44.34731,0,0,1-26.24561,26.24561A1.67921,1.67921,0,0,1,81.62778,107.355Z"/><path class="cls-3" d="M66.82183,125.92694A60.31015,60.31015,0,0,1,24.17611,22.97109a60.31008,60.31008,0,1,1,85.29133,85.29133A59.91531,59.91531,0,0,1,66.82183,125.92694Zm0-117.26272a56.95259,56.95259,0,1,0,56.95258,56.95259A57.01712,57.01712,0,0,0,66.82183,8.66422Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
index 2b4198f4b21544ae037440863448ffb714a1c80f..08a13b47e6a25274e037c01b192949c3f598cad5 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(LOC_ACRONYM)</name>
+ <name>$(LOC_ACRONYM=CTL)</name>
+ <macros>
+ <AREA>$(LOC_ACRONYM)</AREA>
+ <BLOCKICONS>99-Shared/blockicons</BLOCKICONS>
+ <POPUPS>99-Shared/popups</POPUPS>
+ <SYMBOLS>99-Shared/symbols</SYMBOLS>
+ </macros>
<width>630</width>
<height>830</height>
<widget type="group" version="2.0.0">
@@ -26,6 +32,22 @@
<corner_width>10</corner_width>
<corner_height>10</corner_height>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey03-title</name>
+ <text>$(LOC)</text>
+ <width>600</width>
+ <height>50</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="group" version="2.0.0">
<name>Area</name>
<x>10</x>
@@ -115,13 +137,13 @@
<x>71</x>
<y>74</y>
<width>140</width>
- <height>21</height>
+ <height>25</height>
<vertical_alignment>1</vertical_alignment>
<auto_size>true</auto_size>
</widget>
</widget>
<widget type="group" version="2.0.0">
- <name>Signals_1</name>
+ <name>Area</name>
<x>10</x>
<y>130</y>
<width>560</width>
@@ -129,7 +151,7 @@
<style>3</style>
<widget type="picture" version="2.0.0">
<name>Picture_2</name>
- <file>symbols/AreaLayout_CTL.png</file>
+ <file>$(SYMBOLS)/AreaLayout_CTL.png</file>
<x>10</x>
<y>10</y>
<width>540</width>
@@ -138,13 +160,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_20</name>
<macros>
- <P>CTLG-CS:ODH-O2iM-$(R)</P>
- <R>20</R>
+ <IDX>20</IDX>
+ <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>396</x>
<y>422</y>
<width>84</width>
<height>55</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -198,7 +222,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_22</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -217,7 +241,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_22</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -238,7 +262,7 @@
<name>OpenExpert_22</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -252,13 +276,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_21</name>
<macros>
- <P>CTLG-CS:ODH-O2iM-$(R)</P>
- <R>21</R>
+ <IDX>21</IDX>
+ <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>396</x>
<y>249</y>
<width>84</width>
<height>55</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -312,7 +338,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_23</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -331,7 +357,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_23</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -352,7 +378,7 @@
<name>OpenExpert_23</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -366,13 +392,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_22</name>
<macros>
- <P>CTLG-CS:ODH-O2iM-$(R)</P>
- <R>22</R>
+ <IDX>22</IDX>
+ <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>395</x>
<y>80</y>
<width>84</width>
<height>55</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -426,7 +454,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_24</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -445,7 +473,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_24</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -466,7 +494,7 @@
<name>OpenExpert_24</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -477,12 +505,54 @@
<tooltip>Open Monitor Panel</tooltip>
</widget>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>20</IDX>
+ <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>396</x>
+ <y>422</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>21</IDX>
+ <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>396</x>
+ <y>249</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>22</IDX>
+ <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>396</x>
+ <y>80</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Action Button</name>
+ <name>Trend Button</name>
<actions>
<action type="open_display">
- <file>ODH_Trend.bob</file>
+ <file>$(POPUPS)/ODH_Trend.bob</file>
<macros>
<P>$(LOC)</P>
<PLT>ODH_Trend_CTL.plt</PLT>
@@ -499,21 +569,5 @@
<tooltip>$(actions)</tooltip>
</widget>
</widget>
- <widget type="label" version="2.0.0">
- <name>BGGrey03-title</name>
- <text>$(LOC)</text>
- <width>600</width>
- <height>50</height>
- <font>
- <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
- </font>
- </font>
- <foreground_color>
- <color name="TEXT-LIGHT" red="230" green="230" blue="230">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</widget>
</display>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
index 6ab3c3533cdb95eeb6fb85e7c8767d443fbfccf1..9ea0b32476e027299f9622d0e51780e31bf7aa61 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(LOC_ACRONYM)</name>
+ <name>$(LOC_ACRONYM=CXB)</name>
+ <macros>
+ <AREA>$(LOC_ACRONYM)</AREA>
+ <BLOCKICONS>99-Shared/blockicons</BLOCKICONS>
+ <POPUPS>99-Shared/popups</POPUPS>
+ <SYMBOLS>99-Shared/symbols</SYMBOLS>
+ </macros>
<width>1040</width>
<height>830</height>
<widget type="group" version="2.0.0">
@@ -115,13 +121,13 @@
<x>71</x>
<y>74</y>
<width>140</width>
- <height>21</height>
+ <height>23</height>
<vertical_alignment>1</vertical_alignment>
<auto_size>true</auto_size>
</widget>
</widget>
<widget type="group" version="2.0.0">
- <name>Signals_1</name>
+ <name>Area</name>
<x>10</x>
<y>130</y>
<width>970</width>
@@ -129,7 +135,7 @@
<style>3</style>
<widget type="picture" version="2.0.0">
<name>Picture_2</name>
- <file>symbols/AreaLayout_CXH.png</file>
+ <file>$(SYMBOLS)/AreaLayout_CXH.png</file>
<x>10</x>
<y>10</y>
<width>950</width>
@@ -138,13 +144,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_13</name>
<macros>
- <P>CXB-CXH:ODH-O2iM-$(R)</P>
- <R>13</R>
+ <IDX>13</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>350</x>
<y>76</y>
<width>85</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -198,7 +206,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_15</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -217,7 +225,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_15</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -238,7 +246,7 @@
<name>OpenExpert_15</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -252,13 +260,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_14</name>
<macros>
- <P>CXB-CXH:ODH-O2iM-$(R)</P>
- <R>14</R>
+ <IDX>14</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>797</x>
<y>464</y>
<width>84</width>
<height>55</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -312,7 +322,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_16</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -331,7 +341,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_16</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -352,7 +362,7 @@
<name>OpenExpert_16</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -366,13 +376,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_15</name>
<macros>
- <P>CXB-CXH:ODH-O2iM-$(R)</P>
- <R>15</R>
+ <IDX>15</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>609</x>
<y>464</y>
<width>84</width>
<height>55</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -426,7 +438,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_17</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -445,7 +457,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_17</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -466,7 +478,7 @@
<name>OpenExpert_17</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -480,13 +492,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_16</name>
<macros>
- <P>CXB-CXH:ODH-O2iM-$(R)</P>
- <R>16</R>
+ <IDX>16</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>251</x>
<y>464</y>
<width>84</width>
<height>55</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -540,7 +554,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_18</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -559,7 +573,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_18</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -580,7 +594,7 @@
<name>OpenExpert_18</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -594,13 +608,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_17</name>
<macros>
- <P>CXB-CXH:ODH-O2iM-$(R)</P>
- <R>17</R>
+ <IDX>17</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>65</x>
<y>464</y>
<width>84</width>
<height>55</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -654,7 +670,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_19</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -673,7 +689,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_19</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -694,7 +710,7 @@
<name>OpenExpert_19</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -708,13 +724,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_18</name>
<macros>
- <P>CXB-CXH:ODH-O2iM-$(R)</P>
- <R>18</R>
+ <IDX>18</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>458</x>
<y>193</y>
<width>84</width>
<height>56</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -768,7 +786,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_20</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -787,7 +805,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_20</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -808,7 +826,7 @@
<name>OpenExpert_20</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -823,13 +841,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_19</name>
<macros>
- <P>CXB-CXH:ODH-O2iM-$(R)</P>
- <R>19</R>
+ <IDX>19</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>460</x>
<y>325</y>
<width>84</width>
<height>55</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -883,7 +903,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_21</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -902,7 +922,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_21</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -923,7 +943,7 @@
<name>OpenExpert_21</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -934,12 +954,110 @@
<tooltip>Open Monitor Panel</tooltip>
</widget>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>13</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>350</x>
+ <y>76</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>14</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>797</x>
+ <y>464</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>15</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>609</x>
+ <y>464</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>16</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>251</x>
+ <y>464</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>17</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>65</x>
+ <y>464</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>18</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>458</x>
+ <y>193</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>19</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>460</x>
+ <y>325</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Action Button</name>
+ <name>Trend Button</name>
<actions>
<action type="open_display">
- <file>ODH_Trend.bob</file>
+ <file>$(POPUPS)/ODH_Trend.bob</file>
<macros>
<P>$(LOC)</P>
<PLT>ODH_Trend_CXB.plt</PLT>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
index 74cb253fe7f2df7a52bb4c692d300074c9773130..7fd33c797e22d7dc65d7776f3b229947d6ecdc6f 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(LOC_ACRONYM)</name>
+ <name>$(LOC_ACRONYM=HCB)</name>
+ <macros>
+ <AREA>$(LOC_ACRONYM)</AREA>
+ <BLOCKICONS>99-Shared/blockicons</BLOCKICONS>
+ <POPUPS>99-Shared/popups</POPUPS>
+ <SYMBOLS>99-Shared/symbols</SYMBOLS>
+ </macros>
<width>1040</width>
<height>830</height>
<widget type="group" version="2.0.0">
@@ -26,6 +32,22 @@
<corner_width>10</corner_width>
<corner_height>10</corner_height>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey03-title</name>
+ <text>$(LOC)</text>
+ <width>1010</width>
+ <height>50</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="group" version="2.0.0">
<name>Area</name>
<x>10</x>
@@ -115,13 +137,13 @@
<x>71</x>
<y>74</y>
<width>140</width>
- <height>21</height>
+ <height>25</height>
<vertical_alignment>1</vertical_alignment>
<auto_size>true</auto_size>
</widget>
</widget>
<widget type="group" version="2.0.0">
- <name>Signals_1</name>
+ <name>Area</name>
<x>10</x>
<y>130</y>
<width>970</width>
@@ -129,7 +151,7 @@
<style>3</style>
<widget type="picture" version="2.0.0">
<name>Picture_2</name>
- <file>symbols/AreaLayout_HCB.png</file>
+ <file>$(SYMBOLS)/AreaLayout_HCB.png</file>
<x>10</x>
<y>10</y>
<width>950</width>
@@ -138,20 +160,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_2</name>
<macros>
- <P>HCB-ACH:ODH-O2iM-$(R)</P>
- <R>2</R>
+ <IDX>2</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>366</x>
<y>422</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_4</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -212,7 +236,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_4</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -232,7 +256,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_4</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -254,20 +278,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_3</name>
<macros>
- <P>HCB-ACH:ODH-O2iM-$(R)</P>
- <R>3</R>
+ <IDX>3</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>366</x>
<y>273</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_12</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -328,7 +354,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_12</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -348,7 +374,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_12</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -370,20 +396,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_4</name>
<macros>
- <P>HCB-ACH:ODH-O2iM-$(R)</P>
- <R>4</R>
+ <IDX>4</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>366</x>
<y>89</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_13</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -444,7 +472,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_13</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -464,7 +492,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_13</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -486,20 +514,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_9</name>
<macros>
- <P>HCB-TCH:ODH-O2iM-$(R)</P>
- <R>9</R>
+ <IDX>9</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>34</x>
<y>217</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_8</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -560,7 +590,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_8</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -580,7 +610,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_8</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -602,20 +632,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_11</name>
<macros>
- <P>HCB-HPGS:ODH-O2iM-$(R)</P>
- <R>11</R>
+ <IDX>11</IDX>
+ <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>80</x>
<y>65</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_10</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -676,7 +708,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_10</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -696,7 +728,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_10</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -718,20 +750,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_7</name>
<macros>
- <P>HCB-TCH:ODH-O2iM-$(R)</P>
- <R>7</R>
+ <IDX>7</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>34</x>
<y>463</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_6</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -792,7 +826,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_6</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -812,7 +846,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_6</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -834,20 +868,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_8</name>
<macros>
- <P>HCB-TCH:ODH-O2iM-$(R)</P>
- <R>8</R>
+ <IDX>8</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>33</x>
<y>328</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_7</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -908,7 +944,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_7</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -928,7 +964,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_7</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -950,20 +986,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_6</name>
<macros>
- <P>HCB-TCH:ODH-O2iM-$(R)</P>
- <R>6</R>
+ <IDX>6</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>256</x>
<y>422</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_5</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1024,7 +1062,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_5</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1043,7 +1081,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_5</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1064,20 +1102,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_10</name>
<macros>
- <P>HCB-HPGS:ODH-O2iM-$(R)</P>
- <R>10</R>
+ <IDX>10</IDX>
+ <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>211</x>
<y>66</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_9</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1138,7 +1178,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_9</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1157,7 +1197,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_9</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1178,20 +1218,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_1</name>
<macros>
- <P>HCB-ACH:ODH-O2iM-$(R)</P>
- <R>1</R>
+ <IDX>1</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>755</x>
<y>337</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1252,7 +1294,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1271,7 +1313,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1292,20 +1334,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_12</name>
<macros>
- <P>HCB-DogSh:ODH-O2iM-$(R)</P>
- <R>12</R>
+ <IDX>12</IDX>
+ <P>HCB-DogSh:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>858</x>
<y>442</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_11</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1366,7 +1410,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_11</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1385,7 +1429,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_11</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1406,20 +1450,22 @@
<widget type="group" version="2.0.0">
<name>O2iM_5</name>
<macros>
- <P>HCB-ACH:ODH-O2iM-$(R)</P>
- <R>5</R>
+ <IDX>5</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>755</x>
<y>164</y>
<width>83</width>
<height>54</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="action_button" version="3.0.0">
<name>OpenExpert_14</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1480,7 +1526,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_14</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1499,7 +1545,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_14</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1517,12 +1563,180 @@
<tooltip>Monitor Healthy Error!</tooltip>
</widget>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>2</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>366</x>
+ <y>422</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>3</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>366</x>
+ <y>273</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>4</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>366</x>
+ <y>89</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>9</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>34</x>
+ <y>217</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>11</IDX>
+ <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>80</x>
+ <y>65</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>7</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>34</x>
+ <y>463</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>8</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>33</x>
+ <y>328</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>6</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>256</x>
+ <y>422</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>10</IDX>
+ <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>211</x>
+ <y>66</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>1</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>755</x>
+ <y>337</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>12</IDX>
+ <P>HCB-DogSh:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>858</x>
+ <y>432</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>5</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/odh.bob</file>
+ <x>755</x>
+ <y>164</y>
+ <width>84</width>
+ <height>80</height>
+ <resize>2</resize>
+ </widget>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Action Button</name>
+ <name>Trend Button</name>
<actions>
<action type="open_display">
- <file>ODH_Trend.bob</file>
+ <file>$(POPUPS)/ODH_Trend.bob</file>
<macros>
<P>$(LOC)</P>
<PLT>ODH_Trend_HCB.plt</PLT>
@@ -1539,21 +1753,5 @@
<tooltip>$(actions)</tooltip>
</widget>
</widget>
- <widget type="label" version="2.0.0">
- <name>BGGrey03-title</name>
- <text>$(LOC)</text>
- <width>1010</width>
- <height>50</height>
- <font>
- <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
- </font>
- </font>
- <foreground_color>
- <color name="TEXT-LIGHT" red="230" green="230" blue="230">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</widget>
</display>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob b/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob
index 45cbca42faaa84470970dd3f48875ca2a5bdc2a8..e3a09566aaafc1590d2e3797797ff910cb5c59a9 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(LOC_ACRONYM)</name>
+ <name>$(LOC_ACRONYM=TS2)</name>
<macros>
<AREA>$(LOC)</AREA>
+ <BLOCKICONS>99-Shared/blockicons</BLOCKICONS>
<P>KG-GTA:PSS-Area-TS2</P>
+ <SYMBOLS>99-Shared/symbols</SYMBOLS>
</macros>
<width>860</width>
<height>830</height>
@@ -30,6 +32,22 @@
<corner_width>10</corner_width>
<corner_height>10</corner_height>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey03-title</name>
+ <text>$(LOC)</text>
+ <width>840</width>
+ <height>50</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="group" version="2.0.0">
<name>Area</name>
<x>10</x>
@@ -157,13 +175,13 @@
<x>71</x>
<y>74</y>
<width>140</width>
- <height>21</height>
+ <height>23</height>
<vertical_alignment>1</vertical_alignment>
<auto_size>true</auto_size>
</widget>
</widget>
<widget type="group" version="2.0.0">
- <name>Signals_1</name>
+ <name>Area</name>
<x>10</x>
<y>130</y>
<width>800</width>
@@ -171,7 +189,7 @@
<style>3</style>
<widget type="picture" version="2.0.0">
<name>Plan</name>
- <file>symbols/AreaLayout_TS2.png</file>
+ <file>$(SYMBOLS)/AreaLayout_TS2.png</file>
<x>10</x>
<y>10</y>
<width>780</width>
@@ -180,13 +198,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_1</name>
<macros>
- <P>KG-GTA:ODH-O2iM-$(R)</P>
- <R>1</R>
+ <IDX>1</IDX>
+ <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>25</x>
<y>39</y>
<width>84</width>
<height>52</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -252,8 +272,8 @@
<name>MonitHealthy_23</name>
<pv_name>$(P):MonitHealthy</pv_name>
<symbols>
- <symbol>symbols/custom/error.svg</symbol>
- <symbol>symbols/custom/ConnectedPNG.png</symbol>
+ <symbol>$(SYMBOLS)/custom/error.svg</symbol>
+ <symbol>$(SYMBOLS)/custom/ConnectedPNG.png</symbol>
</symbols>
<x>3</x>
<y>29</y>
@@ -278,13 +298,15 @@
<widget type="group" version="2.0.0">
<name>O2iM_2</name>
<macros>
- <P>KG-GTA:ODH-O2iM-$(R)</P>
- <R>2</R>
+ <IDX>2</IDX>
+ <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
<x>585</x>
<y>39</y>
<width>84</width>
<height>52</height>
+ <visible>false</visible>
<style>3</style>
<transparent>true</transparent>
<widget type="led" version="2.0.0">
@@ -350,8 +372,8 @@
<name>MonitHealthy_24</name>
<pv_name>$(P):MonitHealthy</pv_name>
<symbols>
- <symbol>symbols/custom/error.svg</symbol>
- <symbol>symbols/custom/ConnectedPNG.png</symbol>
+ <symbol>$(SYMBOLS)/custom/error.svg</symbol>
+ <symbol>$(SYMBOLS)/custom/ConnectedPNG.png</symbol>
</symbols>
<x>3</x>
<y>29</y>
@@ -373,12 +395,40 @@
<tooltip>Open Monitor Panel</tooltip>
</widget>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>1</IDX>
+ <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/ts2_odh_right.bob</file>
+ <x>21</x>
+ <y>41</y>
+ <width>168</width>
+ <height>50</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(P)</name>
+ <macros>
+ <IDX>2</IDX>
+ <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
+ </macros>
+ <file>$(BLOCKICONS)/ts2_odh_right.bob</file>
+ <x>580</x>
+ <y>41</y>
+ <width>168</width>
+ <height>50</height>
+ <resize>2</resize>
+ </widget>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Action Button</name>
+ <name>Trend Button</name>
<actions>
<action type="open_display">
- <file>ODH_Trend.bob</file>
+ <file>$(POPUPS)/ODH_Trend.bob</file>
<macros>
<P>$(LOC)</P>
<PLT>ODH_Trend_TS2.plt</PLT>
@@ -395,21 +445,5 @@
<tooltip>$(actions)</tooltip>
</widget>
</widget>
- <widget type="label" version="2.0.0">
- <name>BGGrey03-title</name>
- <text>$(LOC)</text>
- <width>840</width>
- <height>50</height>
- <font>
- <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
- </font>
- </font>
- <foreground_color>
- <color name="TEXT-LIGHT" red="230" green="230" blue="230">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</widget>
</display>
diff --git a/NON-APPROVED/odh/ODH_Main.bob b/NON-APPROVED/odh/ODH_Main.bob
index 33656883d43393e148c26f56605888226c4d8690..3ddfdebe76c1e36cec3b6c2ac55c9b19d7c0fa23 100644
--- a/NON-APPROVED/odh/ODH_Main.bob
+++ b/NON-APPROVED/odh/ODH_Main.bob
@@ -2,6 +2,8 @@
<display version="2.0.0">
<name>ODH Main</name>
<macros>
+ <EMBEDDED_DISPLAYS>99-Shared/embedded_displays</EMBEDDED_DISPLAYS>
+ <POPUPS>99-Shared/popups</POPUPS>
<TS2_PATH>../TS2/pss</TS2_PATH>
</macros>
<width>645</width>
@@ -38,7 +40,7 @@
<name>PLC Button</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Diag.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Diag.bob</file>
<target>tab</target>
<description>PLC Diagnostic</description>
</action>
@@ -47,15 +49,13 @@
<y>10</y>
<width>130</width>
<height>40</height>
+ <background_color>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </background_color>
<rules>
<rule name="Color" prop_id="background_color" out_exp="false">
- <exp bool_exp="pv0 == false">
- <value>
- <color name="ERROR" red="252" green="13" blue="27">
- </color>
- </value>
- </exp>
- <exp bool_exp="pv0 == true">
+ <exp bool_exp="pvInt0">
<value>
<color name="Button_Background" red="236" green="236" blue="236">
</color>
@@ -89,7 +89,7 @@
<name>Rack Button</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Racks.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Racks.bob</file>
<target>standalone</target>
<description>Electrical Racks</description>
</action>
@@ -106,7 +106,7 @@
<x>172</x>
<y>70</y>
<width>61</width>
- <height>21</height>
+ <height>25</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
@@ -126,8 +126,8 @@
Warning</text>
<x>254</x>
<y>60</y>
- <width>79</width>
- <height>42</height>
+ <width>80</width>
+ <height>49</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
@@ -148,7 +148,7 @@ Alarm</text>
<x>347</x>
<y>60</y>
<width>66</width>
- <height>42</height>
+ <height>49</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
@@ -169,7 +169,7 @@ Healthy</text>
<x>437</x>
<y>60</y>
<width>57</width>
- <height>42</height>
+ <height>49</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
@@ -189,7 +189,7 @@ Healthy</text>
<x>513</x>
<y>70</y>
<width>92</width>
- <height>21</height>
+ <height>25</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
@@ -230,6 +230,9 @@ Healthy</text>
</widget>
<widget type="group" version="2.0.0">
<name>Group HCB</name>
+ <macros>
+ <AREA>HCB</AREA>
+ </macros>
<x>72</x>
<y>111</y>
<width>535</width>
@@ -251,260 +254,161 @@ Healthy</text>
</background_color>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_13</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-ACH:ODH-O2iM</P>
- <R>1</R>
+ <IDX>1</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>5</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_14</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-ACH:ODH-O2iM</P>
- <R>2</R>
+ <IDX>2</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>37</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_15</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-ACH:ODH-O2iM</P>
- <R>3</R>
+ <IDX>3</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>68</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_16</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-ACH:ODH-O2iM</P>
- <R>4</R>
+ <IDX>4</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>99</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_17</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-ACH:ODH-O2iM</P>
- <R>5</R>
+ <IDX>5</IDX>
+ <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>130</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_18</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-TCH:ODH-O2iM</P>
- <R>6</R>
+ <IDX>6</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>161</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_19</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-TCH:ODH-O2iM</P>
- <R>7</R>
+ <IDX>7</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>192</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_20</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-TCH:ODH-O2iM</P>
- <R>8</R>
+ <IDX>8</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>223</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_21</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-TCH:ODH-O2iM</P>
- <R>9</R>
+ <IDX>9</IDX>
+ <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>254</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_22</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-HPGS:ODH-O2iM</P>
- <R>10</R>
+ <IDX>10</IDX>
+ <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>285</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_23</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-HPGS:ODH-O2iM</P>
- <R>11</R>
+ <IDX>11</IDX>
+ <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>316</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_24</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>HCB-DogSh:ODH-O2iM</P>
- <R>12</R>
+ <IDX>12</IDX>
+ <P>HCB-DogSh:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>347</y>
<width>510</width>
<height>30</height>
</widget>
- <widget type="group" version="2.0.0">
- <name>Group</name>
- <x>128</x>
- <y>238</y>
- <width>286</width>
- <height>125</height>
- <style>3</style>
- <transparent>true</transparent>
- <rules>
- <rule name="Visibility" prop_id="visible" out_exp="false">
- <exp bool_exp="pv0 || pv1 || pv2">
- <value>true</value>
- </exp>
- <exp bool_exp="true">
- <value>false</value>
- </exp>
- <pv_name>KG-GTA:ODH-PLC-01:ODHAlarm</pv_name>
- <pv_name>KG-GTA:ODH-PLC-01:MonitHealthyErr</pv_name>
- <pv_name>KG-GTA:ODH-PLC-01:ConnLost</pv_name>
- </rule>
- <rule name="msgBoxClose" prop_id="visible" out_exp="false">
- <exp bool_exp="true">
- <value>false</value>
- </exp>
- <pv_name>loc://msgBoxClose</pv_name>
- </rule>
- </rules>
- <widget type="rectangle" version="2.0.0">
- <name>Rectangle</name>
- <width>286</width>
- <height>125</height>
- <line_color>
- <color name="GRAY-BORDER" red="121" green="121" blue="121">
- </color>
- </line_color>
- <background_color>
- <color name="YELLOW-BACKGROUND" red="226" green="216" blue="193">
- </color>
- </background_color>
- </widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button_6</name>
- <actions>
- <action type="write_pv">
- <pv_name>loc://msgBoxClose</pv_name>
- <value>1</value>
- <description>msgBoxClose</description>
- </action>
- </actions>
- <text>X</text>
- <x>252</x>
- <y>11</y>
- <width>25</width>
- <height>22</height>
- <tooltip>$(actions)</tooltip>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_Header</name>
- <text>MAJOR ALARM IN ODH</text>
- <x>38</x>
- <y>13</y>
- <width>204</width>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_Msg_2</name>
- <text>Click OK to open Alarm Table</text>
- <x>13</x>
- <y>46</y>
- <width>257</width>
- <font>
- <font name="Comment" family="Source Sans Pro" style="ITALIC" size="16.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button_5</name>
- <actions>
- <action type="execute">
- <script file="EmbeddedPy">
- <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.rcp.script import RCPUtil
-
-RCPUtil.executeEclipseCommand(
- 'org.eclipse.ui.views.showView',
- [ 'org.eclipse.ui.views.showView.viewId',
- 'org.csstudio.alarm.beast.ui.alarmtable.view']
-)
-]]></text>
- </script>
- <description>OpenAlarm</description>
- </action>
- </actions>
- <text>OK</text>
- <x>200</x>
- <y>81</y>
- <width>73</width>
- <background_color>
- <color name="MAGENTA-BACKGROUND" red="218" green="195" blue="209">
- </color>
- </background_color>
- <tooltip>$(actions)
-$(pv_name)</tooltip>
- </widget>
- </widget>
</widget>
<widget type="action_button" version="3.0.0">
<name>CXH Button</name>
@@ -533,6 +437,9 @@ $(pv_name)</tooltip>
</widget>
<widget type="group" version="2.0.0">
<name>Group CXH</name>
+ <macros>
+ <AREA>CXH</AREA>
+ </macros>
<x>72</x>
<y>497</y>
<width>535</width>
@@ -554,84 +461,91 @@ $(pv_name)</tooltip>
</background_color>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_37</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CXB-CXH:ODH-O2iM</P>
- <R>13</R>
+ <IDX>13</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_38</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CXB-CXH:ODH-O2iM</P>
- <R>14</R>
+ <IDX>14</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_39</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CXB-CXH:ODH-O2iM</P>
- <R>15</R>
+ <IDX>15</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>69</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_40</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CXB-CXH:ODH-O2iM</P>
- <R>16</R>
+ <IDX>16</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>100</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_41</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CXB-CXH:ODH-O2iM</P>
- <R>17</R>
+ <IDX>17</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>131</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_42</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CXB-CXH:ODH-O2iM</P>
- <R>18</R>
+ <IDX>18</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>162</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_43</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CXB-CXH:ODH-O2iM</P>
- <R>19</R>
+ <IDX>19</IDX>
+ <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>193</y>
<width>510</width>
@@ -665,6 +579,9 @@ $(pv_name)</tooltip>
</widget>
<widget type="group" version="2.0.0">
<name>Group CTL</name>
+ <macros>
+ <AREA>CTL</AREA>
+ </macros>
<x>72</x>
<y>730</y>
<width>535</width>
@@ -686,36 +603,39 @@ $(pv_name)</tooltip>
</background_color>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_54</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CTLG-CS:ODH-O2iM</P>
- <R>20</R>
+ <IDX>20</IDX>
+ <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_55</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CTLG-CS:ODH-O2iM</P>
- <R>21</R>
+ <IDX>21</IDX>
+ <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_56</name>
- <file>ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>CTLG-CS:ODH-O2iM</P>
- <R>22</R>
+ <IDX>22</IDX>
+ <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>69</y>
<width>510</width>
@@ -773,24 +693,26 @@ $(pv_name)</tooltip>
</background_color>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_57</name>
- <file>TS2_ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>KG-GTA:ODH-O2iM</P>
- <R>1</R>
+ <IDX>1</IDX>
+ <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/TS2_ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
<height>30</height>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Embedded Display_58</name>
- <file>TS2_ODH_Monit_Sub.bob</file>
+ <name>$(P)</name>
<macros>
- <P>KG-GTA:ODH-O2iM</P>
- <R>2</R>
+ <IDX>2</IDX>
+ <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+ <R>$(IDX)</R>
</macros>
+ <file>$(EMBEDDED_DISPLAYS)/TS2_ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>