diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/symbol_color_animation.js b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/symbol_color_animation.js
deleted file mode 100644
index 85c54b5c31783d50835584f703ef9ce06afe5d0e..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/symbol_color_animation.js
+++ /dev/null
@@ -1,85 +0,0 @@
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-
-var pvAccelerating = 0;
-var pvAtNominalSpeed = 0;
-var pvStopped = 0;
-var pvError = 0;
-
-var pvSymbol = pvs[0];
-
-var sum = 0;
-var isValid = 0;
-var colorID = 0;
-
-var debug = widget.getEffectiveMacros().getValue("DEBUG");
-if (debug) {
- debug = debug[0];
- switch (debug) {
- case '1':
- case 'Y':
- case 'y':
- case 'T':
- case 't':
- debug = true;
- break;
-
- default:
- debug = false;
- }
-}
-else
- debug = false;
-
-if (debug)
- Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-else {
- Logger = new Object();
- Logger.info = function() {}
- Logger.warning = function() {}
- Logger.severe = function(text) { org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger().severe(text);}
-}
-
-function log_pv(pv) {
- Logger.info(pv + ": " + PVUtil.getString(pv));
-}
-
-try {
- pvAccelerating = 1 * PVUtil.getInt(pvs[1]);
- pvAtNominalSpeed = 2 * PVUtil.getInt(pvs[2]);
- pvStopped = 4 * PVUtil.getInt(pvs[3]);
- pvError = 8 * PVUtil.getInt(pvs[4]);
-
- sum = pvAccelerating | pvAtNominalSpeed | pvStopped | pvError;
- isValid = (sum & (sum - 1)) == 0 ? 1 : 0;
-
- log_pv(pvs[1]);
- log_pv(pvs[2]);
- log_pv(pvs[3]);
- log_pv(pvs[4]);
-
- if (pvError) {
- Logger.info(pvSymbol + ": ERROR");
- colorID = 4;
- } else if (isValid == 0) {
- Logger.severe(pvSymbol + ": Invalid combination");
- } else if (pvStopped) {
- Logger.info(pvSymbol + ": STOPPED");
- colorID = 3;
- } else if (pvAtNominalSpeed) {
- Logger.info(pvSymbol + ": NOMINAL-SPEED");
- colorID = 2;
- } else if (pvAccelerating) {
- Logger.info(pvSymbol + ": ACCELERATING");
- colorID = 1;
- } else
- Logger.severe(pvSymbol + ": Unknown combination:" + sum);
-
- if (colorID != PVUtil.getInt(pvSymbol))
- Logger.severe(pvSymbol + ": State mismatch:" + colorID + " vs " + PVUtil.getInt(pvSymbol));
-} catch (err) {
- Logger.severe("NO CONNECTION: " + err);
-}
-
-
-//pvSymbol.write(colorID);
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob
index 23dbc86d3f320cf8f94f8e9659c0bd43ba50c678..866c41fc1b90abbb1ef2e3cabac5c463eff59063 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob
@@ -97,15 +97,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="symbol_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):AcceleratingR</pv_name>
- <pv_name>$(vacPREFIX):AtNominalSpdR</pv_name>
- <pv_name>$(vacPREFIX):StoppedR</pv_name>
- <pv_name>$(vacPREFIX):ErrorR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/symbol_color_animation.js b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/symbol_color_animation.js
deleted file mode 100644
index 85c54b5c31783d50835584f703ef9ce06afe5d0e..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/symbol_color_animation.js
+++ /dev/null
@@ -1,85 +0,0 @@
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-
-var pvAccelerating = 0;
-var pvAtNominalSpeed = 0;
-var pvStopped = 0;
-var pvError = 0;
-
-var pvSymbol = pvs[0];
-
-var sum = 0;
-var isValid = 0;
-var colorID = 0;
-
-var debug = widget.getEffectiveMacros().getValue("DEBUG");
-if (debug) {
- debug = debug[0];
- switch (debug) {
- case '1':
- case 'Y':
- case 'y':
- case 'T':
- case 't':
- debug = true;
- break;
-
- default:
- debug = false;
- }
-}
-else
- debug = false;
-
-if (debug)
- Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-else {
- Logger = new Object();
- Logger.info = function() {}
- Logger.warning = function() {}
- Logger.severe = function(text) { org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger().severe(text);}
-}
-
-function log_pv(pv) {
- Logger.info(pv + ": " + PVUtil.getString(pv));
-}
-
-try {
- pvAccelerating = 1 * PVUtil.getInt(pvs[1]);
- pvAtNominalSpeed = 2 * PVUtil.getInt(pvs[2]);
- pvStopped = 4 * PVUtil.getInt(pvs[3]);
- pvError = 8 * PVUtil.getInt(pvs[4]);
-
- sum = pvAccelerating | pvAtNominalSpeed | pvStopped | pvError;
- isValid = (sum & (sum - 1)) == 0 ? 1 : 0;
-
- log_pv(pvs[1]);
- log_pv(pvs[2]);
- log_pv(pvs[3]);
- log_pv(pvs[4]);
-
- if (pvError) {
- Logger.info(pvSymbol + ": ERROR");
- colorID = 4;
- } else if (isValid == 0) {
- Logger.severe(pvSymbol + ": Invalid combination");
- } else if (pvStopped) {
- Logger.info(pvSymbol + ": STOPPED");
- colorID = 3;
- } else if (pvAtNominalSpeed) {
- Logger.info(pvSymbol + ": NOMINAL-SPEED");
- colorID = 2;
- } else if (pvAccelerating) {
- Logger.info(pvSymbol + ": ACCELERATING");
- colorID = 1;
- } else
- Logger.severe(pvSymbol + ": Unknown combination:" + sum);
-
- if (colorID != PVUtil.getInt(pvSymbol))
- Logger.severe(pvSymbol + ": State mismatch:" + colorID + " vs " + PVUtil.getInt(pvSymbol));
-} catch (err) {
- Logger.severe("NO CONNECTION: " + err);
-}
-
-
-//pvSymbol.write(colorID);
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
index 351565be64ef4e73fdf4612a55aa7c906d72f712..c20772d8316cceb3aada40a2d425c693228429fc 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
@@ -97,15 +97,6 @@
<pv_name>$(CONTROLLER):SpdR</pv_name>
</rule>
</rules>
- <scripts>
- <script file="symbol_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):AcceleratingR</pv_name>
- <pv_name>$(vacPREFIX):AtNominalSpdR</pv_name>
- <pv_name>$(vacPREFIX):StoppedR</pv_name>
- <pv_name>$(vacPREFIX):ErrorR</pv_name>
- </script>
- </scripts>
<tooltip>N/A</tooltip>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/symbol_color_animation.js b/NON-APPROVED/COMMON/DEVICES/vacuum/vva/symbol_color_animation.js
deleted file mode 100644
index bee1350c06fbeb54ddbcc345e39c6fa9abc2108e..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/symbol_color_animation.js
+++ /dev/null
@@ -1,85 +0,0 @@
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-
-var pvUndefined = 0;
-var pvOpen = 0;
-var pvClosed = 0;
-var pvError = 0;
-
-var pvSymbol = pvs[0];
-
-var sum = 0;
-var isValid = 0;
-var colorID = 0;
-
-var debug = widget.getEffectiveMacros().getValue("DEBUG");
-if (debug) {
- debug = debug[0];
- switch (debug) {
- case '1':
- case 'Y':
- case 'y':
- case 'T':
- case 't':
- debug = true;
- break;
-
- default:
- debug = false;
- }
-}
-else
- debug = false;
-
-if (debug)
- Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-else {
- Logger = new Object();
- Logger.info = function() {}
- Logger.warning = function() {}
- Logger.severe = function(text) { org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger().severe(text);}
-}
-
-function log_pv(pv) {
- Logger.info(pv + ": " + PVUtil.getString(pv));
-}
-
-try {
- pvUndefined = 1 * PVUtil.getInt(pvs[1]);
- pvOpen = 2 * PVUtil.getInt(pvs[2]);
- pvClosed = 4 * PVUtil.getInt(pvs[3]);
- pvError = 8 * PVUtil.getInt(pvs[4]);
-
- sum = pvUndefined | pvOpen | pvClosed | pvError;
- isValid = (sum & (sum - 1)) == 0 ? 1 : 0;
-
- log_pv(pvs[1]);
- log_pv(pvs[2]);
- log_pv(pvs[3]);
- log_pv(pvs[4]);
-
- if (pvError) {
- Logger.info(pvSymbol + ": ERROR");
- colorID = 4;
- } else if (pvUndefined) {
- Logger.info(pvSymbol + ": UNDEFINED");
- colorID = 1;
- } else if (isValid == 0) {
- Logger.severe(pvSymbol + ": Invalid combination");
- } else if (pvClosed) {
- Logger.info(pvSymbol + ": CLOSED");
- colorID = 3;
- } else if (pvOpen) {
- Logger.info(pvSymbol + ": OPEN");
- colorID = 2;
- } else
- Logger.severe(pvSymbol + ": Unknown combination:" + sum);
-
- if (colorID != PVUtil.getInt(pvSymbol))
- Logger.severe(pvSymbol + ": State mismatch:" + colorID + " vs " + PVUtil.getInt(pvSymbol));
-} catch (err) {
- Logger.severe("NO CONNECTION: " + err);
-}
-
-
-//pvSymbol.write(colorID);
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_angle-vva.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_angle-vva.bob
index eef9caada8209b7b7a4868fd71310213dc3fbd0d..2e3ca00c164c8a3a1df6802901e77597ee5a952a 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_angle-vva.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_angle-vva.bob
@@ -99,15 +99,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="symbol_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):UndefinedR</pv_name>
- <pv_name>$(vacPREFIX):OpenR</pv_name>
- <pv_name>$(vacPREFIX):ClosedR</pv_name>
- <pv_name>$(vacPREFIX):ErrorR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_straight-vva.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_straight-vva.bob
index d4d86be9154e8b9875a9394a280f501e94ef158b..29efff85100366c1409d0913125b2f2f756c45da 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_straight-vva.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_straight-vva.bob
@@ -97,15 +97,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="symbol_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):UndefinedR</pv_name>
- <pv_name>$(vacPREFIX):OpenR</pv_name>
- <pv_name>$(vacPREFIX):ClosedR</pv_name>
- <pv_name>$(vacPREFIX):ErrorR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/symbol_color_animation.js b/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/symbol_color_animation.js
deleted file mode 100644
index bee1350c06fbeb54ddbcc345e39c6fa9abc2108e..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/symbol_color_animation.js
+++ /dev/null
@@ -1,85 +0,0 @@
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-
-var pvUndefined = 0;
-var pvOpen = 0;
-var pvClosed = 0;
-var pvError = 0;
-
-var pvSymbol = pvs[0];
-
-var sum = 0;
-var isValid = 0;
-var colorID = 0;
-
-var debug = widget.getEffectiveMacros().getValue("DEBUG");
-if (debug) {
- debug = debug[0];
- switch (debug) {
- case '1':
- case 'Y':
- case 'y':
- case 'T':
- case 't':
- debug = true;
- break;
-
- default:
- debug = false;
- }
-}
-else
- debug = false;
-
-if (debug)
- Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-else {
- Logger = new Object();
- Logger.info = function() {}
- Logger.warning = function() {}
- Logger.severe = function(text) { org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger().severe(text);}
-}
-
-function log_pv(pv) {
- Logger.info(pv + ": " + PVUtil.getString(pv));
-}
-
-try {
- pvUndefined = 1 * PVUtil.getInt(pvs[1]);
- pvOpen = 2 * PVUtil.getInt(pvs[2]);
- pvClosed = 4 * PVUtil.getInt(pvs[3]);
- pvError = 8 * PVUtil.getInt(pvs[4]);
-
- sum = pvUndefined | pvOpen | pvClosed | pvError;
- isValid = (sum & (sum - 1)) == 0 ? 1 : 0;
-
- log_pv(pvs[1]);
- log_pv(pvs[2]);
- log_pv(pvs[3]);
- log_pv(pvs[4]);
-
- if (pvError) {
- Logger.info(pvSymbol + ": ERROR");
- colorID = 4;
- } else if (pvUndefined) {
- Logger.info(pvSymbol + ": UNDEFINED");
- colorID = 1;
- } else if (isValid == 0) {
- Logger.severe(pvSymbol + ": Invalid combination");
- } else if (pvClosed) {
- Logger.info(pvSymbol + ": CLOSED");
- colorID = 3;
- } else if (pvOpen) {
- Logger.info(pvSymbol + ": OPEN");
- colorID = 2;
- } else
- Logger.severe(pvSymbol + ": Unknown combination:" + sum);
-
- if (colorID != PVUtil.getInt(pvSymbol))
- Logger.severe(pvSymbol + ": State mismatch:" + colorID + " vs " + PVUtil.getInt(pvSymbol));
-} catch (err) {
- Logger.severe("NO CONNECTION: " + err);
-}
-
-
-//pvSymbol.write(colorID);
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/vac_vvf.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/vac_vvf.bob
index 25e10388b88f8fca3fbd3fa2f0ddeb602af9fc65..23b38c75128d492eea6757074bf95a2908c74322 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/vac_vvf.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/vac_vvf.bob
@@ -97,15 +97,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="symbol_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):UndefinedR</pv_name>
- <pv_name>$(vacPREFIX):OpenR</pv_name>
- <pv_name>$(vacPREFIX):ClosedR</pv_name>
- <pv_name>$(vacPREFIX):ErrorR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/symbol_color_animation.js b/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/symbol_color_animation.js
deleted file mode 100644
index bee1350c06fbeb54ddbcc345e39c6fa9abc2108e..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/symbol_color_animation.js
+++ /dev/null
@@ -1,85 +0,0 @@
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-
-var pvUndefined = 0;
-var pvOpen = 0;
-var pvClosed = 0;
-var pvError = 0;
-
-var pvSymbol = pvs[0];
-
-var sum = 0;
-var isValid = 0;
-var colorID = 0;
-
-var debug = widget.getEffectiveMacros().getValue("DEBUG");
-if (debug) {
- debug = debug[0];
- switch (debug) {
- case '1':
- case 'Y':
- case 'y':
- case 'T':
- case 't':
- debug = true;
- break;
-
- default:
- debug = false;
- }
-}
-else
- debug = false;
-
-if (debug)
- Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-else {
- Logger = new Object();
- Logger.info = function() {}
- Logger.warning = function() {}
- Logger.severe = function(text) { org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger().severe(text);}
-}
-
-function log_pv(pv) {
- Logger.info(pv + ": " + PVUtil.getString(pv));
-}
-
-try {
- pvUndefined = 1 * PVUtil.getInt(pvs[1]);
- pvOpen = 2 * PVUtil.getInt(pvs[2]);
- pvClosed = 4 * PVUtil.getInt(pvs[3]);
- pvError = 8 * PVUtil.getInt(pvs[4]);
-
- sum = pvUndefined | pvOpen | pvClosed | pvError;
- isValid = (sum & (sum - 1)) == 0 ? 1 : 0;
-
- log_pv(pvs[1]);
- log_pv(pvs[2]);
- log_pv(pvs[3]);
- log_pv(pvs[4]);
-
- if (pvError) {
- Logger.info(pvSymbol + ": ERROR");
- colorID = 4;
- } else if (pvUndefined) {
- Logger.info(pvSymbol + ": UNDEFINED");
- colorID = 1;
- } else if (isValid == 0) {
- Logger.severe(pvSymbol + ": Invalid combination");
- } else if (pvClosed) {
- Logger.info(pvSymbol + ": CLOSED");
- colorID = 3;
- } else if (pvOpen) {
- Logger.info(pvSymbol + ": OPEN");
- colorID = 2;
- } else
- Logger.severe(pvSymbol + ": Unknown combination:" + sum);
-
- if (colorID != PVUtil.getInt(pvSymbol))
- Logger.severe(pvSymbol + ": State mismatch:" + colorID + " vs " + PVUtil.getInt(pvSymbol));
-} catch (err) {
- Logger.severe("NO CONNECTION: " + err);
-}
-
-
-//pvSymbol.write(colorID);
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/vac_vvg.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/vac_vvg.bob
index ba5e3690455b5a41340af8e99debff935f3d3b05..56ec45fc1f8487b40508f14ed0bcf51e6661c1ef 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/vac_vvg.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/vac_vvg.bob
@@ -97,15 +97,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="symbol_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):UndefinedR</pv_name>
- <pv_name>$(vacPREFIX):OpenR</pv_name>
- <pv_name>$(vacPREFIX):ClosedR</pv_name>
- <pv_name>$(vacPREFIX):ErrorR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs.bob
index 61be86d21824d8c219597bf9ae90ddced00ecf3a..b50110db57f9d9cb2c47b1525e691fc47debce93 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs.bob
@@ -312,6 +312,18 @@
<show_confirm_dialog>true</show_confirm_dialog>
</widget>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX) Interlock</name>
+ <file>vac_vvs-interlocks.bob</file>
+ <macros>
+ <TITLE></TITLE>
+ </macros>
+ <x>10</x>
+ <y>225</y>
+ <width>520</width>
+ <height>282</height>
+ <resize>2</resize>
+ </widget>
<widget type="group" version="2.0.0">
<name>Group Counters</name>
<x>492</x>
@@ -411,18 +423,6 @@
<show_confirm_dialog>true</show_confirm_dialog>
</widget>
</widget>
- <widget type="embedded" version="2.0.0">
- <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX) Interlock</name>
- <file>vac_vvs-interlocks.bob</file>
- <macros>
- <TITLE></TITLE>
- </macros>
- <x>10</x>
- <y>225</y>
- <width>520</width>
- <height>282</height>
- <resize>2</resize>
- </widget>
<widget type="group" version="2.0.0">
<name>Group Status</name>
<x>10</x>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/symbol_color_animation.js b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/symbol_color_animation.js
deleted file mode 100644
index bee1350c06fbeb54ddbcc345e39c6fa9abc2108e..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/symbol_color_animation.js
+++ /dev/null
@@ -1,85 +0,0 @@
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-
-var pvUndefined = 0;
-var pvOpen = 0;
-var pvClosed = 0;
-var pvError = 0;
-
-var pvSymbol = pvs[0];
-
-var sum = 0;
-var isValid = 0;
-var colorID = 0;
-
-var debug = widget.getEffectiveMacros().getValue("DEBUG");
-if (debug) {
- debug = debug[0];
- switch (debug) {
- case '1':
- case 'Y':
- case 'y':
- case 'T':
- case 't':
- debug = true;
- break;
-
- default:
- debug = false;
- }
-}
-else
- debug = false;
-
-if (debug)
- Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-else {
- Logger = new Object();
- Logger.info = function() {}
- Logger.warning = function() {}
- Logger.severe = function(text) { org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger().severe(text);}
-}
-
-function log_pv(pv) {
- Logger.info(pv + ": " + PVUtil.getString(pv));
-}
-
-try {
- pvUndefined = 1 * PVUtil.getInt(pvs[1]);
- pvOpen = 2 * PVUtil.getInt(pvs[2]);
- pvClosed = 4 * PVUtil.getInt(pvs[3]);
- pvError = 8 * PVUtil.getInt(pvs[4]);
-
- sum = pvUndefined | pvOpen | pvClosed | pvError;
- isValid = (sum & (sum - 1)) == 0 ? 1 : 0;
-
- log_pv(pvs[1]);
- log_pv(pvs[2]);
- log_pv(pvs[3]);
- log_pv(pvs[4]);
-
- if (pvError) {
- Logger.info(pvSymbol + ": ERROR");
- colorID = 4;
- } else if (pvUndefined) {
- Logger.info(pvSymbol + ": UNDEFINED");
- colorID = 1;
- } else if (isValid == 0) {
- Logger.severe(pvSymbol + ": Invalid combination");
- } else if (pvClosed) {
- Logger.info(pvSymbol + ": CLOSED");
- colorID = 3;
- } else if (pvOpen) {
- Logger.info(pvSymbol + ": OPEN");
- colorID = 2;
- } else
- Logger.severe(pvSymbol + ": Unknown combination:" + sum);
-
- if (colorID != PVUtil.getInt(pvSymbol))
- Logger.severe(pvSymbol + ": State mismatch:" + colorID + " vs " + PVUtil.getInt(pvSymbol));
-} catch (err) {
- Logger.severe("NO CONNECTION: " + err);
-}
-
-
-//pvSymbol.write(colorID);
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/vac_vvs.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/vac_vvs.bob
index f283f9bc9dd54a366b480f78cf69670f17cf7cf9..9d5720b5536f31ccd9db86f321211beba5eefb01 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/vac_vvs.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/vac_vvs.bob
@@ -94,15 +94,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="symbol_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):UndefinedR</pv_name>
- <pv_name>$(vacPREFIX):OpenR</pv_name>
- <pv_name>$(vacPREFIX):ClosedR</pv_name>
- <pv_name>$(vacPREFIX):ErrorR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
</widget>
<widget type="rectangle" version="2.0.0">