diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs-interlock_device.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_interlock_device.bob
similarity index 94%
rename from NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs-interlock_device.bob
rename to NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_interlock_device.bob
index 4d0e903b48f0cf355b611864f340c945ef09d64d..1f87df987dc0f7653ee0dec8b479310320218501 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs-interlock_device.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_interlock_device.bob
@@ -6,8 +6,9 @@
<widget type="label" version="2.0.0">
<name>Label $(ITLckSTR) Interlock</name>
<text>$(ITLckSTR):</text>
+ <y>2</y>
<width>180</width>
- <height>29</height>
+ <height>25</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<rules>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vva-vvf-vvg/Faceplate/vac_vva-vvg-interlocks.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vva-vvf-vvg/Faceplate/vac_vva-vvg-interlocks.bob
index 421a9bbfa90123beb686a38eaddbd678dfa572d4..79dc71aa47e69b04b3ed22cec8a36845ede6b8fd 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vva-vvf-vvg/Faceplate/vac_vva-vvg-interlocks.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vva-vvf-vvg/Faceplate/vac_vva-vvg-interlocks.bob
@@ -3,14 +3,14 @@
<name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX) Interlock</name>
<macros>
<vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
+ <vacTITLE>$(TITLE=$(vacPREFIX))</vacTITLE>
</macros>
- <width>500</width>
+ <width>520</width>
<height>383</height>
<widget type="rectangle" version="2.0.0">
<name>Background</name>
- <width>500</width>
+ <width>520</width>
<height>383</height>
- <line_width>1</line_width>
<line_color>
<color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
</color>
@@ -22,8 +22,8 @@
</widget>
<widget type="label" version="2.0.0">
<name>Header</name>
- <text>$(vacPREFIX) Interlocks</text>
- <width>500</width>
+ <text>$(vacTITLE) Interlocks</text>
+ <width>520</width>
<height>30</height>
<font>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -45,7 +45,7 @@
<name>Group</name>
<x>10</x>
<y>40</y>
- <width>480</width>
+ <width>500</width>
<height>333</height>
<style>3</style>
<transparent>true</transparent>
@@ -74,7 +74,7 @@
<widget type="group" version="2.0.0">
<name>ITLck LED Group</name>
<y>45</y>
- <width>480</width>
+ <width>500</width>
<height>228</height>
<style>2</style>
<foreground_color>
@@ -85,160 +85,181 @@
<widget type="embedded" version="2.0.0">
<name>Interlock Header</name>
<file>../../COMMON/Faceplate/vac_interlock_header.bob</file>
- <x>156</x>
+ <x>180</x>
<width>320</width>
<height>25</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
- <widget type="label" version="2.0.0">
+ <widget type="embedded" version="2.0.0">
<name>Label HW:1 Interlock</name>
- <text>Hardware 1:</text>
+ <macros>
+ <ITLck>$(vacPREFIX):ITLck:HW:1</ITLck>
+ <ITLckSTR>Hardware 1</ITLckSTR>
+ </macros>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
<y>25</y>
- <width>150</width>
+ <width>180</width>
<height>29</height>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
+ <transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
- <name>HW Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <name>HW:1 Interlock</name>
<macros>
<ITLck>HW:1</ITLck>
</macros>
- <x>156</x>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <x>180</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>112</y>
- <width>150</width>
+ <widget type="embedded" version="2.0.0">
+ <name>Label HW:2 Interlock</name>
+ <macros>
+ <ITLck>$(vacPREFIX):ITLck:HW:2</ITLck>
+ <ITLckSTR>Hardware 2</ITLckSTR>
+ </macros>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
+ <y>54</y>
+ <width>180</width>
<height>29</height>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
+ <transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
- <name>SW Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <name>HW:2 Interlock</name>
<macros>
- <ITLck>SW</ITLck>
+ <ITLck>HW:2</ITLck>
</macros>
- <x>156</x>
- <y>112</y>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <x>180</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:1 Interlock</name>
- <text>Pressure 1:</text>
- <y>141</y>
- <width>150</width>
+ <widget type="embedded" version="2.0.0">
+ <name>Label HW:3 Interlock</name>
+ <macros>
+ <ITLck>$(vacPREFIX):ITLck:HW:3</ITLck>
+ <ITLckSTR>Hardware 3</ITLckSTR>
+ </macros>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
+ <y>83</y>
+ <width>180</width>
<height>29</height>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
+ <transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
- <name>Prs:1 Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <name>HW:3 Interlock</name>
<macros>
- <ITLck>Prs:1</ITLck>
+ <ITLck>HW:3</ITLck>
</macros>
- <x>156</x>
- <y>141</y>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <x>180</x>
+ <y>83</y>
<width>320</width>
<height>29</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
<widget type="label" version="2.0.0">
- <name>Label HW:2 Interlock</name>
- <text>Hardware 2:</text>
- <y>54</y>
- <width>150</width>
- <height>29</height>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label HW:3 Interlock</name>
- <text>Hardware 3:</text>
- <y>83</y>
- <width>150</width>
- <height>29</height>
+ <name>Label SW Interlock</name>
+ <macros>
+ <ITLckSTR>Software</ITLckSTR>
+ </macros>
+ <text>Software:</text>
+ <y>114</y>
+ <width>180</width>
+ <height>25</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="embedded" version="2.0.0">
- <name>HW:2 Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <name>SW Interlock</name>
<macros>
- <ITLck>HW:2</ITLck>
+ <ITLck>SW</ITLck>
</macros>
- <x>156</x>
- <y>54</y>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <x>180</x>
+ <y>112</y>
<width>320</width>
<height>29</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
- <name>HW:3 Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <name>Label Prs:1 Interlock</name>
<macros>
- <ITLck>HW:3</ITLck>
+ <ITLck>$(vacPREFIX):ITLck:Prs:1</ITLck>
+ <ITLckSTR>Pressure 1</ITLckSTR>
</macros>
- <x>156</x>
- <y>83</y>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
+ <y>141</y>
+ <width>180</width>
+ <height>29</height>
+ <transparent>true</transparent>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Prs:1 Interlock</name>
+ <macros>
+ <ITLck>Prs:1</ITLck>
+ </macros>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <x>180</x>
+ <y>141</y>
<width>320</width>
<height>29</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
- <widget type="label" version="2.0.0">
+ <widget type="embedded" version="2.0.0">
<name>Label Prs:2 Interlock</name>
- <text>Pressure 2:</text>
+ <macros>
+ <ITLck>$(vacPREFIX):ITLck:Prs:2</ITLck>
+ <ITLckSTR>Pressure 2</ITLckSTR>
+ </macros>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
<y>170</y>
- <width>150</width>
+ <width>180</width>
<height>29</height>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
+ <transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
<name>Prs:2 Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<macros>
<ITLck>Prs:2</ITLck>
</macros>
- <x>156</x>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <x>180</x>
<y>170</y>
<width>320</width>
<height>29</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
- <widget type="label" version="2.0.0">
+ <widget type="embedded" version="2.0.0">
<name>Label Open Interlock</name>
- <text>Open:</text>
+ <macros>
+ <ITLck>$(vacPREFIX):ITLck:Open</ITLck>
+ <ITLckSTR>Open</ITLckSTR>
+ </macros>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
<y>199</y>
- <width>150</width>
+ <width>180</width>
<height>29</height>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
+ <transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
<name>Open Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<macros>
<ITLck>Open</ITLck>
</macros>
- <x>156</x>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
+ <x>180</x>
<y>199</y>
<width>320</width>
<height>29</height>
@@ -256,7 +277,7 @@
</actions>
<pv_name>$(vacPREFIX):OverrideITLckCmd</pv_name>
<text>Bypass Interlocks</text>
- <x>70</x>
+ <x>90</x>
<y>293</y>
<width>200</width>
<height>40</height>
@@ -273,7 +294,7 @@
</actions>
<pv_name>$(vacPREFIX):ClrOverrideITLckCmd</pv_name>
<text>Clear Interlock Bypass</text>
- <x>280</x>
+ <x>300</x>
<y>293</y>
<width>200</width>
<height>40</height>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs-interlocks.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs-interlocks.bob
index 6dcfb06f780819d3d33048ef25ed599f5b6a1a30..85ca7b0c6470cad60c05eec3925d0a9f8766cd38 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs-interlocks.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/Faceplate/vac_vvs-interlocks.bob
@@ -244,11 +244,11 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Label $(ITLckSTR) Interlock</name>
- <file>vac_vvs-interlock_device.bob</file>
<macros>
<ITLck>$(vacPREFIX):ITLck:Prev:1</ITLck>
<ITLckSTR>Prev-1</ITLckSTR>
</macros>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
<y>25</y>
<width>180</width>
<height>29</height>
@@ -257,10 +257,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Prev-1 Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<macros>
<ITLck>Prev:1</ITLck>
</macros>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<x>180</x>
<y>25</y>
<width>320</width>
@@ -270,11 +270,11 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Label $(ITLckSTR) Interlock</name>
- <file>vac_vvs-interlock_device.bob</file>
<macros>
<ITLck>$(vacPREFIX):ITLck:Prev:2</ITLck>
<ITLckSTR>Prev-2</ITLckSTR>
</macros>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
<y>54</y>
<width>180</width>
<height>29</height>
@@ -283,10 +283,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Prev-2 Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<macros>
<ITLck>Prev:2</ITLck>
</macros>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<x>180</x>
<y>54</y>
<width>320</width>
@@ -296,11 +296,11 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Label $(ITLckSTR) Interlock</name>
- <file>vac_vvs-interlock_device.bob</file>
<macros>
<ITLck>$(vacPREFIX):ITLck:Next:1</ITLck>
<ITLckSTR>Next-1</ITLckSTR>
</macros>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
<y>83</y>
<width>180</width>
<height>29</height>
@@ -309,10 +309,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Next-1 Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<macros>
<ITLck>Next:1</ITLck>
</macros>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<x>180</x>
<y>83</y>
<width>320</width>
@@ -322,11 +322,11 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Label $(ITLckSTR) Interlock</name>
- <file>vac_vvs-interlock_device.bob</file>
<macros>
<ITLck>$(vacPREFIX):ITLck:Next:2</ITLck>
<ITLckSTR>Next-2</ITLckSTR>
</macros>
+ <file>../../COMMON/Faceplate/vac_interlock_device.bob</file>
<y>112</y>
<width>180</width>
<height>29</height>
@@ -335,10 +335,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Next-2 Interlock</name>
- <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<macros>
<ITLck>Next:2</ITLck>
</macros>
+ <file>../../COMMON/Faceplate/vac_interlock_leds.bob</file>
<x>180</x>
<y>112</y>
<width>320</width>