Merge branch 'master' into 'master'

Fix controlled device to AM settings

See merge request !191

NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob

@@ -1948,7 +1948,12 @@
           </widget>
           <widget type="action_button" version="3.0.0">
             <name>PIDScreen_Button_1</name>
-            <actions>
+            <actions execute_as_one="true">
+              <action type="write_pv">
+                <pv_name>${WIDSec}:${WIDDis}-${WIDAmConf}:P_Controlled_Devie_Name</pv_name>
+                <value>${ControlledDevice}</value>
+                <description>SetControlledDevice</description>
+              </action>
               <action type="open_display">
                 <file>../PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob</file>
                 <target>window</target>

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

@@ -527,10 +527,12 @@
       <ControlledDevice>CV-002</ControlledDevice>
       <MeasureValue>PT-82301</MeasureValue>
       <ProcessValue>TS2-010CDL:Cryo-PT-82301</ProcessValue>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>002</WIDIndex>
       <WIDIndexPID>CV02</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -665,13 +667,16 @@
     <name>PV_Valve_BlockIcon_Horizontal_4</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal_Compact.bob</file>
     <macros>
+      <ControlledDevice>CV-001</ControlledDevice>
       <MeasureValue>LT-001</MeasureValue>
       <ProcessValue>TS2-010CRM:Cryo-LT-001</ProcessValue>
       <ProcessValueEGU>%</ProcessValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>001</WIDIndex>
       <WIDIndexPID>CV01</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>