From b57741f6dbcd4b18295078b203f5b69144b8ce73 Mon Sep 17 00:00:00 2001
From: Emilio Asensi <emilio.asensiconejero@esss.se>
Date: Fri, 3 Jul 2020 15:15:39 +0200
Subject: [PATCH] AutoConf updates
---
.../PIDControls/FacePlate_AutoConf.bob | 149 +++++++++++++++++-
...ADVControl_Faceplate_AutoConf_embedded.bob | 39 +----
2 files changed, 142 insertions(+), 46 deletions(-)
mode change 100755 => 100644 NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/FacePlate_AutoConf.bob
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/FacePlate_AutoConf.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/FacePlate_AutoConf.bob
old mode 100755
new mode 100644
index 7925e031..26f67424
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/FacePlate_AutoConf.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/FacePlate_AutoConf.bob
@@ -76,7 +76,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${AmConfig}:Cmd_Enable_AutoConf</pv_name>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
</rule>
</rules>
<border_alarm_sensitive>false</border_alarm_sensitive>
@@ -87,6 +87,17 @@
<x>180</x>
<y>170</y>
<width>250</width>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
<border_alarm_sensitive>false</border_alarm_sensitive>
<items>
<item>Undefined</item>
@@ -145,6 +156,17 @@
<y>225</y>
<width>102</width>
<height>33</height>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
<tooltip>Apply force value</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -162,6 +184,17 @@
<y>225</y>
<width>102</width>
<height>33</height>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
<tooltip>Apply force value</tooltip>
</widget>
<widget type="led" version="2.0.0">
@@ -178,6 +211,17 @@
<x>180</x>
<y>270</y>
<width>120</width>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
<border_alarm_sensitive>false</border_alarm_sensitive>
<items>
<item>PT-001</item>
@@ -236,6 +280,17 @@
<y>340</y>
<width>120</width>
<height>30</height>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
@@ -266,6 +321,17 @@
<y>390</y>
<width>120</width>
<height>30</height>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
@@ -296,6 +362,17 @@
<y>440</y>
<width>120</width>
<height>30</height>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
@@ -326,6 +403,17 @@
<y>490</y>
<width>120</width>
<height>30</height>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
@@ -510,6 +598,17 @@
<text>Set Data</text>
<x>320</x>
<y>550</y>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -557,29 +656,43 @@
</widget>
<widget type="action_button" version="3.0.0">
<name>BTN_P_Action_ON_8</name>
- <actions>
+ <actions execute_as_one="true">
<action type="write_pv">
- <pv_name>$(pv_name)</pv_name>
+ <pv_name>${WIDSecSub}:${WIDDis}-${WIDAmConf}:Cmd_Enable_AutoConf</pv_name>
<value>1</value>
- <description>Write PV</description>
+ <description>Enable_AutoConf</description>
+ </action>
+ <action type="write_pv">
+ <pv_name>${WIDSecSub}:${WIDDis}-${WIDAmConf}:Cmd_Get_Data</pv_name>
+ <value>1</value>
+ <description>Get Data</description>
+ </action>
+ <action type="write_pv">
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ <value>1</value>
+ <description>Unlock Conf</description>
</action>
</actions>
- <pv_name>${WIDSecSub}:${WIDDis}-${WIDAmConf}:Cmd_Enable_AutoConf</pv_name>
<text>ON</text>
<x>180</x>
<y>64</y>
<width>102</width>
<height>33</height>
- <tooltip>Apply force value</tooltip>
+ <tooltip>Configuration ON</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>BTN_P_Action_ON_9</name>
- <actions>
+ <actions execute_as_one="true">
<action type="write_pv">
<pv_name>$(pv_name)</pv_name>
<value>1</value>
<description>Write PV</description>
</action>
+ <action type="write_pv">
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ <value>0</value>
+ <description>Write PV</description>
+ </action>
</actions>
<pv_name>${WIDSecSub}:${WIDDis}-${WIDAmConf}:Cmd_Disable_AutoConf</pv_name>
<text>OFF</text>
@@ -587,7 +700,27 @@
<y>64</y>
<width>102</width>
<height>33</height>
- <tooltip>Apply force value</tooltip>
+ <tooltip>Configuration OFF</tooltip>
+ </widget>
+ <widget type="textentry" version="3.0.0">
+ <name>INP_SSSP_1</name>
+ <pv_name>${WIDSecSub}:${WIDDis}-${WIDAmConf}:Measuring Device Msg</pv_name>
+ <x>310</x>
+ <y>270</y>
+ <width>120</width>
+ <height>30</height>
+ <rules>
+ <rule name="EnableRule" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 == 0">
+ <value>false</value>
+ </exp>
+ <exp bool_exp="pv0 == 1">
+ <value>true</value>
+ </exp>
+ <pv_name>loc://AMConfig:Unlock</pv_name>
+ </rule>
+ </rules>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
</widget>
</display>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
index e3bb59fe..9113c25c 100755
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
@@ -145,24 +145,6 @@
</background_color>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>MET_EGU2</name>
- <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:ProcValueEGU</pv_name>
- <x>157</x>
- <y>176</y>
- <width>86</width>
- <height>30</height>
- <font>
- <font family="Source Sans Pro" style="REGULAR" size="20.0">
- </font>
- </font>
- <background_color>
- <color red="255" green="254" blue="253">
- </color>
- </background_color>
- <transparent>true</transparent>
- <tooltip>Engineering Unit</tooltip>
- </widget>
<widget type="label" version="2.0.0">
<name>LB_FrcActPos_1</name>
<text>Actual manipulated value (%)</text>
@@ -225,7 +207,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>MET_ProcessSetpoint_1</name>
- <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:PV</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Measured_Value_Msg</pv_name>
<x>18</x>
<y>114</y>
<width>133</width>
@@ -245,24 +227,6 @@
<tooltip>Measurement Value</tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>MET_EGU</name>
- <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:ProcValueEGU</pv_name>
- <x>157</x>
- <y>118</y>
- <width>86</width>
- <height>30</height>
- <font>
- <font family="Source Sans Pro" style="REGULAR" size="20.0">
- </font>
- </font>
- <background_color>
- <color red="255" green="254" blue="253">
- </color>
- </background_color>
- <transparent>true</transparent>
- <tooltip>Engineering Unit</tooltip>
- </widget>
</widget>
<widget type="group" version="2.0.0">
<name>group.op.modes</name>
@@ -3763,7 +3727,6 @@
<y>60</y>
<width>943</width>
<height>720</height>
- <active_tab>2</active_tab>
</widget>
<widget type="rectangle" version="2.0.0">
<name>Header Bar</name>
--
GitLab