Merge branch 'master' into 'master'

Updated broken links

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

NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_Tend.plt

@@ -82,9 +82,9 @@
     </annotations>
     <pvlist>
         <pv>
-            <display_name>${SecSub}:${Dis}-${Dev}-${Index}:ValvePosition</display_name>
+            <display_name>${SecSub}:${Dis}-${Dev}-${Index}:ActualFlow</display_name>
             <visible>true</visible>
-            <name>${SecSub}:${Dis}-${Dev}-${Index}:MeasValue</name>
+            <name>${SecSub}:${Dis}-${Dev}-${Index}:ActualFlow</name>
             <axis>0</axis>
             <color>
                 <red>255</red>
@@ -107,9 +107,9 @@
             </archive>
         </pv>
         <pv>
-            <display_name>${SecSub}:${Dis}-${Dev}-${Index}:ValveSP</display_name>
+            <display_name>${SecSub}:${Dis}-${Dev}-${Index}:FlowSP</display_name>
             <visible>true</visible>
-            <name>${SecSub}:${Dis}-${Dev}-${Index}:ValveSP</name>
+            <name>${SecSub}:${Dis}-${Dev}-${Index}:FlowSP</name>
             <axis>1</axis>
             <color>
                 <red>0</red>
@@ -132,9 +132,9 @@
             </archive>
         </pv>
         <pv>
-            <display_name>${SecSub}:${Dis}-${Dev}-${Index}:ValveMV</display_name>
+            <display_name>${SecSub}:${Dis}-${Dev}-${Index}:FlowMV</display_name>
             <visible>true</visible>
-            <name>${SecSub}:${Dis}-${Dev}-${Index}:ValveMV</name>
+            <name>${SecSub}:${Dis}-${Dev}-${Index}:FlowMV</name>
             <axis>2</axis>
             <color>
                 <red>0</red>

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

@@ -79,7 +79,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>CryOK_led</name>
-    <pv_name>TS2-010:Cryo-Virt-CryoOK:Val</pv_name>
+    <pv_name>TS2-010:Cryo-Virt-CryoOK:Opened</pv_name>
     <x>537</x>
     <y>90</y>
     <off_color>
@@ -100,7 +100,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>CryoRdy_led</name>
-    <pv_name>TS2-010:Cryo-Virt-CryoRy:Val</pv_name>
+    <pv_name>TS2-010:Cryo-Virt-CryoRy:Opened</pv_name>
     <x>537</x>
     <y>120</y>
     <off_color>
@@ -121,7 +121,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>CryoRdy_led_1</name>
-    <pv_name>TS2-010:Cryo-Virt-CMRy:Cmd</pv_name>
+    <pv_name>TS2-010:Cryo-Virt-CMRy:Opened</pv_name>
     <x>537</x>
     <y>149</y>
     <off_color>
@@ -189,7 +189,7 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>I3_label_text_4</name>
-    <text>TS2-010CRM:Cryo-PS-091:Closed</text>
+    <text>TS2-010CRM:Cryo-PS-091:Off</text>
     <x>193</x>
     <y>296</y>
     <width>300</width>
@@ -200,7 +200,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>SCV91_led_1</name>
-    <pv_name>TS2-010CRM:Cryo-PS-091:Val</pv_name>
+    <pv_name>TS2-010CRM:Cryo-PS-091:Opened</pv_name>
     <x>537</x>
     <y>296</y>
     <off_color>
@@ -225,6 +225,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>MotorOK_led</name>
+    <pv_name>TS2-010:Cryo-Virt-MotOK:Opened</pv_name>
     <x>537</x>
     <y>178</y>
     <off_color>