Merge branch 'master' into 'master'

Changed Level limit from 80% to 60%

See merge request ics-software/ess-opis!259

NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate.bob

@@ -340,7 +340,7 @@
                 </rules>
                 <tooltip>Alarm HIHI</tooltip>
                 <border_alarm_sensitive>false</border_alarm_sensitive>
-                <maximum>500.0</maximum>
+                <maximum>2000.0</maximum>
               </widget>
               <widget type="spinner" version="2.0.0">
                 <name>INP_HIGH</name>
@@ -361,7 +361,7 @@
                 </rules>
                 <tooltip>Warning HIGH</tooltip>
                 <border_alarm_sensitive>false</border_alarm_sensitive>
-                <maximum>500.0</maximum>
+                <maximum>2000.0</maximum>
               </widget>
               <widget type="spinner" version="2.0.0">
                 <name>INP_LOW</name>
@@ -1235,7 +1235,6 @@
       <font family="Source Sans Pro" style="BOLD" size="21.0">
       </font>
     </font>
-    <active_tab>1</active_tab>
     <tab_height>40</tab_height>
   </widget>
   <widget type="rectangle" version="2.0.0">

NON-APPROVED/TS2/ts2-cryomodule/interlocks/CryomoduleReady.bob

@@ -983,7 +983,7 @@
               <text>FPC cryo temperature &lt; 318 K
 He cavity tank temperature &lt; 4.5 K
 PT04 &amp;&amp; PT03 &lt; 1100 mbar    
-He level LT-001 &amp;&amp; LT-002 &gt; 80%</text>
+He level LT-001 &amp;&amp; LT-002 &gt; 60%</text>
               <y>9</y>
               <width>249</width>
               <height>128</height>