diff --git a/NON-APPROVED/odh/ODH_Expert_Monit.bob b/NON-APPROVED/odh/ODH_Expert_Monit.bob
index 629320d086b90e37f5613c79411c735ed00c45fb..b724e72e8e6c91e6fce565a4cfbc896e1e52a5b5 100644
--- a/NON-APPROVED/odh/ODH_Expert_Monit.bob
+++ b/NON-APPROVED/odh/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_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>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_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>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_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>LED_WARNING</name>
+ <name>Maint</name>
<pv_name>$(P):Maint</pv_name>
<x>24</x>
<y>200</y>
@@ -158,53 +193,29 @@
</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>MonitHealthyCompat</name>
<pv_name>$(P):MonitWarning</pv_name>
<x>24</x>
<y>227</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_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_ConnLost</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_Main.bob b/NON-APPROVED/odh/ODH_Main.bob
index 33656883d43393e148c26f56605888226c4d8690..a1f87e4f912d9dc0814291dda2a6b254e8f1b44d 100644
--- a/NON-APPROVED/odh/ODH_Main.bob
+++ b/NON-APPROVED/odh/ODH_Main.bob
@@ -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>
@@ -252,11 +255,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_13</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-ACH:ODH-O2iM</P>
<R>1</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>5</y>
<width>510</width>
@@ -264,11 +267,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_14</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-ACH:ODH-O2iM</P>
<R>2</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>37</y>
<width>510</width>
@@ -276,11 +279,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_15</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-ACH:ODH-O2iM</P>
<R>3</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>68</y>
<width>510</width>
@@ -288,11 +291,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_16</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-ACH:ODH-O2iM</P>
<R>4</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>99</y>
<width>510</width>
@@ -300,11 +303,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_17</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-ACH:ODH-O2iM</P>
<R>5</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>130</y>
<width>510</width>
@@ -312,11 +315,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_18</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-TCH:ODH-O2iM</P>
<R>6</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>161</y>
<width>510</width>
@@ -324,11 +327,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_19</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-TCH:ODH-O2iM</P>
<R>7</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>192</y>
<width>510</width>
@@ -336,11 +339,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_20</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-TCH:ODH-O2iM</P>
<R>8</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>223</y>
<width>510</width>
@@ -348,11 +351,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_21</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-TCH:ODH-O2iM</P>
<R>9</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>254</y>
<width>510</width>
@@ -360,11 +363,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_22</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-HPGS:ODH-O2iM</P>
<R>10</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>285</y>
<width>510</width>
@@ -372,11 +375,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_23</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-HPGS:ODH-O2iM</P>
<R>11</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>316</y>
<width>510</width>
@@ -384,11 +387,11 @@ Healthy</text>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_24</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>HCB-DogSh:ODH-O2iM</P>
<R>12</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>347</y>
<width>510</width>
@@ -533,6 +536,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>
@@ -555,11 +561,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_37</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CXB-CXH:ODH-O2iM</P>
<R>13</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
@@ -567,11 +573,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_38</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CXB-CXH:ODH-O2iM</P>
<R>14</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>
@@ -579,11 +585,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_39</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CXB-CXH:ODH-O2iM</P>
<R>15</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>69</y>
<width>510</width>
@@ -591,11 +597,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_40</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CXB-CXH:ODH-O2iM</P>
<R>16</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>100</y>
<width>510</width>
@@ -603,11 +609,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_41</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CXB-CXH:ODH-O2iM</P>
<R>17</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>131</y>
<width>510</width>
@@ -615,11 +621,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_42</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CXB-CXH:ODH-O2iM</P>
<R>18</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>162</y>
<width>510</width>
@@ -627,11 +633,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_43</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CXB-CXH:ODH-O2iM</P>
<R>19</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>193</y>
<width>510</width>
@@ -665,6 +671,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>
@@ -687,11 +696,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_54</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CTLG-CS:ODH-O2iM</P>
<R>20</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
@@ -699,11 +708,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_55</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CTLG-CS:ODH-O2iM</P>
<R>21</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>
@@ -711,11 +720,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_56</name>
- <file>ODH_Monit_Sub.bob</file>
<macros>
<P>CTLG-CS:ODH-O2iM</P>
<R>22</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>69</y>
<width>510</width>
@@ -774,11 +783,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_57</name>
- <file>TS2_ODH_Monit_Sub.bob</file>
<macros>
<P>KG-GTA:ODH-O2iM</P>
<R>1</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
@@ -786,11 +795,11 @@ $(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_58</name>
- <file>TS2_ODH_Monit_Sub.bob</file>
<macros>
<P>KG-GTA:ODH-O2iM</P>
<R>2</R>
</macros>
+ <file>ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>
diff --git a/NON-APPROVED/odh/ODH_Monit_Sub.bob b/NON-APPROVED/odh/ODH_Monit_Sub.bob
index 4c6a0c9728e3fccdb64f33a24be9634227f9b053..6a096463d64f1025b0110ad634e6cf8ae001401f 100644
--- a/NON-APPROVED/odh/ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/ODH_Monit_Sub.bob
@@ -2,12 +2,12 @@
<display version="2.0.0">
<name>ODH monitor LEDs</name>
<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>
<x>93</x>
- <y>4</y>
+ <y>5</y>
<width>55</width>
<precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
@@ -16,43 +16,43 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_LA</name>
- <pv_name>$(P)-$(R):ODHWarning</pv_name>
+ <pv_name>$(P)-$(R):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>
+ <pv_name>$(P)-$(R):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>
+ <pv_name>$(P)-$(R):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>
@@ -60,7 +60,7 @@
<name>LED_OK_1</name>
<pv_name>$(P)-$(R):Maint</pv_name>
<x>461</x>
- <y>4</y>
+ <y>5</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -84,16 +84,16 @@
</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>
+ <y>5</y>
<width>14</width>
<vertical_alignment>1</vertical_alignment>
</widget>
diff --git a/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob b/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob
index 2e022eddc0ef03357ec04233b006b60a81e3b28b..e56ca229835b94c8cb38dbbb24d47d7efefb40b6 100644
--- a/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob
@@ -2,12 +2,12 @@
<display version="2.0.0">
<name>TS2 ODH monitor LEDs</name>
<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>
<x>93</x>
- <y>4</y>
+ <y>5</y>
<width>55</width>
<precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
@@ -18,7 +18,7 @@
<name>LED_LA</name>
<pv_name>$(P)-$(R):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>
@@ -32,7 +32,7 @@
<name>LED_LB</name>
<pv_name>$(P)-$(R):O2Lvl18</pv_name>
<x>287</x>
- <y>4</y>
+ <y>5</y>
<off_color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
@@ -46,7 +46,7 @@
<name>LED_OK</name>
<pv_name>$(P)-$(R):MonitHealthy</pv_name>
<x>374</x>
- <y>4</y>
+ <y>5</y>
<off_color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
@@ -60,7 +60,7 @@
<name>LED_OK_1</name>
<pv_name>$(P)-$(R):Maint</pv_name>
<x>461</x>
- <y>4</y>
+ <y>5</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -84,16 +84,16 @@
</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>
+ <y>5</y>
<width>14</width>
<vertical_alignment>1</vertical_alignment>
</widget>