From 7290c7dcf15f630b80bb57e12ad67923680f8546 Mon Sep 17 00:00:00 2001
From: Emilio Asensi <emilio.asensiconejero@esss.se>
Date: Wed, 10 Mar 2021 16:35:20 +0100
Subject: [PATCH] Link sensors with controllers
---
.../CV_ControlVALVE_Sipart_Faceplate.bob | 13 ++--
NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob | 69 +++++++------------
2 files changed, 27 insertions(+), 55 deletions(-)
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
index 03e0ea74..a374d869 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
@@ -1897,10 +1897,6 @@
<x>133</x>
<y>184</y>
<width>41</width>
- <line_color>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </line_color>
<points>
<point x="0.0" y="20.0">
</point>
@@ -1911,16 +1907,15 @@
<point x="40.32786885245899" y="0.0">
</point>
</points>
+ <line_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </line_color>
</widget>
</widget>
<widget type="action_button" version="3.0.0">
<name>PIDScreen_Button_1</name>
<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>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob
index 9146546a..e279bfea 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob
@@ -329,8 +329,8 @@
<name>PV_Valve_BlockIcon_Verical_8</name>
<macros>
<ControlledDevice>CV-004</ControlledDevice>
- <MeasureValue>CV-004</MeasureValue>
- <MeasureValueEGU>%</MeasureValueEGU>
+ <MeasureValue>PT-003</MeasureValue>
+ <MeasureValueEGU>mbar</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>CV</WIDDev>
<WIDDis>Cryo</WIDDis>
@@ -569,14 +569,14 @@
<name>PV_Valve_BlockIcon_Verical_10</name>
<macros>
<ControlledDevice>CV-002</ControlledDevice>
- <MeasureValue>PT-82301</MeasureValue>
+ <MeasureValue>PT-004</MeasureValue>
<MeasureValueEGU>Bar</MeasureValueEGU>
- <ProcessValue>TS2-010CDL:Cryo-PT-82301</ProcessValue>
+ <ProcessValue>TS2-010CRM:Cryo-PT-004</ProcessValue>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>CV</WIDDev>
<WIDDis>Cryo</WIDDis>
<WIDIndex>002</WIDIndex>
- <WIDIndexPID>CV02</WIDIndexPID>
+ <WIDIndexPID>002b</WIDIndexPID>
<WIDSec>TS2-010</WIDSec>
<WIDSecSub>TS2-010CRM</WIDSecSub>
<WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
@@ -1843,8 +1843,8 @@
<name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_36</name>
<macros>
<ControlledDevice>EH-010</ControlledDevice>
- <MeasureValue>TE-019</MeasureValue>
- <MeasureValueEGU>K</MeasureValueEGU>
+ <MeasureValue>LT-001</MeasureValue>
+ <MeasureValueEGU>%</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>EH</WIDDev>
<WIDDis>Cryo</WIDDis>
@@ -1959,13 +1959,13 @@
<name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_38</name>
<macros>
<ControlledDevice>EH-040</ControlledDevice>
- <MeasureValue>TE-049</MeasureValue>
- <MeasureValueEGU>K</MeasureValueEGU>
+ <MeasureValue>LT-001</MeasureValue>
+ <MeasureValueEGU>%</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>EH</WIDDev>
<WIDDis>Cryo</WIDDis>
<WIDIndex>040</WIDIndex>
- <WIDIndexPID>EH40</WIDIndexPID>
+ <WIDIndexPID>EH10</WIDIndexPID>
<WIDSec>TS2-010</WIDSec>
<WIDSecSub>TS2-010CRM</WIDSecSub>
<WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
@@ -1982,13 +1982,13 @@
<name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_39</name>
<macros>
<ControlledDevice>EH-030</ControlledDevice>
- <MeasureValue>TE-039</MeasureValue>
- <MeasureValueEGU>K</MeasureValueEGU>
+ <MeasureValue>LT-001</MeasureValue>
+ <MeasureValueEGU>%</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>EH</WIDDev>
<WIDDis>Cryo</WIDDis>
<WIDIndex>030</WIDIndex>
- <WIDIndexPID>EH30</WIDIndexPID>
+ <WIDIndexPID>EH10</WIDIndexPID>
<WIDSec>TS2-010</WIDSec>
<WIDSecSub>TS2-010CRM</WIDSecSub>
<WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
@@ -2005,13 +2005,13 @@
<name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_40</name>
<macros>
<ControlledDevice>EH-020</ControlledDevice>
- <MeasureValue>TE-029</MeasureValue>
- <MeasureValueEGU>K</MeasureValueEGU>
+ <MeasureValue>LT-001</MeasureValue>
+ <MeasureValueEGU>%</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>EH</WIDDev>
<WIDDis>Cryo</WIDDis>
<WIDIndex>020</WIDIndex>
- <WIDIndexPID>EH20</WIDIndexPID>
+ <WIDIndexPID>EH10</WIDIndexPID>
<WIDSec>TS2-010</WIDSec>
<WIDSecSub>TS2-010CRM</WIDSecSub>
<WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
@@ -2247,8 +2247,8 @@
<name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_46</name>
<macros>
<ControlledDevice>EH-013</ControlledDevice>
- <MeasureDevice>TE-018</MeasureDevice>
- <MeasureDeviceEGU>K</MeasureDeviceEGU>
+ <MeasureValue>TE-018</MeasureValue>
+ <MeasureValueEGU>K</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>EH</WIDDev>
<WIDDis>Cryo</WIDDis>
@@ -2693,7 +2693,7 @@
<name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_53</name>
<macros>
<ControlledDevice>EH-042</ControlledDevice>
- <MeasureValue>TE-041</MeasureValue>
+ <MeasureValue>TE-044</MeasureValue>
<MeasureValueEGU>K</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>EH</WIDDev>
@@ -2739,7 +2739,7 @@
<name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_55</name>
<macros>
<ControlledDevice>EH-032</ControlledDevice>
- <MeasureValue>TE-031</MeasureValue>
+ <MeasureValue>TE-034</MeasureValue>
<MeasureValueEGU>K</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>EH</WIDDev>
@@ -2785,7 +2785,7 @@
<name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_57</name>
<macros>
<ControlledDevice>EH-022</ControlledDevice>
- <MeasureValue>TE-021</MeasureValue>
+ <MeasureValue>TE-024</MeasureValue>
<MeasureValueEGU>K</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>EH</WIDDev>
@@ -2831,7 +2831,7 @@
<name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_59</name>
<macros>
<ControlledDevice>EH-012</ControlledDevice>
- <MeasureValue>TE-011</MeasureValue>
+ <MeasureValue>TE-014</MeasureValue>
<MeasureValueEGU>K</MeasureValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>EH</WIDDev>
@@ -3396,7 +3396,7 @@
</action>
</actions>
<text>DEVICES MENU</text>
- <x>897</x>
+ <x>1085</x>
<y>11</y>
<width>178</width>
<font>
@@ -3463,29 +3463,6 @@
<resize>1</resize>
<transparent>true</transparent>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>PID_Button_1</name>
- <actions>
- <action type="open_display">
- <file>controllers_overview.bob</file>
- <macros>
- <PLCName>TS2-010CRM:Cryo-PLC-001</PLCName>
- </macros>
- <target>window</target>
- <description>Open Display</description>
- </action>
- </actions>
- <text>CONTROLLERS</text>
- <x>1085</x>
- <y>11</y>
- <width>178</width>
- <font>
- <font family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <tooltip></tooltip>
- <confirm_message></confirm_message>
- </widget>
<widget type="group" version="2.0.0">
<name>TICP Flow</name>
<x>73</x>
--
GitLab