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 d836d62b0f0ff6f63c66ce822d0e052bc0bfbe60..9634aeeb9e48b77e4fa062372b0788214de67bd2 100644
--- 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
@@ -263,13 +263,14 @@
<name>MET_MeasValueName</name>
<text>${MeasureValue}</text>
<x>148</x>
- <y>37</y>
+ <y>44</y>
<width>144</width>
<height>30</height>
<background_color>
<color red="255" green="254" blue="253">
</color>
</background_color>
+ <vertical_alignment>1</vertical_alignment>
<tooltip>Mesurement value</tooltip>
</widget>
</widget>
@@ -2185,7 +2186,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_P_ON</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_P_ON</pv_name>
<text>ON</text>
<x>171</x>
<y>499</y>
@@ -2199,8 +2200,8 @@
<exp bool_exp="(pv0 == 1) && (pv1 == 0)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_P_ActionState</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_P_ActionState</pv_name>
</rule>
</rules>
<tooltip>Turn P-Action ON</tooltip>
@@ -2214,7 +2215,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_P_OFF</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_P_OFF</pv_name>
<text>OFF</text>
<x>290</x>
<y>500</y>
@@ -2228,8 +2229,8 @@
<exp bool_exp="(pv0 == 1) && (pv1 == 1)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_P_ActionState</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_P_ActionState</pv_name>
</rule>
</rules>
<tooltip>Turn P-Action OFF</tooltip>
@@ -2279,7 +2280,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_I_ON</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_I_ON</pv_name>
<text>ON</text>
<x>171</x>
<y>540</y>
@@ -2293,8 +2294,8 @@
<exp bool_exp="(pv0 == 1) && (pv1 == 0)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_I_ActionState</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_I_ActionState</pv_name>
</rule>
</rules>
<tooltip>Turn I-Action ON</tooltip>
@@ -2308,7 +2309,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_I_OFF</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_I_OFF</pv_name>
<text>OFF</text>
<x>290</x>
<y>541</y>
@@ -2322,8 +2323,8 @@
<exp bool_exp="(pv0 == 1) && (pv1 == 1)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_I_ActionState</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_I_ActionState</pv_name>
</rule>
</rules>
<tooltip>Turn I-Action OFF</tooltip>
@@ -2355,7 +2356,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_D_ON</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_D_ON</pv_name>
<text>ON</text>
<x>171</x>
<y>580</y>
@@ -2369,8 +2370,8 @@
<exp bool_exp="(pv0 == 1) && (pv1 == 0)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_D_ActionState</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_D_ActionState</pv_name>
</rule>
</rules>
<tooltip>Turn D-Action ON</tooltip>
@@ -2384,7 +2385,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_D_OFF</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_D_OFF</pv_name>
<text>OFF</text>
<x>290</x>
<y>581</y>
@@ -2398,8 +2399,8 @@
<exp bool_exp="(pv0 == 1) && (pv1 == 1)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_D_ActionState</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_D_ActionState</pv_name>
</rule>
</rules>
<tooltip>Turn D-Action OFF</tooltip>
@@ -2431,7 +2432,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_EnablePID_Conf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_EnablePID_Conf</pv_name>
<text>ON</text>
<x>209</x>
<y>57</y>
@@ -2445,7 +2446,7 @@
<exp bool_exp="pv0 == 1">
<value>false</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>Turn Configuration ON</tooltip>
@@ -2459,7 +2460,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_DisablePID_Conf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_DisablePID_Conf</pv_name>
<text>OFF</text>
<x>308</x>
<y>57</y>
@@ -2473,14 +2474,14 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>Turn Configuration OFF</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_P_ActionState</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_P_ActionState</pv_name>
<x>25</x>
<y>501</y>
<width>30</width>
@@ -2488,7 +2489,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_1</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_I_ActionState</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_I_ActionState</pv_name>
<x>25</x>
<y>539</y>
<width>30</width>
@@ -2496,7 +2497,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_2</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_D_ActionState</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_D_ActionState</pv_name>
<x>25</x>
<y>579</y>
<width>30</width>
@@ -2618,7 +2619,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_Gain</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_Gain_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_Gain_1</pv_name>
<x>164</x>
<y>38</y>
<height>30</height>
@@ -2632,7 +2633,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Gain</tooltip>
@@ -2642,7 +2643,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_TI</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_TI_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_TI_1</pv_name>
<x>164</x>
<y>78</y>
<height>30</height>
@@ -2655,7 +2656,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Integration Time</tooltip>
@@ -2665,7 +2666,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_TD</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_TD_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_TD_1</pv_name>
<x>164</x>
<y>118</y>
<height>30</height>
@@ -2678,7 +2679,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Derivative Time</tooltip>
@@ -2688,7 +2689,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_DeadBand</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_DEADB_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_DEADB_1</pv_name>
<x>164</x>
<y>158</y>
<height>30</height>
@@ -2702,7 +2703,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Deadband</tooltip>
@@ -2712,7 +2713,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_LMN_HLIM</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_LMN_HLIM_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_LMN_HLIM_1</pv_name>
<x>164</x>
<y>212</y>
<height>30</height>
@@ -2726,7 +2727,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>LMN High Limit</tooltip>
@@ -2735,7 +2736,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_LMN_LLIM</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_LMN_LLIM_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_LMN_LLIM_1</pv_name>
<x>163</x>
<y>252</y>
<height>30</height>
@@ -2749,7 +2750,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>LMN Low Limit</tooltip>
@@ -2758,7 +2759,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_Gain_4</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_Gain_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_Gain_1</pv_name>
<x>285</x>
<y>39</y>
<height>30</height>
@@ -2769,7 +2770,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_Integration_4</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_TI_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_TI_1</pv_name>
<x>284</x>
<y>78</y>
<height>30</height>
@@ -2780,7 +2781,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_Derivative_4</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_TD_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_TD_1</pv_name>
<x>284</x>
<y>118</y>
<height>30</height>
@@ -2791,7 +2792,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_DeadBand_3</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_DEADB_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_DEADB_1</pv_name>
<x>284</x>
<y>158</y>
<height>30</height>
@@ -2802,7 +2803,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_LMN_HLIM</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_LMN_HLIM_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_LMN_HLIM_1</pv_name>
<x>284</x>
<y>212</y>
<height>30</height>
@@ -2813,7 +2814,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_LMN_LLIM</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_LMN_LLIM_1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_LMN_LLIM_1</pv_name>
<x>283</x>
<y>252</y>
<height>30</height>
@@ -2854,7 +2855,7 @@
</color>
</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Profile1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Profile1</pv_name>
</rule>
</rules>
</widget>
@@ -2867,7 +2868,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_Profile1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_Profile1</pv_name>
<text>Activate Profile 1</text>
<x>142</x>
<y>291</y>
@@ -2881,7 +2882,7 @@
<exp bool_exp="(pv0 == 1)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>Turn P-Action ON</tooltip>
@@ -3001,7 +3002,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_Gain_1</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_Gain_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_Gain_2</pv_name>
<x>164</x>
<y>38</y>
<height>30</height>
@@ -3015,7 +3016,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Gain</tooltip>
@@ -3025,7 +3026,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_TI_1</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_TI_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_TI_2</pv_name>
<x>164</x>
<y>78</y>
<height>30</height>
@@ -3038,7 +3039,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Integration Time</tooltip>
@@ -3048,7 +3049,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_TD_1</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_TD_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_TD_2</pv_name>
<x>164</x>
<y>118</y>
<height>30</height>
@@ -3061,7 +3062,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Derivative Time</tooltip>
@@ -3071,7 +3072,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_DeadBand_1</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_DEADB_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_DEADB_2</pv_name>
<x>164</x>
<y>158</y>
<height>30</height>
@@ -3085,7 +3086,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Deadband</tooltip>
@@ -3095,7 +3096,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_LMN_HLIM_1</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_LMN_HLIM_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_LMN_HLIM_2</pv_name>
<x>164</x>
<y>212</y>
<height>30</height>
@@ -3109,7 +3110,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>LMN High Limit</tooltip>
@@ -3118,7 +3119,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_LMN_LLIM_1</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_LMN_LLIM_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_LMN_LLIM_2</pv_name>
<x>163</x>
<y>252</y>
<height>30</height>
@@ -3132,7 +3133,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>LMN Low Limit</tooltip>
@@ -3141,7 +3142,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_Gain_5</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_Gain_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_Gain_2</pv_name>
<x>285</x>
<y>39</y>
<height>30</height>
@@ -3152,7 +3153,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_Integration_5</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_TI_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_TI_2</pv_name>
<x>284</x>
<y>78</y>
<height>30</height>
@@ -3163,7 +3164,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_Derivative_5</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_TD_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_TD_2</pv_name>
<x>284</x>
<y>118</y>
<height>30</height>
@@ -3174,7 +3175,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_DeadBand_4</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_DEADB_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_DEADB_2</pv_name>
<x>284</x>
<y>158</y>
<height>30</height>
@@ -3185,7 +3186,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_LMN_HLIM_2</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_LMN_HLIM_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_LMN_HLIM_2</pv_name>
<x>284</x>
<y>212</y>
<height>30</height>
@@ -3196,7 +3197,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_LMN_LLIM_2</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_LMN_LLIM_2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_LMN_LLIM_2</pv_name>
<x>283</x>
<y>252</y>
<height>30</height>
@@ -3237,7 +3238,7 @@
</color>
</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Profile2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Profile2</pv_name>
</rule>
</rules>
</widget>
@@ -3250,7 +3251,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_Profile2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_Profile2</pv_name>
<text>Activate Profile 2</text>
<x>143</x>
<y>291</y>
@@ -3264,7 +3265,7 @@
<exp bool_exp="(pv0 == 1)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>Turn P-Action ON</tooltip>
@@ -3384,7 +3385,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_Gain_2</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_Gain_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_Gain_3</pv_name>
<x>164</x>
<y>38</y>
<height>30</height>
@@ -3398,7 +3399,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Gain</tooltip>
@@ -3408,7 +3409,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_TI_2</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_TI_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_TI_3</pv_name>
<x>164</x>
<y>78</y>
<height>30</height>
@@ -3421,7 +3422,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Integration Time</tooltip>
@@ -3431,7 +3432,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_TD_2</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_TD_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_TD_3</pv_name>
<x>164</x>
<y>118</y>
<height>30</height>
@@ -3444,7 +3445,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Derivative Time</tooltip>
@@ -3454,7 +3455,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_PID_DeadBand_2</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_DEADB_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_DEADB_3</pv_name>
<x>164</x>
<y>158</y>
<height>30</height>
@@ -3468,7 +3469,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>PID Deadband</tooltip>
@@ -3478,7 +3479,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_LMN_HLIM_2</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_LMN_HLIM_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_LMN_HLIM_3</pv_name>
<x>164</x>
<y>212</y>
<height>30</height>
@@ -3492,7 +3493,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>LMN High Limit</tooltip>
@@ -3501,7 +3502,7 @@
</widget>
<widget type="spinner" version="2.0.0">
<name>INP_P_LMN_LLIM_2</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_LMN_LLIM_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_LMN_LLIM_3</pv_name>
<x>163</x>
<y>252</y>
<height>30</height>
@@ -3515,7 +3516,7 @@
<exp bool_exp="pv0 == 1">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>LMN Low Limit</tooltip>
@@ -3524,7 +3525,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_Gain_6</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_Gain_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_Gain_3</pv_name>
<x>285</x>
<y>39</y>
<height>30</height>
@@ -3535,7 +3536,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_Integration_6</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_TI_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_TI_3</pv_name>
<x>284</x>
<y>78</y>
<height>30</height>
@@ -3546,7 +3547,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_Derivative_6</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_TD_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_TD_3</pv_name>
<x>284</x>
<y>118</y>
<height>30</height>
@@ -3557,7 +3558,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_DeadBand_5</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_DEADB_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_DEADB_3</pv_name>
<x>284</x>
<y>158</y>
<height>30</height>
@@ -3568,7 +3569,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_LMN_HLIM_3</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_LMN_HLIM_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_LMN_HLIM_3</pv_name>
<x>284</x>
<y>212</y>
<height>30</height>
@@ -3579,7 +3580,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>TU_FB_LMN_LLIM_3</name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:FB_LMN_LLIM_3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:FB_LMN_LLIM_3</pv_name>
<x>283</x>
<y>252</y>
<height>30</height>
@@ -3620,7 +3621,7 @@
</color>
</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Profile3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Profile3</pv_name>
</rule>
</rules>
</widget>
@@ -3633,7 +3634,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_Profile3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_Profile3</pv_name>
<text>Activate Profile 3</text>
<x>143</x>
<y>290</y>
@@ -3647,7 +3648,7 @@
<exp bool_exp="(pv0 == 1)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:EnablePIDConf</pv_name>
</rule>
</rules>
<tooltip>Turn P-Action ON</tooltip>
@@ -3704,9 +3705,9 @@
<exp bool_exp="pv2 == 1">
<value>PROFILE 3</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Profile1</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Profile2</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Profile3</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Profile1</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Profile2</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Profile3</pv_name>
</rule>
</rules>
</widget>
@@ -4364,17 +4365,17 @@
<name>ICON_Unlocked</name>
<actions execute_as_one="true">
<action type="write_pv">
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_DevUnlock</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_DevUnlock</pv_name>
<value>1</value>
<description>Write CMD_DevUnlock</description>
</action>
<action type="write_pv">
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_DevLock</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_DevLock</pv_name>
<value>0</value>
<description>Write CMD_DevLock</description>
</action>
<action type="write_pv">
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:P_Faceplate_LockID</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:P_Faceplate_LockID</pv_name>
<value>0</value>
<description>Write zero to P_Faceplate_LockID</description>
</action>
@@ -4391,9 +4392,9 @@
<exp bool_exp="(pv0 == true) && (pv1 == false) && (pv2 == 0)">
<value>true</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:DevLocked</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Inhibit_Lock</pv_name>
- <pv_name>loc://${SecSub}:${Dis}-PID-${IndexPID}:EnaForceUnlock</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:DevLocked</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Inhibit_Lock</pv_name>
+ <pv_name>loc://${SecSubPID}:${Dis}-PID-${IndexPID}:EnaForceUnlock</pv_name>
</rule>
</rules>
<tooltip>Unlock this device</tooltip>
@@ -4402,12 +4403,12 @@
<name>ICON_Locked</name>
<actions execute_as_one="true">
<action type="write_pv">
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Cmd_DevUnlock</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_DevUnlock</pv_name>
<value>0</value>
<description>Write CMD_DEVUNLOCK</description>
</action>
<action type="write_pv">
- <pv_name>loc://${SecSub}:${Dis}-PID-${IndexPID}:Lock(99)</pv_name>
+ <pv_name>loc://${SecSubPID}:${Dis}-PID-${IndexPID}:Lock(99)</pv_name>
<value>1</value>
<description>Run Lock script</description>
</action>
@@ -4424,8 +4425,8 @@
<exp bool_exp="(pv0 == 1) || (pv1 == 1)">
<value>false</value>
</exp>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:DevLocked</pv_name>
- <pv_name>${SecSub}:${Dis}-PID-${IndexPID}:Inhibit_Lock</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:DevLocked</pv_name>
+ <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Inhibit_Lock</pv_name>
</rule>
</rules>
<scripts>
@@ -4437,14 +4438,14 @@
PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-var Lock = pvs[0];/*loc://${SecSub}:${Dis}-PID-${IndexPID}:Lock*/
-var Cmd_DevLock = pvs[1];/*${SecSub}:${Dis}-PID-${IndexPID}:Cmd_DevLock*/
-var P_Faceplate_LockID = pvs[2];/*${SecSub}:${Dis}-PID-${IndexPID}:P_Faceplate_LockID*/
-var Inhibit_Lock = pvs[3];/*${SecSub}:${Dis}-PID-${IndexPID}:Inhibit_Lock*/
-var Faceplate_LockID = pvs[4];/*${SecSub}:${Dis}-PID-${IndexPID}:Faceplate_LockID*/
-var BlockIcon_LockID = pvs[5];/*${SecSub}:${Dis}-PID-${IndexPID}:BlockIcon_LockID*/
-var EnaForceUnlock = pvs[6];/*loc://${SecSub}:${Dis}-PID-${IndexPID}:EnaForceUnlock*/
-var DevLocked = pvs[7];/*${SecSub}:${Dis}-PID-${IndexPID}:DevLocked*/
+var Lock = pvs[0];/*loc://${SecSubPID}:${Dis}-PID-${IndexPID}:Lock*/
+var Cmd_DevLock = pvs[1];/*${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_DevLock*/
+var P_Faceplate_LockID = pvs[2];/*${SecSubPID}:${Dis}-PID-${IndexPID}:P_Faceplate_LockID*/
+var Inhibit_Lock = pvs[3];/*${SecSubPID}:${Dis}-PID-${IndexPID}:Inhibit_Lock*/
+var Faceplate_LockID = pvs[4];/*${SecSubPID}:${Dis}-PID-${IndexPID}:Faceplate_LockID*/
+var BlockIcon_LockID = pvs[5];/*${SecSubPID}:${Dis}-PID-${IndexPID}:BlockIcon_LockID*/
+var EnaForceUnlock = pvs[6];/*loc://${SecSubPID}:${Dis}-PID-${IndexPID}:EnaForceUnlock*/
+var DevLocked = pvs[7];/*${SecSubPID}:${Dis}-PID-${IndexPID}:DevLocked*/
@@ -4509,14 +4510,14 @@ if (PVUtil.getLong(Lock) != 99) { /*loc://Lock, check if the script was trigger
} /*onshow*/
]]></text>
- <pv_name>loc://${SecSub}:${Dis}-PID-${IndexPID}:Lock</pv_name>
- <pv_name trigger="false">${SecSub}:${Dis}-PID-${IndexPID}:Cmd_DevLock</pv_name>
- <pv_name trigger="false">${SecSub}:${Dis}-PID-${IndexPID}:P_Faceplate_LockID</pv_name>
- <pv_name trigger="false">${SecSub}:${Dis}-PID-${IndexPID}:Inhibit_Lock</pv_name>
- <pv_name trigger="false">${SecSub}:${Dis}-PID-${IndexPID}:Faceplate_LockID</pv_name>
- <pv_name trigger="false">${SecSub}:${Dis}-PID-${IndexPID}:BlockIcon_LockID</pv_name>
- <pv_name trigger="false">loc://${SecSub}:${Dis}-PID-${IndexPID}:EnaForceUnlock</pv_name>
- <pv_name trigger="false">${SecSub}:${Dis}-PID-${IndexPID}:DevLocked</pv_name>
+ <pv_name>loc://${SecSubPID}:${Dis}-PID-${IndexPID}:Lock</pv_name>
+ <pv_name trigger="false">${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_DevLock</pv_name>
+ <pv_name trigger="false">${SecSubPID}:${Dis}-PID-${IndexPID}:P_Faceplate_LockID</pv_name>
+ <pv_name trigger="false">${SecSubPID}:${Dis}-PID-${IndexPID}:Inhibit_Lock</pv_name>
+ <pv_name trigger="false">${SecSubPID}:${Dis}-PID-${IndexPID}:Faceplate_LockID</pv_name>
+ <pv_name trigger="false">${SecSubPID}:${Dis}-PID-${IndexPID}:BlockIcon_LockID</pv_name>
+ <pv_name trigger="false">loc://${SecSubPID}:${Dis}-PID-${IndexPID}:EnaForceUnlock</pv_name>
+ <pv_name trigger="false">${SecSubPID}:${Dis}-PID-${IndexPID}:DevLocked</pv_name>
</script>
</scripts>
<tooltip>Lock this device</tooltip>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_Faceplate_embedded.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_Faceplate_embedded.bob
index fdd185e4b88f830f0fa3ad202cbdb8d8c56db354..f66d0bd1e9199a7bb7267f9db9c5a1a1ab54cb3f 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_Faceplate_embedded.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_Faceplate_embedded.bob
@@ -161,13 +161,14 @@
<name>MET_MeasValueName</name>
<text>${MeasureValue}</text>
<x>146</x>
- <y>42</y>
+ <y>44</y>
<width>144</width>
<height>30</height>
<background_color>
<color red="255" green="254" blue="253">
</color>
</background_color>
+ <vertical_alignment>1</vertical_alignment>
<tooltip>Mesurement value</tooltip>
</widget>
<widget type="label" version="2.0.0">
@@ -3140,7 +3141,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>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
index 37f4c3ab84a967c80e02722a8e3fba3fc7e3f71a..280c5143386334b33a027b12053b86707c62f2bf 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
@@ -1950,7 +1950,7 @@
<name>PIDScreen_Button_1</name>
<actions>
<action type="open_display">
- <file>../PIDControls/PID_Control_Faceplate_embedded.bob</file>
+ <file>../PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob</file>
<target>window</target>
<description>Open Display</description>
</action>
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 c9a2af8cdab39d400c037569eb18e1034c6ff559..a379974e91e9e923183ffaf8b0de4f642c114fc7 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
@@ -1917,7 +1917,7 @@
<name>PIDScreen_Button_1</name>
<actions>
<action type="open_display">
- <file>../PIDControls/PID_Control_Faceplate_embedded.bob</file>
+ <file>../PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob</file>
<target>window</target>
<description>Open Display</description>
</action>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
index 5bd8c82a7a36d1a72012ba1995217cf15f93bf6d..3dd18cf410b6046b14e1662bf4e0ead7c9bf2636 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
@@ -524,6 +524,8 @@
<name>PV_Valve_BlockIcon_Verical_10</name>
<file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Vertical_Right_Compact.bob</file>
<macros>
+ <MeasureValue>PT-82301</MeasureValue>
+ <ProcessValue>TS2-010CDL:Cryo-PT-82301</ProcessValue>
<WIDDev>CV</WIDDev>
<WIDDis>Cryo</WIDDis>
<WIDIndex>002</WIDIndex>
@@ -3257,7 +3259,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_20</name>
- <text>version 2020-06-01 16:00</text>
+ <text>version 2020-06-08 16:00</text>
<x>2287</x>
<y>1303</y>
<width>197</width>
@@ -3394,7 +3396,7 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Analog_TRANSMITTER_OnlyText_Vertical_BlockIcon_70</name>
- <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Vertical_Compact.bob</file>
+ <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
<macros>
<WIDDev>TE</WIDDev>
<WIDDis>Cryo</WIDDis>