diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/interlock_leds.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/interlock_leds.bob
index c6c9ea25a9f22ee33da348bf2159c857f1a88f33..dbc2727d0d33919108b139a89fb80cf26c96ecba 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/interlock_leds.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/interlock_leds.bob
@@ -21,9 +21,6 @@
<color name="Button Grey" red="180" green="180" blue="180">
</color>
</foreground_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED Tripped</name>
@@ -41,9 +38,6 @@
<color name="Button Grey" red="180" green="180" blue="180">
</color>
</foreground_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED Bypassed</name>
@@ -61,9 +55,6 @@
<color name="Button Grey" red="180" green="180" blue="180">
</color>
</foreground_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED Disabled</name>
@@ -81,8 +72,5 @@
<color name="Button Grey" red="180" green="180" blue="180">
</color>
</foreground_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)</tooltip>
</widget>
</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_vpi-interlocks.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_vpi-interlocks.bob
new file mode 100644
index 0000000000000000000000000000000000000000..2f209e3152bb9b6b382b88d6bc772098dd4cf56e
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_vpi-interlocks.bob
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX) Interlock</name>
+ <macros>
+ <vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
+ </macros>
+ <width>500</width>
+ <height>267</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Background</name>
+ <width>500</width>
+ <height>267</height>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Header</name>
+ <text>$(vacPREFIX) Interlocks</text>
+ <width>500</width>
+ <height>30</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GRAY-TEXT" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Group</name>
+ <x>10</x>
+ <y>40</y>
+ <width>480</width>
+ <height>217</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="led" version="2.0.0">
+ <name>ITLckTrigR</name>
+ <pv_name>$(vacPREFIX):ITLckTrigR</pv_name>
+ <width>25</width>
+ <height>25</height>
+ <off_color>
+ <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label ITLckTrigR</name>
+ <text>Interlock Trigger</text>
+ <x>31</x>
+ <width>150</width>
+ <height>25</height>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>ITLck LED Group</name>
+ <y>45</y>
+ <width>480</width>
+ <height>112</height>
+ <style>2</style>
+ <foreground_color>
+ <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <widget type="embedded" version="2.0.0">
+ <name>Interlock Header</name>
+ <file>vac_interlock_header.bob</file>
+ <x>156</x>
+ <width>320</width>
+ <height>25</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label HW Interlock</name>
+ <text>Hardware:</text>
+ <y>25</y>
+ <width>150</width>
+ <height>29</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>HW Interlock</name>
+ <file>vac_interlock_leds.bob</file>
+ <macros>
+ <ITLck>HW</ITLck>
+ </macros>
+ <x>156</x>
+ <y>25</y>
+ <width>320</width>
+ <height>29</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label SW Interlock</name>
+ <text>Software:</text>
+ <y>54</y>
+ <width>150</width>
+ <height>29</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>SW Interlock</name>
+ <file>vac_interlock_leds.bob</file>
+ <macros>
+ <ITLck>SW</ITLck>
+ </macros>
+ <x>156</x>
+ <y>54</y>
+ <width>320</width>
+ <height>29</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label Prs Interlock</name>
+ <text>Pressure:</text>
+ <y>83</y>
+ <width>150</width>
+ <height>29</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Prs Interlock</name>
+ <file>vac_interlock_leds.bob</file>
+ <macros>
+ <ITLck>Prs</ITLck>
+ </macros>
+ <x>156</x>
+ <y>83</y>
+ <width>320</width>
+ <height>29</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>OverrideITLckCmd</name>
+ <actions>
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>1</value>
+ </action>
+ </actions>
+ <pv_name>$(vacPREFIX):OverrideITLckCmd</pv_name>
+ <text>Bypass Interlocks</text>
+ <x>70</x>
+ <y>177</y>
+ <width>200</width>
+ <height>40</height>
+ <tooltip>$(actions)</tooltip>
+ <show_confirm_dialog>true</show_confirm_dialog>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>ClrOverrideITLckCmd</name>
+ <actions>
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>1</value>
+ </action>
+ </actions>
+ <pv_name>$(vacPREFIX):ClrOverrideITLckCmd</pv_name>
+ <text>Clear Interlock Bypass</text>
+ <x>280</x>
+ <y>177</y>
+ <width>200</width>
+ <height>40</height>
+ <tooltip>$(actions)</tooltip>
+ <show_confirm_dialog>true</show_confirm_dialog>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob
index 53c6db29dedbeba148ec51f7374e8708de1e331a..8e76837b518cc1e0c192499bd431db7de52bd7cd 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob
@@ -5,7 +5,7 @@
<vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
</macros>
<width>420</width>
- <height>640</height>
+ <height>661</height>
<rules>
<rule name="Fake rule to have iUITypeR always connected" prop_id="name" out_exp="false">
<pv_name trigger="false">${CONTROLLER}:iUITypeR</pv_name>
@@ -37,7 +37,6 @@
<wrap_words>false</wrap_words>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
<border_color>
<color name="Blue" red="0" green="128" blue="255">
</color>
@@ -174,8 +173,8 @@
<enabled>false</enabled>
</widget>
<widget type="label" version="2.0.0">
- <name>Label FreqR</name>
- <text>Frequency:</text>
+ <name>Label PrsR</name>
+ <text>Pressure:</text>
<x>10</x>
<y>80</y>
<width>80</width>
@@ -202,8 +201,8 @@
</border_color>
</widget>
<widget type="textupdate" version="2.0.0">
- <name>FreqR</name>
- <pv_name>$(CONTROLLER):FreqR</pv_name>
+ <name>PrsR</name>
+ <pv_name>$(vacPREFIX):PrsR</pv_name>
<x>100</x>
<y>80</y>
<width>310</width>
@@ -220,19 +219,19 @@
<color name="BLACK" red="0" green="0" blue="0">
</color>
</background_color>
+ <format>2</format>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
<border_color>
<color name="Blue" red="0" green="128" blue="255">
</color>
</border_color>
</widget>
<widget type="label" version="2.0.0">
- <name>Label SpeedR</name>
+ <name>Label MotorCurR</name>
<text>Current:</text>
<x>10</x>
<y>99</y>
@@ -260,8 +259,8 @@
</border_color>
</widget>
<widget type="textupdate" version="2.0.0">
- <name>SpeedR</name>
- <pv_name>$(CONTROLLER):MotorCurR</pv_name>
+ <name>MotorCurR</name>
+ <pv_name>$(vacPREFIX):MotorCurR</pv_name>
<x>100</x>
<y>99</y>
<width>310</width>
@@ -283,7 +282,6 @@
<wrap_words>false</wrap_words>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
<border_color>
<color name="Blue" red="0" green="128" blue="255">
</color>
@@ -293,7 +291,7 @@
<name>ErrorR</name>
<pv_name>$(vacPREFIX):ErrorR</pv_name>
<x>10</x>
- <y>140</y>
+ <y>160</y>
<off_color>
<color name="LED-RED-OFF" red="110" green="101" blue="90">
</color>
@@ -308,13 +306,12 @@
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>ErrorMsg</name>
<text></text>
<x>40</x>
- <y>140</y>
+ <y>160</y>
<width>370</width>
<height>21</height>
<font>
@@ -351,7 +348,7 @@
<name>WarningR</name>
<pv_name>$(vacPREFIX):WarningR</pv_name>
<x>10</x>
- <y>170</y>
+ <y>190</y>
<off_color>
<color name="LED-YELLOW-OFF" red="110" green="108" blue="90">
</color>
@@ -366,13 +363,12 @@
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>WarningMsg</name>
<text></text>
<x>40</x>
- <y>170</y>
+ <y>190</y>
<width>370</width>
<height>21</height>
<font>
@@ -416,7 +412,7 @@
<pv_name>$(vacPREFIX):RstErrorsCmd</pv_name>
<text>Reset Warnings and Errors</text>
<x>10</x>
- <y>200</y>
+ <y>220</y>
<width>400</width>
<height>24</height>
<font>
@@ -436,7 +432,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline</name>
<x>10</x>
- <y>230</y>
+ <y>250</y>
<width>401</width>
<height>1</height>
<points>
@@ -451,14 +447,12 @@
</line_color>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
- <name>StoppedR</name>
- <pv_name>$(vacPREFIX):StoppedR</pv_name>
- <x>10</x>
- <y>240</y>
+ <name>StatR == 0</name>
+ <pv_name>=`$(vacPREFIX):StatR` == 0</pv_name>
+ <x>210</x>
+ <y>260</y>
<off_color>
<color name="LED-GREEN-OFF" red="90" green="110" blue="90">
</color>
@@ -473,13 +467,12 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
- <name>Label StoppedR</name>
- <text>Stopped</text>
- <x>30</x>
- <y>240</y>
+ <name>Label Standby</name>
+ <text>Standby</text>
+ <x>230</x>
+ <y>260</y>
<width>150</width>
<font>
<font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -520,7 +513,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label ValidR</name>
@@ -567,7 +559,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label InvalidCommandR</name>
@@ -596,10 +587,10 @@ $(pv_value)</tooltip>
</border_color>
</widget>
<widget type="led" version="2.0.0">
- <name>AcceleratingR</name>
- <pv_name>$(vacPREFIX):AcceleratingR</pv_name>
- <x>10</x>
- <y>300</y>
+ <name>StatR == 1</name>
+ <pv_name>=`$(vacPREFIX):StatR` == 1</pv_name>
+ <x>210</x>
+ <y>280</y>
<off_color>
<color name="LED-GREEN-OFF" red="90" green="110" blue="90">
</color>
@@ -614,13 +605,12 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
- <name>Label AcceleratingR</name>
- <text>Accelerating</text>
- <x>30</x>
- <y>300</y>
+ <name>Label Starting</name>
+ <text>Starting</text>
+ <x>230</x>
+ <y>280</y>
<width>150</width>
<font>
<font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -643,9 +633,9 @@ $(pv_value)</tooltip>
</border_color>
</widget>
<widget type="led" version="2.0.0">
- <name>HWErrorR</name>
- <pv_name>$(vacPREFIX):HWErrorR</pv_name>
- <x>10</x>
+ <name>StatR == 4</name>
+ <pv_name>=`$(vacPREFIX):StatR` == 4</pv_name>
+ <x>210</x>
<y>320</y>
<off_color>
<color name="LED-RED-OFF" red="110" green="101" blue="90">
@@ -661,12 +651,11 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
- <name>Label HWErrorR</name>
- <text>Controller Error</text>
- <x>30</x>
+ <name>Label Error</name>
+ <text>Error</text>
+ <x>230</x>
<y>320</y>
<width>150</width>
<font>
@@ -692,8 +681,8 @@ $(pv_value)</tooltip>
<widget type="led" version="2.0.0">
<name>StartDQ-RB</name>
<pv_name>$(vacPREFIX):StartDQ-RB</pv_name>
- <x>210</x>
- <y>240</y>
+ <x>10</x>
+ <y>300</y>
<off_color>
<color name="LED-GREEN-OFF" red="90" green="110" blue="90">
</color>
@@ -708,13 +697,12 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label StartDQ-RB</name>
<text>Started</text>
- <x>230</x>
- <y>240</y>
+ <x>30</x>
+ <y>300</y>
<width>150</width>
<font>
<font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -739,8 +727,8 @@ $(pv_value)</tooltip>
<widget type="led" version="2.0.0">
<name>OnManualStartR</name>
<pv_name>$(vacPREFIX):OnManualStartR</pv_name>
- <x>210</x>
- <y>260</y>
+ <x>10</x>
+ <y>340</y>
<off_color>
<color name="LED-GREEN-OFF" red="90" green="110" blue="90">
</color>
@@ -755,13 +743,12 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label OnManualStartR</name>
<text>Manual Start</text>
- <x>230</x>
- <y>260</y>
+ <x>30</x>
+ <y>340</y>
<width>150</width>
<font>
<font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -786,8 +773,8 @@ $(pv_value)</tooltip>
<widget type="led" version="2.0.0">
<name>OnAutoStartR</name>
<pv_name>$(vacPREFIX):OnAutoStartR</pv_name>
- <x>210</x>
- <y>280</y>
+ <x>10</x>
+ <y>320</y>
<off_color>
<color name="LED-GREEN-OFF" red="90" green="110" blue="90">
</color>
@@ -802,13 +789,12 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label OnAutoStartR</name>
<text>Auto Start</text>
- <x>230</x>
- <y>280</y>
+ <x>30</x>
+ <y>320</y>
<width>150</width>
<font>
<font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -831,8 +817,8 @@ $(pv_value)</tooltip>
</border_color>
</widget>
<widget type="led" version="2.0.0">
- <name>AtNominalSpdR</name>
- <pv_name>$(vacPREFIX):AtNominalSpdR</pv_name>
+ <name>StatR == 2</name>
+ <pv_name>=`$(vacPREFIX):StatR` == 2</pv_name>
<x>210</x>
<y>300</y>
<off_color>
@@ -849,11 +835,10 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
- <name>Label AtNominalSpdR</name>
- <text>At Nominal Speed</text>
+ <name>Label Running</name>
+ <text>Running</text>
<x>230</x>
<y>300</y>
<width>150</width>
@@ -880,7 +865,7 @@ $(pv_value)</tooltip>
<widget type="polyline" version="2.0.0">
<name>Polyline_1</name>
<x>10</x>
- <y>350</y>
+ <y>370</y>
<width>401</width>
<height>1</height>
<points>
@@ -895,14 +880,12 @@ $(pv_value)</tooltip>
</line_color>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label Interlocks</name>
<text>Interlocks</text>
<x>10</x>
- <y>353</y>
+ <y>373</y>
<width>60</width>
<font>
<font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -935,7 +918,7 @@ $(pv_value)</tooltip>
<pv_name>$(vacPREFIX):OverrideITLckCmd</pv_name>
<text>Bypass</text>
<x>10</x>
- <y>370</y>
+ <y>390</y>
<width>151</width>
<height>24</height>
<font>
@@ -963,7 +946,7 @@ $(pv_value)</tooltip>
<pv_name>$(vacPREFIX):ClrOverrideITLckCmd</pv_name>
<text>Clear Bypass</text>
<x>10</x>
- <y>393</y>
+ <y>413</y>
<width>151</width>
<height>24</height>
<font>
@@ -984,7 +967,7 @@ $(pv_value)</tooltip>
<name>ITLckTrigR</name>
<pv_name>$(vacPREFIX):ITLckTrigR</pv_name>
<x>210</x>
- <y>370</y>
+ <y>390</y>
<off_color>
<color name="LED-GREEN-OFF" red="90" green="110" blue="90">
</color>
@@ -999,13 +982,12 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label ITLckTrigR</name>
<text>Interlock Trigger</text>
<x>230</x>
- <y>370</y>
+ <y>390</y>
<width>150</width>
<font>
<font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -1031,7 +1013,7 @@ $(pv_value)</tooltip>
<name>Interlocks</name>
<file>../../COMMON/Faceplate/vac-vpp_vpt-interlocks-popup.bob</file>
<x>10</x>
- <y>440</y>
+ <y>460</y>
<height>80</height>
<resize>2</resize>
<actions>
@@ -1044,7 +1026,7 @@ $(pv_value)</tooltip>
<widget type="polyline" version="2.0.0">
<name>Polyline_2</name>
<x>10</x>
- <y>530</y>
+ <y>550</y>
<width>401</width>
<height>1</height>
<points>
@@ -1059,14 +1041,12 @@ $(pv_value)</tooltip>
</line_color>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>AutoStartDisStR</name>
<pv_name>$(vacPREFIX):AutoStartDisStR</pv_name>
<x>10</x>
- <y>540</y>
+ <y>560</y>
<off_color>
<color name="LED-GREEN-OFF" red="90" green="110" blue="90">
</color>
@@ -1081,13 +1061,12 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label AutoStartDisStR</name>
<text>Auto Start Disabled</text>
<x>30</x>
- <y>540</y>
+ <y>560</y>
<width>150</width>
<font>
<font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -1120,7 +1099,7 @@ $(pv_value)</tooltip>
<pv_name>$(vacPREFIX):AutoStartDisCmd</pv_name>
<text>Disable Automatic Start</text>
<x>10</x>
- <y>560</y>
+ <y>580</y>
<width>151</width>
<height>24</height>
<font>
@@ -1148,7 +1127,7 @@ $(pv_value)</tooltip>
<pv_name>$(vacPREFIX):AutoStartEnaCmd</pv_name>
<text>Enable Automatic Start</text>
<x>10</x>
- <y>583</y>
+ <y>603</y>
<width>151</width>
<height>24</height>
<font>
@@ -1176,7 +1155,7 @@ $(pv_value)</tooltip>
</actions>
<text>Engineering Screen</text>
<x>170</x>
- <y>610</y>
+ <y>630</y>
<width>210</width>
<height>24</height>
<font>
@@ -1220,4 +1199,107 @@ $(pv_value)</tooltip>
</color>
</border_color>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label DCVolR</name>
+ <text>Voltage:</text>
+ <x>10</x>
+ <y>118</y>
+ <width>80</width>
+ <height>21</height>
+ <font>
+ <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="Black" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="White" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <actions>
+ </actions>
+ <border_color>
+ <color name="Blue" red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>DCVolR</name>
+ <pv_name>$(vacPREFIX):DCVolR</pv_name>
+ <x>100</x>
+ <y>120</y>
+ <width>310</width>
+ <height>21</height>
+ <font>
+ <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color name="Blue" red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>RlyStatR</name>
+ <pv_name>$(vacPREFIX):RlyStatR</pv_name>
+ <x>210</x>
+ <y>340</y>
+ <off_color>
+ <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ <foreground_color>
+ <color name="Button Grey" red="180" green="180" blue="180">
+ </color>
+ </foreground_color>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label Relay status</name>
+ <text>Relay status</text>
+ <x>230</x>
+ <y>340</y>
+ <width>150</width>
+ <font>
+ <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="Black" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="White" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <vertical_alignment>1</vertical_alignment>
+ <actions>
+ </actions>
+ <border_color>
+ <color name="Blue" red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/vac_vpi.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/vac_vpi.bob
index ba071869fd4ca5f6fbe2a5bcaa12f1177f4bbba0..76e2a952aa2343c702727d0a8d2f73905c5ad760 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/vac_vpi.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/vac_vpi.bob
@@ -67,14 +67,14 @@
</widget>
<widget type="symbol" version="2.0.0">
<name>Symbol</name>
- <pv_name>$(vacPREFIX):StatR</pv_name>
+ <pv_name>=`$(vacPREFIX):StatR` + `$(vacPREFIX):ValidR` * `$(vacPREFIX):PLCValidR`</pv_name>
<symbols>
<symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-invalid.png</symbol>
- <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-on.png</symbol>
<symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-off.png</symbol>
+ <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-on.png</symbol>
+ <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-on.png</symbol>
+ <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-on.png</symbol>
<symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-error.png</symbol>
- <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-over-range.png</symbol>
- <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-under-range.png</symbol>
</symbols>
<x>48</x>
<y>3</y>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob
index 153e3f4485891979d4594f6e32b1d12c7a32e2a3..1e97ee4a5f33078c87a60d3a1dbc4bedd4bb25fe 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob
@@ -32,7 +32,6 @@
<wrap_words>false</wrap_words>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
<border_color>
<color name="Blue" red="0" green="128" blue="255">
</color>
@@ -188,7 +187,6 @@
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>ErrorMsg</name>
@@ -246,7 +244,6 @@
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>WarningMsg</name>
@@ -331,8 +328,6 @@
</points>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>StoppedR</name>
@@ -353,7 +348,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label StoppedR</name>
@@ -400,7 +394,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label ValidR</name>
@@ -447,7 +440,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label InvalidCommandR</name>
@@ -494,7 +486,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label AcceleratingR</name>
@@ -541,7 +532,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label LocalControlR</name>
@@ -588,7 +578,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label StartDQ-RB</name>
@@ -635,7 +624,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label OnManualStartR</name>
@@ -682,7 +670,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label OnAutoStartR</name>
@@ -729,7 +716,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label AtNominalSpdR</name>
@@ -776,7 +762,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label PumpDisconnectedR</name>
@@ -822,8 +807,6 @@ $(pv_value)</tooltip>
</points>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label Interlocks</name>
@@ -926,7 +909,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label ITLckTrigR</name>
@@ -986,8 +968,6 @@ $(pv_value)</tooltip>
</points>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>AutoStartDisStR</name>
@@ -1008,7 +988,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label AutoStartDisStR</name>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob
index d1ad44d3de906909c55d4750492f4df54e5da705..ab809edfba990215ff0f16d3842908adccc900c3 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob
@@ -37,7 +37,6 @@
<wrap_words>false</wrap_words>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
<border_color>
<color name="Blue" red="0" green="128" blue="255">
</color>
@@ -225,7 +224,6 @@
<wrap_words>false</wrap_words>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
<border_color>
<color name="Blue" red="0" green="128" blue="255">
</color>
@@ -283,7 +281,6 @@
<wrap_words>false</wrap_words>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
<border_color>
<color name="Blue" red="0" green="128" blue="255">
</color>
@@ -308,7 +305,6 @@
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>ErrorMsg</name>
@@ -366,7 +362,6 @@
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>WarningMsg</name>
@@ -451,8 +446,6 @@
</points>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>StoppedR</name>
@@ -473,7 +466,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label StoppedR</name>
@@ -520,7 +512,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label ValidR</name>
@@ -567,7 +558,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label InvalidCommandR</name>
@@ -614,7 +604,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label AcceleratingR</name>
@@ -661,7 +650,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label HWErrorR</name>
@@ -708,7 +696,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label StartDQ-RB</name>
@@ -755,7 +742,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label OnManualStartR</name>
@@ -802,7 +788,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label OnAutoStartR</name>
@@ -849,7 +834,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label AtNominalSpdR</name>
@@ -895,8 +879,6 @@ $(pv_value)</tooltip>
</points>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label Interlocks</name>
@@ -999,7 +981,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label ITLckTrigR</name>
@@ -1059,8 +1040,6 @@ $(pv_value)</tooltip>
</points>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>AutoStartDisStR</name>
@@ -1081,7 +1060,6 @@ $(pv_value)</tooltip>
</foreground_color>
<actions>
</actions>
- <tooltip>$(pv_name) / $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label AutoStartDisStR</name>