Merge branch 'master' into 'master'

Adjusted state machine opi after C3S modifs

See merge request !250

99-WtrC @ 8b0df2ca

+Subproject commit 8b0df2cacd27879e2e650b7546b168e734928478

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

@@ -2083,7 +2083,7 @@
     <name>WaterScreen_Button</name>
     <actions>
       <action type="open_display">
-        <file>../ts2-wtrc/ts2-wtrc.bob</file>
+        <file>../99-WtrC/10-Top/P&amp;ID.bob</file>
         <macros>
           <PLCName>TS2-010CRM:Cryo-PLC-001</PLCName>
         </macros>

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

@@ -120,7 +120,7 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>I3_label_text</name>
-    <text>CryoOK</text>
+    <text>CryoOK OR Cryomodule Conditioning</text>
     <x>215</x>
     <y>149</y>
     <width>300</width>
@@ -440,4 +440,20 @@
     </font>
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_3</name>
+    <actions>
+      <action type="open_display">
+        <file>interlocks/CryomoduleReady.bob</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>D</text>
+    <x>525</x>
+    <y>149</y>
+    <width>30</width>
+    <height>20</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
 </display>

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

@@ -58,7 +58,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_001</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH10_Protection</pv_name>
     <x>536</x>
     <y>80</y>
     <off_color>
@@ -165,7 +165,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_1</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_005</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH20_Protection</pv_name>
     <x>536</x>
     <y>110</y>
     <off_color>
@@ -201,7 +201,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_2</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_009</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH30_Protection</pv_name>
     <x>536</x>
     <y>140</y>
     <off_color>
@@ -237,7 +237,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_3</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_013</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH40_Protection</pv_name>
     <x>536</x>
     <y>170</y>
     <off_color>
@@ -273,7 +273,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_4</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_002</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH11_Protection</pv_name>
     <x>536</x>
     <y>290</y>
     <off_color>
@@ -328,7 +328,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_6</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_003</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH12_Protection</pv_name>
     <x>1126</x>
     <y>80</y>
     <off_color>
@@ -398,7 +398,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_8</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_006</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH21_Protection</pv_name>
     <x>536</x>
     <y>350</y>
     <off_color>
@@ -453,7 +453,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_9</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_010</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH31_Protection</pv_name>
     <x>536</x>
     <y>410</y>
     <off_color>
@@ -508,7 +508,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_10</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_014</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH41_Protection</pv_name>
     <x>536</x>
     <y>470</y>
     <off_color>
@@ -563,7 +563,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_11</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_007</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH22_Protection</pv_name>
     <x>1126</x>
     <y>140</y>
     <off_color>
@@ -618,7 +618,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_12</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_011</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH32_Protection</pv_name>
     <x>1126</x>
     <y>200</y>
     <off_color>
@@ -673,7 +673,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>EH10_led_13</name>
-    <pv_name>TS2-010:Cryo-Virt-MISC:ReadDI_Others_015</pv_name>
+    <pv_name>TS2-010CRM:Cryo-Virt-000ehp:EH42_Protection</pv_name>
     <x>1126</x>
     <y>260</y>
     <off_color>