From ccc9252224b74a9e11ad577074732d949bcc5ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Tue, 9 Jun 2020 17:48:40 +0200
Subject: [PATCH] Added VPSU diagnostics screen
---
.../DEVICES/vacuum/diagnostics/vac_plc.bob | 27 +-
.../DEVICES/vacuum/diagnostics/vac_plcio.bob | 16 +-
.../DEVICES/vacuum/diagnostics/vac_vpsu.bob | 263 ++++++++++++++++++
.../vacs-accv_vac-plc-01001-psu.bob | 86 ++++++
NON-APPROVED/lebt-010_vac/diagnostics.bob | 79 ++----
NON-APPROVED/mebt-010_vac/diagnostics.bob | 35 +--
NON-APPROVED/rfq-010_vac/diagnostics.bob | 39 +--
7 files changed, 437 insertions(+), 108 deletions(-)
create mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_vpsu.bob
create mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vacs-accv_vac-plc-01001-psu.bob
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_plc.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_plc.bob
index 9e479dce..7d505798 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_plc.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_plc.bob
@@ -5,11 +5,11 @@
<vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-PLC-$(IDX)</vacPREFIX>
</macros>
<width>392</width>
- <height>235</height>
+ <height>285</height>
<widget type="rectangle" version="2.0.0">
<name>Background</name>
<width>392</width>
- <height>235</height>
+ <height>285</height>
<line_width>2</line_width>
<line_color>
<color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
@@ -177,7 +177,7 @@
<width>120</width>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Action Button</name>
+ <name>Open Remote I/O</name>
<actions>
<action type="open_display">
<file>vacs-accv_vac-plc-$(IDX).bob</file>
@@ -221,4 +221,25 @@
</rules>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Open PSU</name>
+ <actions>
+ <action type="open_display">
+ <file>vacs-accv_vac-plc-$(IDX)-psu.bob</file>
+ <target>window</target>
+ <description>Open Display</description>
+ </action>
+ </actions>
+ <text>Open PSU Diagnostics Screen</text>
+ <x>5</x>
+ <y>235</y>
+ <width>382</width>
+ <height>40</height>
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <tooltip>$(actions)</tooltip>
+ <enabled>$(HAS_PSU=false)</enabled>
+ </widget>
</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_plcio.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_plcio.bob
index 3f1e483b..c5e805e0 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_plcio.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_plcio.bob
@@ -50,7 +50,7 @@
<name>LED PLCIO Disconnected</name>
<pv_name>$(plcioPREFIX):DisconnectedR</pv_name>
<x>5</x>
- <y>55</y>
+ <y>50</y>
<off_color>
<color name="LED-GREEN-OFF" red="90" green="110" blue="90">
</color>
@@ -65,7 +65,7 @@
<name>Label PLCIO Disconnected</name>
<text>Disconnected</text>
<x>31</x>
- <y>55</y>
+ <y>50</y>
<width>95</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -73,7 +73,7 @@
<name>LED PLCIO Healthy</name>
<pv_name>$(plcioPREFIX):HltyR</pv_name>
<x>5</x>
- <y>85</y>
+ <y>80</y>
<off_color>
<color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
@@ -88,7 +88,7 @@
<name>Label PLCIO Healthy</name>
<text>Healthy</text>
<x>31</x>
- <y>85</y>
+ <y>80</y>
<width>95</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -96,7 +96,7 @@
<name>LED PLCIO Error</name>
<pv_name>$(plcioPREFIX):ErrorR</pv_name>
<x>5</x>
- <y>115</y>
+ <y>110</y>
<off_color>
<color name="LED-RED-OFF" red="110" green="101" blue="90">
</color>
@@ -111,7 +111,7 @@
<name>Label PLCIO Error</name>
<text>Error</text>
<x>31</x>
- <y>115</y>
+ <y>110</y>
<width>95</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -119,7 +119,7 @@
<name>Label PLCIO Status Code</name>
<text>Status Code:</text>
<x>136</x>
- <y>115</y>
+ <y>110</y>
<width>89</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -127,7 +127,7 @@
<name>Status code</name>
<pv_name>$(plcioPREFIX):StatusCodeR</pv_name>
<x>231</x>
- <y>115</y>
+ <y>110</y>
<width>130</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_vpsu.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_vpsu.bob
new file mode 100644
index 00000000..d0f72771
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vac_vpsu.bob
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>$(psuPREFIX)</name>
+ <macros>
+ <psuPREFIX>$(SEC)-$(SUBSEC):$(DIS)-VPSU-$(IDX)</psuPREFIX>
+ </macros>
+ <width>372</width>
+ <height>265</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Background</name>
+ <width>372</width>
+ <height>265</height>
+ <line_width>2</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>Title</name>
+ <text>$(psuPREFIX)</text>
+ <width>372</width>
+ <height>30</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <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>
+ <tooltip>$(plcioPREFIX)</tooltip>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ITLckTrigR</name>
+ <pv_name>$(psuPREFIX):ITLckTrigR</pv_name>
+ <x>10</x>
+ <y>50</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label ITLckTrigR</name>
+ <text>Interlock Trigger Status</text>
+ <x>36</x>
+ <y>50</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ValidR</name>
+ <pv_name>$(psuPREFIX):ValidR</pv_name>
+ <x>10</x>
+ <y>85</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label ValidR</name>
+ <text>Valid</text>
+ <x>36</x>
+ <y>85</y>
+ <width>110</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>400VAC:HltyR</name>
+ <pv_name>$(psuPREFIX):400VAC:HltyR</pv_name>
+ <x>10</x>
+ <y>115</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label 400VAC Healthy</name>
+ <text>400VAC Healthy</text>
+ <x>36</x>
+ <y>115</y>
+ <width>110</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>230VAC:HltyR</name>
+ <pv_name>$(psuPREFIX):230VAC:HltyR</pv_name>
+ <x>10</x>
+ <y>145</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label 230VAC Healthy</name>
+ <text>230VAC Healthy</text>
+ <x>36</x>
+ <y>145</y>
+ <width>110</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>24VDC:HltyR</name>
+ <pv_name>$(psuPREFIX):24VDC:HltyR</pv_name>
+ <x>10</x>
+ <y>175</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label 24VDC Healthy</name>
+ <text>24VDC Healthy</text>
+ <x>36</x>
+ <y>175</y>
+ <width>110</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ResetDQ-RB</name>
+ <pv_name>$(psuPREFIX):ResetDQ-RB</pv_name>
+ <x>201</x>
+ <y>85</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>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label ResetDQ Feedback</name>
+ <text>ResetDQ Feedback</text>
+ <x>227</x>
+ <y>85</y>
+ <width>135</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>Auto-Reset:OngoingR</name>
+ <pv_name>$(psuPREFIX):Auto-Reset:OngoingR</pv_name>
+ <x>201</x>
+ <y>115</y>
+ <off_color>
+ <color name="LED-YELLOW-OFF" red="110" green="108" blue="90">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
+ </color>
+ </on_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label Auto-Reset Ongoing</name>
+ <text>Auto-reset Ongoing</text>
+ <x>227</x>
+ <y>115</y>
+ <width>135</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>Auto-Reset:FailureR</name>
+ <pv_name>$(psuPREFIX):Auto-Reset:FailureR</pv_name>
+ <x>201</x>
+ <y>145</y>
+ <off_color>
+ <color name="LED-RED-OFF" red="110" green="101" blue="90">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </on_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label Auto-Reset Failure</name>
+ <text>Auto-reset Failure</text>
+ <x>227</x>
+ <y>145</y>
+ <width>135</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>24VDC:WarningR</name>
+ <pv_name>$(psuPREFIX):24VDC:WarningR</pv_name>
+ <x>201</x>
+ <y>175</y>
+ <off_color>
+ <color name="LED-RED-OFF" red="110" green="101" blue="90">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </on_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label 24VDC Warning</name>
+ <text>24VDC Overload</text>
+ <x>227</x>
+ <y>175</y>
+ <width>135</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>RstErrorsCmd</name>
+ <actions>
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>1</value>
+ <description>Reset PSU</description>
+ </action>
+ </actions>
+ <pv_name>$(psuPREFIX):RstErrorsCmd</pv_name>
+ <x>262</x>
+ <y>225</y>
+ <tooltip>$(actions)</tooltip>
+ <show_confirm_dialog>true</show_confirm_dialog>
+ </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vacs-accv_vac-plc-01001-psu.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vacs-accv_vac-plc-01001-psu.bob
new file mode 100644
index 00000000..92cba759
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/diagnostics/vacs-accv_vac-plc-01001-psu.bob
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>VacS-ACCV:Vac-PLC-01001 PSU</name>
+ <macros>
+ <DIAG_ROOT>$(ROOT=$(ESS_OPIS=/ess-opis)/NON-APPROVED)</DIAG_ROOT>
+ <DIAG_WIDGET_ROOT>$(WIDGET_ROOT=$(DIAG_ROOT)/COMMON/DEVICES/vacuum)</DIAG_WIDGET_ROOT>
+ <DIS>Vac</DIS>
+ </macros>
+ <width>774</width>
+ <height>615</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Background</name>
+ <width>774</width>
+ <height>615</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title</name>
+ <text>VacS-ACCV:Vac-PLC-01001 PSU</text>
+ <x>5</x>
+ <y>5</y>
+ <width>764</width>
+ <height>30</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <background_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-VPSU-$(IDX)</name>
+ <macros>
+ <IDX>00010</IDX>
+ <SEC>LEBT</SEC>
+ <SUBSEC>010</SUBSEC>
+ </macros>
+ <file>vac_vpsu.bob</file>
+ <x>10</x>
+ <y>55</y>
+ <width>372</width>
+ <height>265</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-PLCIO-$(IDX)</name>
+ <macros>
+ <IDX>00010</IDX>
+ <SEC>RFQ</SEC>
+ <SUBSEC>010</SUBSEC>
+ </macros>
+ <file>vac_vpsu.bob</file>
+ <x>10</x>
+ <y>340</y>
+ <width>372</width>
+ <height>265</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-PLCIO-$(IDX)</name>
+ <macros>
+ <IDX>00020</IDX>
+ <SEC>RFQ</SEC>
+ <SUBSEC>010</SUBSEC>
+ </macros>
+ <file>vac_vpsu.bob</file>
+ <x>392</x>
+ <y>340</y>
+ <width>372</width>
+ <height>265</height>
+ <resize>2</resize>
+ </widget>
+</display>
diff --git a/NON-APPROVED/lebt-010_vac/diagnostics.bob b/NON-APPROVED/lebt-010_vac/diagnostics.bob
index 7e552543..debee355 100644
--- a/NON-APPROVED/lebt-010_vac/diagnostics.bob
+++ b/NON-APPROVED/lebt-010_vac/diagnostics.bob
@@ -2,22 +2,22 @@
<display version="2.0.0">
<name>$(SEC)-$(SUBSEC) Diagnostics</name>
<macros>
- <DIS>Vac</DIS>
<DIAG_ROOT>$(ROOT=$(ESS_OPIS=/ess-opis)/NON-APPROVED)</DIAG_ROOT>
<DIAG_WIDGET_ROOT>$(WIDGET_ROOT=$(DIAG_ROOT)/COMMON/DEVICES/vacuum)</DIAG_WIDGET_ROOT>
+ <DIS>Vac</DIS>
<SEC>LEBT</SEC>
<SUBSEC>010</SUBSEC>
</macros>
<width>1024</width>
- <height>670</height>
+ <height>590</height>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEG</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
<IDX>00011</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -25,12 +25,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEG</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
<IDX>10001</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
<width>292</width>
<height>110</height>
@@ -39,28 +39,13 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEVMC</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
<IDX>10001</IDX>
</macros>
- <y>132</y>
- <width>292</width>
- <height>110</height>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>$(DEV)-$(IDX)</name>
<file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
- <macros>
- <DEV>VEG</DEV>
- <FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
- <IDX>99999</IDX>
- </macros>
- <x>314</x>
- <y>132</y>
+ <y>130</y>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -68,13 +53,13 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_leyboldtd20.bob</FACEPLATE_PATH>
<IDX>02100</IDX>
</macros>
- <y>264</y>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
+ <y>260</y>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -82,14 +67,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_leyboldtd20.bob</FACEPLATE_PATH>
<IDX>03100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
- <y>264</y>
+ <y>260</y>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -97,28 +82,13 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_leyboldtd20.bob</FACEPLATE_PATH>
<IDX>06100</IDX>
</macros>
- <y>396</y>
- <width>292</width>
- <height>110</height>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>$(DEV)-$(IDX)</name>
<file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
- <macros>
- <DEV>VEPT</DEV>
- <FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_leyboldtd20.bob</FACEPLATE_PATH>
- <IDX>07100</IDX>
- </macros>
- <x>314</x>
- <y>396</y>
+ <y>390</y>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -126,28 +96,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_leyboldtd20.bob</FACEPLATE_PATH>
- <IDX>99998</IDX>
+ <IDX>07100</IDX>
</macros>
- <y>528</y>
- <width>292</width>
- <height>110</height>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>$(DEV)-$(IDX)</name>
<file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
- <macros>
- <DEV>VEPT</DEV>
- <FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_leyboldtd20.bob</FACEPLATE_PATH>
- <IDX>99999</IDX>
- </macros>
<x>314</x>
- <y>528</y>
+ <y>390</y>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -155,9 +111,9 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<macros>
<DEV>PLC</DEV>
+ <HAS_PSU>true</HAS_PSU>
<IDX>01001</IDX>
<PLCIO_IDX>$(IDX)</PLCIO_IDX>
<PLCIO_SEC>LEBT</PLCIO_SEC>
@@ -165,14 +121,14 @@
<SEC>VacS</SEC>
<SUBSEC>ACCV</SUBSEC>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<x>630</x>
<width>392</width>
- <height>330</height>
+ <height>285</height>
<resize>2</resize>
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<macros>
<DEV>PLC</DEV>
<IDX>10001</IDX>
@@ -182,10 +138,11 @@
<SEC>VacS</SEC>
<SUBSEC>ACCV</SUBSEC>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<x>630</x>
- <y>340</y>
+ <y>305</y>
<width>392</width>
- <height>330</height>
+ <height>285</height>
<resize>2</resize>
</widget>
</display>
diff --git a/NON-APPROVED/mebt-010_vac/diagnostics.bob b/NON-APPROVED/mebt-010_vac/diagnostics.bob
index b1c60251..d905daff 100644
--- a/NON-APPROVED/mebt-010_vac/diagnostics.bob
+++ b/NON-APPROVED/mebt-010_vac/diagnostics.bob
@@ -2,22 +2,22 @@
<display version="2.0.0">
<name>$(SEC)-$(SUBSEC) Diagnostics</name>
<macros>
- <DIS>Vac</DIS>
<DIAG_ROOT>$(ROOT=$(ESS_OPIS=/ess-opis)/NON-APPROVED)</DIAG_ROOT>
<DIAG_WIDGET_ROOT>$(WIDGET_ROOT=$(DIAG_ROOT)/COMMON/DEVICES/vacuum)</DIAG_WIDGET_ROOT>
+ <DIS>Vac</DIS>
<SEC>MEBT</SEC>
<SUBSEC>010</SUBSEC>
</macros>
<width>1024</width>
- <height>670</height>
+ <height>590</height>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEG</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
<IDX>10001</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -25,12 +25,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEG</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
<IDX>10002</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
<width>292</width>
<height>110</height>
@@ -39,13 +39,13 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEG</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
<IDX>01100</IDX>
</macros>
- <y>132</y>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
+ <y>130</y>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -53,13 +53,13 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>01100</IDX>
</macros>
- <y>264</y>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
+ <y>260</y>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -67,14 +67,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPI</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vepi/Faceplate/vac_ctrl_digitalqpce.bob</FACEPLATE_PATH>
<IDX>10001</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
- <y>264</y>
+ <y>260</y>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -82,13 +82,13 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPI</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vepi/Faceplate/vac_ctrl_digitalqpce.bob</FACEPLATE_PATH>
<IDX>20001</IDX>
</macros>
- <y>396</y>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
+ <y>390</y>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -96,9 +96,9 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<macros>
<DEV>PLC</DEV>
+ <HAS_PSU>true</HAS_PSU>
<IDX>01001</IDX>
<PLCIO_IDX>01004</PLCIO_IDX>
<PLCIO_SEC>MEBT</PLCIO_SEC>
@@ -106,14 +106,14 @@
<SEC>VacS</SEC>
<SUBSEC>ACCV</SUBSEC>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<x>630</x>
<width>392</width>
- <height>330</height>
+ <height>285</height>
<resize>2</resize>
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<macros>
<DEV>PLC</DEV>
<IDX>10001</IDX>
@@ -123,10 +123,11 @@
<SEC>VacS</SEC>
<SUBSEC>ACCV</SUBSEC>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<x>630</x>
- <y>340</y>
+ <y>305</y>
<width>392</width>
- <height>330</height>
+ <height>285</height>
<resize>2</resize>
</widget>
</display>
diff --git a/NON-APPROVED/rfq-010_vac/diagnostics.bob b/NON-APPROVED/rfq-010_vac/diagnostics.bob
index 6722d5dd..fc1dd874 100644
--- a/NON-APPROVED/rfq-010_vac/diagnostics.bob
+++ b/NON-APPROVED/rfq-010_vac/diagnostics.bob
@@ -2,9 +2,9 @@
<display version="2.0.0">
<name>$(SEC)-$(SUBSEC) Diagnostics</name>
<macros>
- <DIS>Vac</DIS>
<DIAG_ROOT>$(ROOT=$(ESS_OPIS=/ess-opis)/NON-APPROVED)</DIAG_ROOT>
<DIAG_WIDGET_ROOT>$(WIDGET_ROOT=$(DIAG_ROOT)/COMMON/DEVICES/vacuum)</DIAG_WIDGET_ROOT>
+ <DIS>Vac</DIS>
<SEC>RFQ</SEC>
<SUBSEC>010</SUBSEC>
</macros>
@@ -12,12 +12,12 @@
<height>890</height>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEG</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
<IDX>10001</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<width>292</width>
<height>110</height>
<resize>2</resize>
@@ -25,12 +25,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEG</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
<IDX>10002</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
<width>292</width>
<height>110</height>
@@ -39,12 +39,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEG</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob</FACEPLATE_PATH>
<IDX>01100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<y>130</y>
<width>292</width>
<height>110</height>
@@ -53,12 +53,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>01100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<y>260</y>
<width>292</width>
<height>110</height>
@@ -67,12 +67,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>02100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
<y>260</y>
<width>292</width>
@@ -82,12 +82,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>03100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<y>390</y>
<width>292</width>
<height>110</height>
@@ -96,12 +96,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>04100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
<y>390</y>
<width>292</width>
@@ -111,9 +111,9 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<macros>
<DEV>PLC</DEV>
+ <HAS_PSU>true</HAS_PSU>
<IDX>01001</IDX>
<PLCIO_IDX>01002</PLCIO_IDX>
<PLCIO_SEC>RFQ</PLCIO_SEC>
@@ -121,14 +121,14 @@
<SEC>VacS</SEC>
<SUBSEC>ACCV</SUBSEC>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<x>630</x>
<width>392</width>
- <height>330</height>
+ <height>285</height>
<resize>2</resize>
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<macros>
<DEV>PLC</DEV>
<IDX>10001</IDX>
@@ -138,20 +138,21 @@
<SEC>VacS</SEC>
<SUBSEC>ACCV</SUBSEC>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_plc.bob</file>
<x>630</x>
- <y>340</y>
+ <y>305</y>
<width>392</width>
- <height>330</height>
+ <height>285</height>
<resize>2</resize>
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>05100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<y>520</y>
<width>292</width>
<height>110</height>
@@ -160,12 +161,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>06100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
<y>520</y>
<width>292</width>
@@ -175,12 +176,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>07100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<y>650</y>
<width>292</width>
<height>110</height>
@@ -189,12 +190,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>08100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
<y>650</y>
<width>292</width>
@@ -204,12 +205,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>09100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<y>780</y>
<width>292</width>
<height>110</height>
@@ -218,12 +219,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>$(DEV)-$(IDX)</name>
- <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<macros>
<DEV>VEPT</DEV>
<FACEPLATE_PATH>$(DIAG_WIDGET_ROOT)/vept/Faceplate/vac_ctrl_pfeiffertcp350.bob</FACEPLATE_PATH>
<IDX>0A100</IDX>
</macros>
+ <file>$(DIAG_WIDGET_ROOT)/diagnostics/vac_ctrl-veg-vept.bob</file>
<x>314</x>
<y>780</y>
<width>292</width>
--
GitLab