diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob
index 94eb3b3c94d0658a1b0a3ff492a08e718bb3d52c..db3f9998ae86ddf20d967cce8fba45e360c26c05 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob
@@ -41,6 +41,10 @@
<x>3</x>
<y>38</y>
<height>25</height>
+ <background_color>
+ <color name="Write_Background" red="224" green="217" blue="202">
+ </color>
+ </background_color>
<format>6</format>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py
index bd3446b939ccb53986f71821fdd891d51098870c..32ceda78fb646be5ac43b2d3d01a68b1d2ad94c8 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py
@@ -24,11 +24,11 @@ controller = macros.getValue("CONTROLLER")
controller_type = macros.getValue("CONTROLLER_TYPE")
devicename = macros.getValue("vacPREFIX")
try:
- pumpPV = PVFactory.getPV("{}:iUITypeR".format(controller))
- pump = pumpPV.read()
- PVFactory.releasePV(pumpPV)
- pump = pump.value
- path = bob_path(pump)
+ gaugePV = PVFactory.getPV("{}:iUITypeR".format(controller))
+ gauge = gaugePV.read()
+ PVFactory.releasePV(gaugePV)
+ gauge = gauge.value
+ path = bob_path(gauge)
except Exception as e:
ScriptUtil.getLogger().severe(str(e))
if controller_type:
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/open_tpg_screen.py b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/open_tpg_screen.py
new file mode 100644
index 0000000000000000000000000000000000000000..829e6a2f11f57c8f18dceffc4109a7e6e6980da6
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/open_tpg_screen.py
@@ -0,0 +1,49 @@
+from org.csstudio.display.builder.runtime.script import PVUtil
+from org.csstudio.display.builder.runtime.script import ScriptUtil
+from org.csstudio.display.builder.runtime.pv import PVFactory
+
+macros = widget.getEffectiveMacros()
+macros.expandValues(macros)
+
+tpg300 = macros.getValue("FACEPLATE_300")
+tpg500 = macros.getValue("FACEPLATE_500")
+
+def bob_path(typ):
+ typ = typ.lower()
+ if "tpg" not in typ:
+ return None
+
+ if "500" in typ:
+ path = tpg500
+ elif "300" in typ:
+ path = tpg300
+ else:
+ path = tpg300
+ ScriptUtil.getLogger().severe("Cannot determine controller type: '{}', Falling back to TPG-300 faceplate".format(typ))
+
+ return path
+
+
+controller = macros.getValue("CONTROLLER")
+controller_type = macros.getValue("CONTROLLER_TYPE")
+try:
+ gaugePV = PVFactory.getPV("{}:iUITypeR".format(controller))
+ gauge = gaugePV.read()
+ PVFactory.releasePV(gaugePV)
+ gauge = gauge.value
+ path = bob_path(gauge)
+except Exception as e:
+ ScriptUtil.getLogger().severe(str(e))
+ if controller_type:
+ path = bob_path(controller_type)
+ else:
+ path = tpg300
+ ScriptUtil.getLogger().severe("Falling back to TPG-300 faceplate")
+
+
+macros.add("DEVICENAME", controller)
+dmacros = dict()
+for k in macros.getNames():
+ dmacros[k] = macros.getValue(k)
+
+ScriptUtil.openDisplay(widget, path, "STANDALONE", dmacros)
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob
index 33bd21621922f0a9b3b6618eb0c650f7667bb0b7..3cfad5f0c6733e47783ec8cd45c3ac013ca2aaa6 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob
@@ -18,7 +18,7 @@
</background_color>
<widget type="label" version="2.0.0">
<name>Configuration</name>
- <text>COMBINATION CHANNEL CONFIGURATION</text>
+ <text>Combination Channel Configuration</text>
<width>804</width>
<height>35</height>
<font>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob
index 846fe244c973c78bf62b0cffda0dd72440181a36..554505de88ba9630b5d00a8142fa9910d98e872c 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob
@@ -186,7 +186,6 @@
<height>25</height>
<actions>
</actions>
- <tooltip>$(pv_name)$(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Panel LockR</name>
@@ -340,7 +339,6 @@
<height>25</height>
<actions>
</actions>
- <tooltip>$(pv_name)$(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Parameter SettingR</name>
@@ -370,7 +368,6 @@
<y>133</y>
<width>120</width>
<height>25</height>
- <tooltip>$(pv_name)$(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Force PascalR</name>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob
index 249f1efaf88f7638264cadcfef9abe4bffa4cf61..3dd4540b907b65bc09666913011c36cd886e18d1 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob
@@ -18,7 +18,7 @@
</background_color>
<widget type="label" version="2.0.0">
<name>Configuration</name>
- <text>MODULE CONFIGURATION</text>
+ <text>Module Configuration</text>
<width>804</width>
<height>35</height>
<font>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob
index c6f27cccf30612113aedb8093b1d9c172bd1b156..55ff97efe660e7be909fd380dc1a171ca12cab62 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob
@@ -158,7 +158,6 @@
<height>25</height>
<actions>
</actions>
- <tooltip>$(pv_name)$(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>SaveParams-RB</name>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_controller.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_controller.bob
new file mode 100644
index 0000000000000000000000000000000000000000..54a88d1e3e69b21bd122d351508e52e5e0411a31
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_controller.bob
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>$(DEVICENAME)</name>
+ <width>610</width>
+ <height>669</height>
+ <widget type="group" version="2.0.0">
+ <name>TPG-500</name>
+ <width>610</width>
+ <height>669</height>
+ <style>2</style>
+ <foreground_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>Configuration</name>
+ <text>$(DEVICENAME)</text>
+ <width>610</width>
+ <height>35</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="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>CommsStatR</name>
+ <pv_name>$(DEVICENAME):CommsStatR</pv_name>
+ <x>450</x>
+ <y>5</y>
+ <width>150</width>
+ <height>25</height>
+ <font>
+ <font name="SMALL-SERIF-BOLD" family="Source Serif Pro" style="BOLD" size="14.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Module Configuration</name>
+ <file>vac_ctrl_tpg500_module.bob</file>
+ <x>10</x>
+ <y>50</y>
+ <width>590</width>
+ <height>244</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>System Settings</name>
+ <x>10</x>
+ <y>314</y>
+ <width>590</width>
+ <height>215</height>
+ <style>2</style>
+ <foreground_color>
+ <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>System Settings</name>
+ <text>System Settings</text>
+ <width>590</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="label" version="2.0.0">
+ <name>Pressure Unit</name>
+ <text>Pressure Unit:</text>
+ <y>40</y>
+ <width>150</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="combo" version="2.0.0">
+ <name>Pressure UnitS</name>
+ <pv_name>${DEVICENAME}:UnitS</pv_name>
+ <x>160</x>
+ <y>40</y>
+ <width>220</width>
+ <height>25</height>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Pressure UnitR</name>
+ <pv_name>$(DEVICENAME):Unit-RB</pv_name>
+ <x>386</x>
+ <y>40</y>
+ <width>194</width>
+ <height>25</height>
+ <format>6</format>
+ <show_units>false</show_units>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Underrange Control</name>
+ <text>Underrange Control:</text>
+ <y>75</y>
+ <width>150</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="combo" version="2.0.0">
+ <name>UnderRngCtrlS</name>
+ <pv_name>${DEVICENAME}:UnderRngCtrlS</pv_name>
+ <x>160</x>
+ <y>75</y>
+ <width>220</width>
+ <height>25</height>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>UnderRngCtrl-RB</name>
+ <pv_name>$(DEVICENAME):UnderRngCtrl-RB</pv_name>
+ <x>386</x>
+ <y>75</y>
+ <width>194</width>
+ <height>25</height>
+ <format>6</format>
+ <show_units>false</show_units>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Parameter Storage</name>
+ <text>Parameter Storage:</text>
+ <y>110</y>
+ <width>150</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="combo" version="2.0.0">
+ <name>SaveParamsS</name>
+ <pv_name>$(DEVICENAME):SaveParamsS</pv_name>
+ <x>160</x>
+ <y>110</y>
+ <width>220</width>
+ <height>25</height>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SaveParams-RB</name>
+ <pv_name>$(DEVICENAME):SaveParams-RB</pv_name>
+ <x>386</x>
+ <y>110</y>
+ <width>194</width>
+ <height>25</height>
+ <format>6</format>
+ <show_units>false</show_units>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Analog Output</name>
+ <text>Analog Output Mode:</text>
+ <y>145</y>
+ <width>150</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="combo" version="2.0.0">
+ <name>AOModeS</name>
+ <pv_name>$(DEVICENAME):AOModeS</pv_name>
+ <x>160</x>
+ <y>145</y>
+ <width>220</width>
+ <height>25</height>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>AOMode-RB</name>
+ <pv_name>$(DEVICENAME):AOMode-RB</pv_name>
+ <x>386</x>
+ <y>145</y>
+ <width>194</width>
+ <height>25</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Error Relay</name>
+ <text>Error Relay Function:</text>
+ <y>180</y>
+ <width>150</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <tooltip>Error Relay Assignment</tooltip>
+ </widget>
+ <widget type="combo" version="2.0.0">
+ <name>RlyErr:ModeS</name>
+ <pv_name>$(DEVICENAME):RlyErr:ModeS</pv_name>
+ <x>160</x>
+ <y>180</y>
+ <width>220</width>
+ <height>25</height>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>RlyErr:Mode-RB</name>
+ <pv_name>$(DEVICENAME):RlyErr:Mode-RB</pv_name>
+ <x>386</x>
+ <y>180</y>
+ <width>194</width>
+ <height>25</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Operation Data</name>
+ <x>10</x>
+ <y>549</y>
+ <width>590</width>
+ <height>110</height>
+ <style>2</style>
+ <foreground_color>
+ <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>Operation data</name>
+ <text>Operation Data</text>
+ <width>590</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="label" version="2.0.0">
+ <name>Inner Temperature</name>
+ <text>Inner Temperature:</text>
+ <y>40</y>
+ <width>160</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <tooltip>Inner Temperature of the TPG</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Battery Voltage</name>
+ <text>Battery Voltage:</text>
+ <y>75</y>
+ <width>160</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>CtrlTempR</name>
+ <pv_name>$(DEVICENAME):CtrlTempR</pv_name>
+ <x>170</x>
+ <y>40</y>
+ <height>25</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>BatVoltR</name>
+ <pv_name>$(DEVICENAME):BatVoltR</pv_name>
+ <x>170</x>
+ <y>75</y>
+ <height>25</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Operating Time</name>
+ <text>Operating Time:</text>
+ <x>309</x>
+ <y>40</y>
+ <width>160</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <tooltip>Inner Temperature of the TPG</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Recalibration Date</name>
+ <text>Recalibration Due Date:</text>
+ <x>309</x>
+ <y>75</y>
+ <width>160</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <tooltip>Date of next recalibration</tooltip>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>OperTimR</name>
+ <pv_name>$(DEVICENAME):OperTimR</pv_name>
+ <x>479</x>
+ <y>40</y>
+ <height>25</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>RecalibDateR</name>
+ <pv_name>$(DEVICENAME):RecalibDateR</pv_name>
+ <x>479</x>
+ <y>75</y>
+ <height>25</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_module.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_module.bob
new file mode 100644
index 0000000000000000000000000000000000000000..8269385a89e0cecf6df9028b89c3d723a018a3d5
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_module.bob
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>Module Configuration</name>
+ <width>590</width>
+ <height>244</height>
+ <widget type="group" version="2.0.0">
+ <name>Module Configuration</name>
+ <width>590</width>
+ <height>244</height>
+ <style>2</style>
+ <foreground_color>
+ <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>Configuration</name>
+ <text>Module Configuration</text>
+ <width>590</width>
+ <height>35</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="label" version="2.0.0">
+ <name>SlotA</name>
+ <text>Slot A</text>
+ <x>120</x>
+ <y>50</y>
+ <width>110</width>
+ <height>25</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>SlotB</name>
+ <text>Slot B</text>
+ <x>236</x>
+ <y>50</y>
+ <width>110</width>
+ <height>25</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Separator</name>
+ <x>10</x>
+ <y>80</y>
+ <width>570</width>
+ <height>1</height>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
+ </color>
+ </line_color>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="570.0" y="0.0">
+ </point>
+ </points>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Module Type</name>
+ <text>Module Type:</text>
+ <y>85</y>
+ <width>110</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Sensor Types</name>
+ <text>Sensor Types:</text>
+ <y>116</y>
+ <width>110</width>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>ModTypeA</name>
+ <pv_name>${DEVICENAME}:ModA:TypeR</pv_name>
+ <x>120</x>
+ <y>85</y>
+ <width>110</width>
+ <height>25</height>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>ModTypeB</name>
+ <pv_name>${DEVICENAME}:ModB:TypeR</pv_name>
+ <x>236</x>
+ <y>85</y>
+ <width>110</width>
+ <height>25</height>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SensorTypeA1</name>
+ <pv_name>${DEVICENAME}:A1:SensorTypeR</pv_name>
+ <x>120</x>
+ <y>116</y>
+ <width>50</width>
+ <height>25</height>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SensorTypeA2</name>
+ <pv_name>${DEVICENAME}:A2:SensorTypeR</pv_name>
+ <x>180</x>
+ <y>116</y>
+ <width>50</width>
+ <height>25</height>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SensorTypeB1</name>
+ <pv_name>${DEVICENAME}:B1:SensorTypeR</pv_name>
+ <x>236</x>
+ <y>116</y>
+ <width>50</width>
+ <height>25</height>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SensorTypeB2</name>
+ <pv_name>${DEVICENAME}:B2:SensorTypeR</pv_name>
+ <x>296</x>
+ <y>116</y>
+ <width>50</width>
+ <height>25</height>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Comm</name>
+ <text>Comm</text>
+ <x>352</x>
+ <y>50</y>
+ <width>110</width>
+ <height>25</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color>
+ <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>ModTypeComm</name>
+ <pv_name>${DEVICENAME}:ModComm:TypeR</pv_name>
+ <x>352</x>
+ <y>85</y>
+ <width>110</width>
+ <height>25</height>
+ <background_color>
+ <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Main</name>
+ <text>Main</text>
+ <x>468</x>
+ <y>50</y>
+ <width>110</width>
+ <height>25</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color>
+ <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>ModTypeMain</name>
+ <pv_name>${DEVICENAME}:ModMain:TypeR</pv_name>
+ <x>468</x>
+ <y>85</y>
+ <width>110</width>
+ <height>25</height>
+ <background_color>
+ <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>FWMain</name>
+ <pv_name>${DEVICENAME}:ModMain:FWVersionR</pv_name>
+ <x>468</x>
+ <y>116</y>
+ <width>110</width>
+ <height>25</height>
+ <background_color>
+ <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Firmware Version</name>
+ <text>Firmware:</text>
+ <x>359</x>
+ <y>116</y>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Part Number</name>
+ <text>Part Number:</text>
+ <x>359</x>
+ <y>147</y>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>ModMain:PartNumR</name>
+ <pv_name>${DEVICENAME}:ModMain:PartNumR</pv_name>
+ <x>468</x>
+ <y>147</y>
+ <width>110</width>
+ <height>25</height>
+ <background_color>
+ <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Serial Number</name>
+ <text>Serial Number:</text>
+ <x>359</x>
+ <y>178</y>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>ModMain:SerNumR</name>
+ <pv_name>${DEVICENAME}:ModMain:SerNumR</pv_name>
+ <x>468</x>
+ <y>178</y>
+ <width>110</width>
+ <height>25</height>
+ <background_color>
+ <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>HW Version</name>
+ <text>HW Version:</text>
+ <x>359</x>
+ <y>209</y>
+ <height>25</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>ModMain:HWVerR</name>
+ <pv_name>${DEVICENAME}:ModMain:HWVerR</pv_name>
+ <x>468</x>
+ <y>209</y>
+ <width>110</width>
+ <height>25</height>
+ <background_color>
+ <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob
index 02de8c1e50316d6a4ec1be68b1473deee3e378bf..276c23b967d74673cc15889229697de47d657854 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(DEVICENAME) Brief</name>
+ <macros>
+ <FACEPLATE_300>../../veg/Faceplate/vac_ctrl_tpg300_controller.bob</FACEPLATE_300>
+ <FACEPLATE_500>../../veg/Faceplate/vac_ctrl_tpg500_controller.bob</FACEPLATE_500>
+ </macros>
<width>375</width>
<height>298</height>
- <actions>
- </actions>
+ <rules>
+ <rule name="Fake rule to have iUITypeR always connected" prop_id="name" out_exp="false">
+ <pv_name trigger="false">${CONTROLLER}:iUITypeR</pv_name>
+ </rule>
+ </rules>
<widget type="rectangle" version="2.0.0">
<name>Background</name>
<width>375</width>
@@ -117,10 +124,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Relay 1</name>
- <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-status.bob</file>
<macros>
<RELAY>1</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-status.bob</file>
<x>105</x>
<y>82</y>
<width>96</width>
@@ -148,10 +155,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Relay 2</name>
- <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-status.bob</file>
<macros>
<RELAY>2</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-status.bob</file>
<x>209</x>
<y>82</y>
<width>96</width>
@@ -184,7 +191,7 @@
<y>170</y>
<width>125</width>
<height>25</height>
- <horizontal_alignment>2</horizontal_alignment>
+ <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="rectangle" version="2.0.0">
@@ -220,12 +227,9 @@
<widget type="action_button" version="3.0.0">
<name>Controller Detailed</name>
<actions>
- <action type="open_display">
- <file>../../veg/Faceplate/vac_ctrl_tpg300_controller.bob</file>
- <macros>
- <DEVICENAME>$(CONTROLLER)</DEVICENAME>
- </macros>
- <target>standalone</target>
+ <action type="execute">
+ <script file="../../veg/Faceplate/open_tpg_screen.py">
+ </script>
<description>Open Controller Screen</description>
</action>
</actions>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob
index 8d3e923454b2529062e809f8cadd61713c45b543..6cee6cf84a1b113d260d8b7cd3b219e99d88950e 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob
@@ -1,8 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(DEVICENAME)</name>
+ <macros>
+ <FACEPLATE_300>../../veg/Faceplate/vac_ctrl_tpg300_controller.bob</FACEPLATE_300>
+ <FACEPLATE_500>../../veg/Faceplate/vac_ctrl_tpg500_controller.bob</FACEPLATE_500>
+ </macros>
<width>558</width>
<height>641</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>
+ </rule>
+ </rules>
<widget type="rectangle" version="2.0.0">
<name>Gauge Background</name>
<width>558</width>
@@ -361,12 +370,9 @@
<widget type="action_button" version="3.0.0">
<name>Controller Detailed</name>
<actions>
- <action type="open_display">
- <file>../../veg/Faceplate/vac_ctrl_tpg300_controller.bob</file>
- <macros>
- <DEVICENAME>$(CONTROLLER)</DEVICENAME>
- </macros>
- <target>standalone</target>
+ <action type="execute">
+ <script file="../../veg/Faceplate/open_tpg_screen.py">
+ </script>
<description>Open Controller Screen</description>
</action>
</actions>