From a1597008ee9bec4850f19811b29936e911ff9203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Tue, 17 Nov 2020 15:01:32 +0100
Subject: [PATCH] Key exchange
---
NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob | 892 +---------
.../pss1-pss/PSS1_PSS_Diagnostics.bob | 636 ++-----
.../diagnostics/PLC_cabinet.bob | 34 +-
.../diagnostics/PLC_module_status.bob | 4 +-
.../diagnostics/RIO4_cabinet.bob | 34 +-
.../diagnostics/RIO5_cabinet.bob | 34 +-
.../embedded_displays/diagnostics/cabinet.bob | 34 +-
.../diagnostics/checksum.bob | 84 +
.../embedded_displays/diagnostics/epics.bob | 283 ++++
.../diagnostics/plc_software.bob | 162 ++
.../pss1-pss/embedded_displays/esob.bob | 19 -
.../embedded_displays/operation_mode.bob | 834 +++++++++
.../pss1-pss/embedded_displays/rad.bob | 2 +-
.../diagnostics/PLC_cabinet_diagnostics.bob | 661 ++------
.../RIO123_cabinet_diagnostics.bob | 754 +--------
.../diagnostics/RIO4_cabinet_diagnostics.bob | 754 +--------
.../diagnostics/RIO5_cabinet_diagnostics.bob | 752 +--------
NON-APPROVED/pss1-pss/popups/key_exchange.bob | 1489 +++++++++++++++++
.../pss1-pss/popups/permits/dtl2_dtl3.bob | 21 +-
NON-APPROVED/pss1-pss/popups/permits/dtl4.bob | 19 +-
.../pss1-pss/popups/permits/isrc_hvps.bob | 10 +-
.../popups/permits/isrc_magnetron.bob | 6 +-
.../pss1-pss/popups/permits/mebt1.bob | 14 +-
.../pss1-pss/popups/permits/mebt2.bob | 14 +-
.../pss1-pss/popups/permits/mebt3.bob | 14 +-
.../pss1-pss/popups/permits/rfq_dtl1.bob | 27 +-
NON-APPROVED/pss1-pss/symbols/Key/lock.svg | 10 +
27 files changed, 3531 insertions(+), 4066 deletions(-)
create mode 100644 NON-APPROVED/pss1-pss/embedded_displays/diagnostics/checksum.bob
create mode 100644 NON-APPROVED/pss1-pss/embedded_displays/diagnostics/epics.bob
create mode 100644 NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob
create mode 100644 NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob
create mode 100644 NON-APPROVED/pss1-pss/popups/key_exchange.bob
create mode 100644 NON-APPROVED/pss1-pss/symbols/Key/lock.svg
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index f7a660fe..5df43f73 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -542,834 +542,6 @@
</font>
<horizontal_alignment>1</horizontal_alignment>
</widget>
- <widget type="group" version="2.0.0">
- <name>Modes</name>
- <macros>
- <MODE_ALARM>Alarm Mode</MODE_ALARM>
- <MODE_BEAM_ON>Beam On</MODE_BEAM_ON>
- <MODE_OPEN_ACCESS>Open Access</MODE_OPEN_ACCESS>
- <MODE_RESTRICTED_ACCESS>Restricted\nAccess</MODE_RESTRICTED_ACCESS>
- <MODE_RM_INTERLOCK>RM Interlock</MODE_RM_INTERLOCK>
- <MODE_RP_SURVEY>RP Survey</MODE_RP_SURVEY>
- <MODE_SEARCH>Search</MODE_SEARCH>
- <MODE_TUNNEL_CLOSED>Tunnel Closed</MODE_TUNNEL_CLOSED>
- </macros>
- <x>30</x>
- <y>185</y>
- <width>970</width>
- <height>56</height>
- <style>3</style>
- <foreground_color>
- <color name="Read_Background" red="230" green="235" blue="232">
- </color>
- </foreground_color>
- <background_color>
- <color name="Read_Background" red="230" green="235" blue="232">
- </color>
- </background_color>
- <transparent>true</transparent>
- <widget type="multi_state_led" version="2.0.0">
- <name>Restricted Access</name>
- <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
- <x>840</x>
- <width>114</width>
- <height>50</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </foreground_color>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <square>true</square>
- <rules>
- <rule name="Line color" prop_id="line_color" out_exp="false">
- <exp bool_exp="pvInt0 == 7">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <states>
- <state>
- <value>0</value>
- <label>Restricted
-Access</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>1</value>
- <label>Restricted
-Access</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>2</value>
- <label>Restricted
-Access</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>3</value>
- <label>Restricted
-Access</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>4</value>
- <label>Restricted
-Access</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>5</value>
- <label>Restricted
-Access</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>6</value>
- <label>Restricted
-Access</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>7</value>
- <label>Restricted
-Access</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- </states>
- <fallback_label>Restricted
-Access</fallback_label>
- </widget>
- <widget type="multi_state_led" version="2.0.0">
- <name>Beam On</name>
- <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
- <width>114</width>
- <height>50</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </foreground_color>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <square>true</square>
- <rules>
- <rule name="Line color" prop_id="line_color" out_exp="false">
- <exp bool_exp="pvInt0 == 4">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <states>
- <state>
- <value>0</value>
- <label>$(MODE_BEAM_ON)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>1</value>
- <label>$(MODE_BEAM_ON)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>2</value>
- <label>$(MODE_BEAM_ON)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>3</value>
- <label>$(MODE_BEAM_ON)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>4</value>
- <label>$(MODE_BEAM_ON)</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>5</value>
- <label>$(MODE_BEAM_ON)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>6</value>
- <label>$(MODE_BEAM_ON)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>7</value>
- <label>$(MODE_BEAM_ON)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- </states>
- <fallback_label>$(MODE_BEAM_ON)</fallback_label>
- </widget>
- <widget type="multi_state_led" version="2.0.0">
- <name>Search</name>
- <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
- <x>120</x>
- <width>114</width>
- <height>50</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </foreground_color>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <square>true</square>
- <rules>
- <rule name="Line color" prop_id="line_color" out_exp="false">
- <exp bool_exp="pvInt0 == 2">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <states>
- <state>
- <value>0</value>
- <label>Search</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>1</value>
- <label>Search</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>2</value>
- <label>Search</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>3</value>
- <label>Search</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>4</value>
- <label>Search</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>5</value>
- <label>Search</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>6</value>
- <label>Search</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>7</value>
- <label>Search</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- </states>
- <fallback_label>Search</fallback_label>
- </widget>
- <widget type="multi_state_led" version="2.0.0">
- <name>RM Interlock</name>
- <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
- <x>240</x>
- <width>114</width>
- <height>50</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </foreground_color>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <square>true</square>
- <rules>
- <rule name="Line color" prop_id="line_color" out_exp="false">
- <exp bool_exp="pvInt0 == 5">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <states>
- <state>
- <value>0</value>
- <label>RM Interlock</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>1</value>
- <label>RM Interlock</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>2</value>
- <label>RM Interlock</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>3</value>
- <label>RM Interlock</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>4</value>
- <label>RM Interlock</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>5</value>
- <label>RM Interlock</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>6</value>
- <label>RM Interlock</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>7</value>
- <label>RM Interlock</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- </states>
- <fallback_label>RM Interlock</fallback_label>
- </widget>
- <widget type="multi_state_led" version="2.0.0">
- <name>Open Access</name>
- <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
- <x>360</x>
- <width>114</width>
- <height>50</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </foreground_color>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <square>true</square>
- <rules>
- <rule name="Line color" prop_id="line_color" out_exp="false">
- <exp bool_exp="pvInt0 == 1">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <states>
- <state>
- <value>0</value>
- <label>$(MODE_OPEN_ACCESS)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>1</value>
- <label>$(MODE_OPEN_ACCESS)</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>2</value>
- <label>$(MODE_OPEN_ACCESS)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>3</value>
- <label>$(MODE_OPEN_ACCESS)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>4</value>
- <label>$(MODE_OPEN_ACCESS)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>5</value>
- <label>$(MODE_OPEN_ACCESS)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>6</value>
- <label>$(MODE_OPEN_ACCESS)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>7</value>
- <label>$(MODE_OPEN_ACCESS)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- </states>
- <fallback_label>$(MODE_OPEN_ACCESS)</fallback_label>
- </widget>
- <widget type="multi_state_led" version="2.0.0">
- <name>Tunnel Closed</name>
- <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
- <x>480</x>
- <width>114</width>
- <height>50</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </foreground_color>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <square>true</square>
- <rules>
- <rule name="Line color" prop_id="line_color" out_exp="false">
- <exp bool_exp="pvInt0 == 3">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <states>
- <state>
- <value>0</value>
- <label>$(MODE_TUNNEL_CLOSED)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>1</value>
- <label>$(MODE_TUNNEL_CLOSED)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>2</value>
- <label>$(MODE_TUNNEL_CLOSED)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>3</value>
- <label>$(MODE_TUNNEL_CLOSED)</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>4</value>
- <label>$(MODE_TUNNEL_CLOSED)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>5</value>
- <label>$(MODE_TUNNEL_CLOSED)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>6</value>
- <label>$(MODE_TUNNEL_CLOSED)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>7</value>
- <label>$(MODE_TUNNEL_CLOSED)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- </states>
- <fallback_label>$(MODE_TUNNEL_CLOSED)</fallback_label>
- </widget>
- <widget type="multi_state_led" version="2.0.0">
- <name>RP Survey</name>
- <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
- <x>720</x>
- <width>114</width>
- <height>50</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </foreground_color>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <square>true</square>
- <rules>
- <rule name="Line color" prop_id="line_color" out_exp="false">
- <exp bool_exp="pvInt0 == 6">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <states>
- <state>
- <value>0</value>
- <label>$(MODE_RP_SURVEY)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>1</value>
- <label>$(MODE_RP_SURVEY)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>2</value>
- <label>$(MODE_RP_SURVEY)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>3</value>
- <label>$(MODE_RP_SURVEY)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>4</value>
- <label>$(MODE_RP_SURVEY)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>5</value>
- <label>$(MODE_RP_SURVEY)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>6</value>
- <label>$(MODE_RP_SURVEY)</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>7</value>
- <label>$(MODE_RP_SURVEY)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- </states>
- <fallback_label>$(MODE_RP_SURVEY)</fallback_label>
- </widget>
- <widget type="multi_state_led" version="2.0.0">
- <name>Alarm Mode</name>
- <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
- <x>600</x>
- <width>114</width>
- <height>50</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </foreground_color>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <square>true</square>
- <rules>
- <rule name="Line color" prop_id="line_color" out_exp="false">
- <exp bool_exp="pvInt0 == 0">
- <value>
- <color name="RED" red="252" green="13" blue="27">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- <rule name="Font color" prop_id="foreground_color" out_exp="false">
- <exp bool_exp="pvInt0 == 0">
- <value>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <states>
- <state>
- <value>0</value>
- <label>$(MODE_ALARM)</label>
- <color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </color>
- </state>
- <state>
- <value>1</value>
- <label>$(MODE_ALARM)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>2</value>
- <label>$(MODE_ALARM)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>3</value>
- <label>$(MODE_ALARM)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>4</value>
- <label>$(MODE_ALARM)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>5</value>
- <label>$(MODE_ALARM)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>6</value>
- <label>$(MODE_ALARM)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- <state>
- <value>7</value>
- <label>$(MODE_ALARM)</label>
- <color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </color>
- </state>
- </states>
- <fallback_label>$(MODE_ALARM)</fallback_label>
- </widget>
- </widget>
<widget type="group" version="2.0.0">
<name>MAS</name>
<x>900</x>
@@ -1679,7 +851,7 @@ Exit Door 1</text>
<description>Open Video feed</description>
</action>
<action type="open_webpage">
- <url>http://not.com</url>
+ <url>https://pss-pas1-camera1.tn.esss.lu.se</url>
<description>Open Webpage</description>
</action>
</actions>
@@ -2092,9 +1264,13 @@ Exit Door 1</text>
<name>PAS Camera</name>
<actions>
<action type="open_webpage">
- <url></url>
+ <url>https://pss-pas1-camera2.tn.esss.lu.se</url>
<description>Open Webpage</description>
</action>
+ <action type="command">
+ <command>totem rtsp://pss-pas1-camera2.tn.esss.lu.se</command>
+ <description>Open Video feed</description>
+ </action>
</actions>
<text>PSS Camera - PAS</text>
<x>25</x>
@@ -2107,9 +1283,13 @@ Exit Door 1</text>
<name>Controlled Area Camera</name>
<actions>
<action type="open_webpage">
- <url></url>
+ <url>https://pss-pas1-camera3.tn.esss.lu.se</url>
<description>Open Webpage</description>
</action>
+ <action type="command">
+ <command>totem rtsp://pss-pas1-camera3.tn.esss.lu.se</command>
+ <description>Open Video feed</description>
+ </action>
</actions>
<text>Camera - Controlled Area</text>
<x>25</x>
@@ -2119,12 +1299,12 @@ Exit Door 1</text>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Open Camera Feed_3</name>
+ <name>MAS Details</name>
<actions>
<action type="open_display">
- <file>TS2_PSS_Diagnostics.bob</file>
- <target>standalone</target>
- <description>Open Diagnostics</description>
+ <file></file>
+ <target>window</target>
+ <description>Open MAS Details</description>
</action>
</actions>
<text>MAS Details</text>
@@ -2135,15 +1315,15 @@ Exit Door 1</text>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Open Camera Feed_4</name>
+ <name>PAS Details</name>
<actions>
<action type="open_display">
- <file>TS2_PSS_Diagnostics.bob</file>
- <target>standalone</target>
- <description>Open Diagnostics</description>
+ <file></file>
+ <target>window</target>
+ <description>Open PAS Details</description>
</action>
</actions>
- <text>PSS Screen</text>
+ <text>PAS Details</text>
<x>200</x>
<y>375</y>
<width>150</width>
@@ -2653,7 +1833,7 @@ Door</text>
<name>Key</name>
<pv_name>TBD</pv_name>
<symbols>
- <symbol>symbols/Key/Key_A_black@256.png</symbol>
+ <symbol>symbols/Key/Key-black@256.png</symbol>
</symbols>
<x>35</x>
<y>3</y>
@@ -2664,6 +1844,11 @@ Door</text>
<widget type="action_button" version="3.0.0">
<name>Keys</name>
<actions>
+ <action type="open_display">
+ <file>popups/key_exchange.bob</file>
+ <target>window</target>
+ <description>Open Display</description>
+ </action>
</actions>
<text></text>
<width>132</width>
@@ -2945,4 +2130,29 @@ Door</text>
<preserve_ratio>false</preserve_ratio>
</widget>
</widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Grly_ConnectedToGround</name>
+ <pv_name>aFEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
+ <x>749</x>
+ <y>661</y>
+ <width>46</width>
+ <height>40</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Operation Mode</name>
+ <file>embedded_displays/operation_mode.bob</file>
+ <x>35</x>
+ <y>185</y>
+ <width>960</width>
+ <height>56</height>
+ <resize>2</resize>
+ </widget>
</display>
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
index 2806de47..f6cdb7d2 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
@@ -2,29 +2,28 @@
<display version="2.0.0">
<name>PSS1 PSS Diagnostics</name>
<macros>
+ <EMBEDDED_DIAG>embedded_displays/diagnostics</EMBEDDED_DIAG>
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
<PLC>FEB-090:PSS-PLC-1</PLC>
- <EMBEDDED_DIAG>embedded_displays/diagnostics</EMBEDDED_DIAG>
<POPUP_DIAG>popups/diagnostics</POPUP_DIAG>
</macros>
<width>1500</width>
- <height>980</height>
+ <height>1006</height>
<widget type="rectangle" version="2.0.0">
- <name>Rectangle Template</name>
+ <name>Title Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
<width>1500</width>
- <height>50</height>
- <line_width>0</line_width>
- <line_color>
- <color name="IO Line" red="0" green="32" blue="92">
- </color>
- </line_color>
- <background_color>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
<color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
</color>
</background_color>
</widget>
<widget type="label" version="2.0.0">
- <name>Label</name>
+ <name>Title</name>
<class>TITLE</class>
<text>PSS1 PSS Diagnostics</text>
<x use_class="true">20</x>
@@ -44,421 +43,39 @@
<vertical_alignment use_class="true">1</vertical_alignment>
<wrap_words use_class="true">false</wrap_words>
</widget>
- <widget type="group" version="2.0.0">
- <name>Software Diagnostics</name>
+ <widget type="embedded" version="2.0.0">
+ <name>EPICS</name>
+ <file>embedded_displays/diagnostics/epics.bob</file>
<x>20</x>
- <y>70</y>
+ <y>60</y>
<width>370</width>
- <height>386</height>
- <style>3</style>
+ <height>244</height>
+ <resize>2</resize>
<transparent>true</transparent>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey03-background_5</name>
- <width>370</width>
- <height>386</height>
- <line_width>0</line_width>
- <background_color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>EPICS Communication</name>
- <text>EPICS Communication</text>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>EPICS</name>
- <x>10</x>
- <y>40</y>
- <width>350</width>
- <height>194</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>ModbusConnected</name>
- <text>ModbusConnected:</text>
- <x>20</x>
- <y>10</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModbusConnectedR</name>
- <pv_name>$(GPLC):ModbusConnectedR</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>S7Connected</name>
- <text>S7Connected:</text>
- <x>20</x>
- <y>36</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>S7ConnectedR</name>
- <pv_name>$(GPLC):S7ConnectedR</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Alive</name>
- <text>Alive:</text>
- <x>20</x>
- <y>62</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>AliveR</name>
- <pv_name>$(GPLC):AliveR</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Hash OK</name>
- <text>PLC Hash OK:</text>
- <x>20</x>
- <y>86</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>PLCHashCorrectR</name>
- <pv_name>$(GPLC):PLCHashCorrectR</pv_name>
- <x>186</x>
- <y>86</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC HASH</name>
- <text>PLC Hash:</text>
- <x>20</x>
- <y>112</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>CommsHashFromPLCR</name>
- <pv_name>$(GPLC):CommsHashFromPLCR</pv_name>
- <x>186</x>
- <y>112</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>IOC HASH</name>
- <text>IOC Hash:</text>
- <x>20</x>
- <y>138</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>iCommsHashToPLC</name>
- <pv_name>$(GPLC):iCommsHashToPLC</pv_name>
- <x>186</x>
- <y>138</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Module Version</name>
- <text>Module Version:</text>
- <x>20</x>
- <y>164</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModVersionR</name>
- <pv_name>$(GPLC):ModVersionR</pv_name>
- <x>186</x>
- <y>164</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Checksums</name>
- <text>PLC Code Checksums</text>
- <y>244</y>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>Checksums</name>
- <x>10</x>
- <y>284</y>
- <width>349</width>
- <height>92</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>Software Checksum</name>
- <text>Software Checksum:</text>
- <x>6</x>
- <y>10</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>SW_Checksum</name>
- <pv_name>$(PLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Safety F-Signature</name>
- <text>Safety F-Signature:</text>
- <x>6</x>
- <y>36</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>FSignature</name>
- <pv_name>$(PLC):SafetySW_FSignature</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>GW Software Checksum</name>
- <text>GW Software Checksum:</text>
- <x>6</x>
- <y>62</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>GPLC-SW_Checksum</name>
- <pv_name>$(GPLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
</widget>
- <widget type="polygon" version="2.0.0">
- <name>F Wire</name>
- <x>803</x>
- <y>400</y>
- <width>510</width>
- <height>1</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="510.0" y="0.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
+ <widget type="embedded" version="2.0.0">
+ <name>PLC Software</name>
+ <file>embedded_displays/diagnostics/plc_software.bob</file>
+ <x>20</x>
+ <y>314</y>
+ <width>395</width>
+ <height>182</height>
+ <resize>2</resize>
</widget>
<widget type="polyline" version="2.0.0">
<name>GCPU-CPU Wire</name>
- <x>530</x>
+ <x>520</x>
<y>325</y>
- <width>250</width>
+ <width>220</width>
<height>40</height>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="40.0">
</point>
- <point x="250.0" y="40.0">
+ <point x="220.0" y="40.0">
</point>
- <point x="250.0" y="0.0">
+ <point x="220.0" y="0.0">
</point>
</points>
<line_color>
@@ -514,6 +131,46 @@ widget.setPropertyValue('tooltip', tooltip + """
</scripts>
<tooltip>N/A</tooltip>
</widget>
+ <widget type="polyline" version="2.0.0">
+ <name>F Wire</name>
+ <x>780</x>
+ <y>325</y>
+ <width>365</width>
+ <height>75</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="75.0">
+ </point>
+ <point x="364.99999999999994" y="75.0">
+ </point>
+ <point x="365.0" y="0.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>F Wire 2</name>
+ <x>1145</x>
+ <y>325</y>
+ <width>240</width>
+ <height>75</height>
+ <points>
+ <point x="0.0" y="75.0">
+ </point>
+ <point x="239.99999999999991" y="75.0">
+ </point>
+ <point x="239.99999999999997" y="0.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </line_color>
+ </widget>
<widget type="group" version="2.0.0">
<name>GCPU</name>
<x>450</x>
@@ -558,26 +215,9 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
</widget>
</widget>
- <widget type="polygon" version="2.0.0">
- <name>CPU Wire</name>
- <x>803</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- </widget>
<widget type="group" version="2.0.0">
<name>CPU</name>
- <x>722</x>
+ <x>700</x>
<y>60</y>
<width>162</width>
<height>270</height>
@@ -618,30 +258,26 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
</widget>
</widget>
- <widget type="polygon" version="2.0.0">
+ <widget type="polyline" version="2.0.0">
<name>Switch Wire</name>
- <x>1054</x>
+ <x>970</x>
<y>325</y>
<width>1</width>
- <height>152</height>
+ <height>179</height>
<points>
<point x="0.0" y="0.0">
</point>
- <point x="0.0" y="152.0">
+ <point x="0.0" y="178.99999999999997">
</point>
</points>
<line_color>
<color name="GREEN-BORDER" red="40" green="140" blue="40">
</color>
</line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
</widget>
<widget type="group" version="2.0.0">
<name>Switch</name>
- <x>994</x>
+ <x>890</x>
<y>60</y>
<width>120</width>
<height>270</height>
@@ -667,31 +303,27 @@ widget.setPropertyValue('tooltip', tooltip + """
<width>120</width>
<height>230</height>
</widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>HMI Wire</name>
- <x>1313</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
+ <widget type="symbol" version="2.0.0">
+ <name>SCL_Stat</name>
+ <pv_name>FEB-010Row:CnPw-U-001:SCL_Stat</pv_name>
+ <symbols>
+ <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/error.svg</symbol>
+ </symbols>
+ <x>48</x>
+ <y>126</y>
+ <width>24</width>
+ <height>24</height>
+ <scripts>
+ <script file="$(EMBEDDED_DIAG)/diag_conn_stat.py" check_connections="false">
+ <pv_name>$(pv_name)</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
</widget>
<widget type="group" version="2.0.0">
<name>HMI</name>
- <x>1208</x>
+ <x>1040</x>
<y>60</y>
<width>210</width>
<height>270</height>
@@ -721,7 +353,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>Disconnected</name>
<pv_name>$(PLC):HMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected@32.png</symbol>
+ <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
@@ -735,10 +367,56 @@ widget.setPropertyValue('tooltip', tooltip + """
<tooltip>N/A</tooltip>
</widget>
</widget>
- <widget type="polygon" version="2.0.0">
+ <widget type="group" version="2.0.0">
+ <name>PAS HMI</name>
+ <x>1280</x>
+ <y>60</y>
+ <width>210</width>
+ <height>270</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="picture" version="2.0.0">
+ <name>PAS HMI</name>
+ <file>symbols/plc/HMI.png</file>
+ <y>40</y>
+ <width>210</width>
+ <height>230</height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title</name>
+ <text>PAS HMI</text>
+ <width>210</width>
+ <height>40</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>PASHMI_ConnStat</name>
+ <pv_name>$(PLC):PASHMI_ConnStat</pv_name>
+ <symbols>
+ <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ </symbols>
+ <x>89</x>
+ <y>93</y>
+ <width>24</width>
+ <height>24</height>
+ <scripts>
+ <script file="$(EMBEDDED_DIAG)/diag_conn_stat.py" check_connections="false">
+ <pv_name>$(pv_name)</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ </widget>
+ <widget type="polyline" version="2.0.0">
<name>RIO Wire</name>
<x>150</x>
- <y>480</y>
+ <y>506</y>
<width>1223</width>
<height>3</height>
<points>
@@ -751,15 +429,11 @@ widget.setPropertyValue('tooltip', tooltip + """
<color name="GREEN-BORDER" red="40" green="140" blue="40">
</color>
</line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
</widget>
<widget type="polygon" version="2.0.0">
<name>RIO0 Wire</name>
<x>150</x>
- <y>480</y>
+ <y>506</y>
<width>1</width>
<height>75</height>
<points>
@@ -776,7 +450,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<widget type="polygon" version="2.0.0">
<name>RIO1 Wire</name>
<x>410</x>
- <y>480</y>
+ <y>506</y>
<width>1</width>
<height>75</height>
<points>
@@ -793,7 +467,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<widget type="polygon" version="2.0.0">
<name>RIO2 Wire</name>
<x>651</x>
- <y>480</y>
+ <y>506</y>
<width>1</width>
<height>75</height>
<points>
@@ -810,7 +484,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<widget type="polygon" version="2.0.0">
<name>RIO3 Wire</name>
<x>891</x>
- <y>480</y>
+ <y>506</y>
<width>1</width>
<height>75</height>
<points>
@@ -827,7 +501,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<widget type="polygon" version="2.0.0">
<name>RIO4 Wire</name>
<x>1132</x>
- <y>480</y>
+ <y>506</y>
<width>1</width>
<height>75</height>
<points>
@@ -844,7 +518,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<widget type="polygon" version="2.0.0">
<name>RIO5 Wire</name>
<x>1373</x>
- <y>480</y>
+ <y>506</y>
<width>1</width>
<height>75</height>
<points>
@@ -868,7 +542,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</macros>
<file>$(EMBEDDED_DIAG)/PLC_cabinet.bob</file>
<x>20</x>
- <y>505</y>
+ <y>531</y>
<width>260</width>
<height>465</height>
<resize>2</resize>
@@ -884,7 +558,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</macros>
<file>$(EMBEDDED_DIAG)/cabinet.bob</file>
<x>300</x>
- <y>505</y>
+ <y>531</y>
<width>221</width>
<height>345</height>
<resize>2</resize>
@@ -900,7 +574,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</macros>
<file>$(EMBEDDED_DIAG)/cabinet.bob</file>
<x>541</x>
- <y>505</y>
+ <y>531</y>
<width>221</width>
<height>345</height>
<resize>2</resize>
@@ -916,7 +590,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</macros>
<file>$(EMBEDDED_DIAG)/cabinet.bob</file>
<x>781</x>
- <y>505</y>
+ <y>531</y>
<width>221</width>
<height>345</height>
<resize>2</resize>
@@ -930,13 +604,13 @@ widget.setPropertyValue('tooltip', tooltip + """
</macros>
<file>$(EMBEDDED_DIAG)/RIO4_cabinet.bob</file>
<x>1022</x>
- <y>505</y>
+ <y>531</y>
<width>221</width>
<height>255</height>
<resize>2</resize>
</widget>
<widget type="embedded" version="2.0.0">
- <name>PSS1 PSS $(CABINET) Cabinet</name>
+ <name>PSS1 PSS RIO5 Cabinet</name>
<macros>
<BOB>$(POPUP_DIAG)/RIO5_cabinet_diagnostics.bob</BOB>
<P>FEB-090:PSS-RIO-5</P>
@@ -944,9 +618,9 @@ widget.setPropertyValue('tooltip', tooltip + """
</macros>
<file>$(EMBEDDED_DIAG)/RIO5_cabinet.bob</file>
<x>1263</x>
- <y>505</y>
+ <y>531</y>
<width>221</width>
- <height>330</height>
+ <height>405</height>
<resize>2</resize>
</widget>
</display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
index 8e181f95..896ded09 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
@@ -13,13 +13,17 @@
<name>BGGrey03-background</name>
<width>260</width>
<height>465</height>
- <line_width>0</line_width>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="RED-GROUP-BORDER" red="167" green="134" blue="130">
+ </color>
+ </line_color>
<background_color>
<color name="RED-GROUP-BACKGROUND" red="208" green="175" blue="172">
</color>
</background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
<rules>
<rule name="Background color" prop_id="background_color" out_exp="false">
<exp bool_exp="pvInt0">
@@ -30,6 +34,15 @@
</exp>
<pv_name>$(P):Cabinet_Stat</pv_name>
</rule>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(P):Cabinet_Stat</pv_name>
+ </rule>
</rules>
</widget>
<widget type="action_button" version="3.0.0">
@@ -71,6 +84,21 @@
<width>240</width>
<height>400</height>
<style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <width>240</width>
+ <height>400</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="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ </widget>
<widget type="led" version="2.0.0">
<name>LED_SM_Stat</name>
<pv_name>$(P):SM_Stat</pv_name>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_module_status.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_module_status.bob
index 8a56ce4a..0ae33860 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_module_status.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_module_status.bob
@@ -7,7 +7,7 @@
<name>Disconnected</name>
<pv_name>$(DIAG_CONN_STAT)</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected@32.png</symbol>
+ <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
</symbols>
<x>3</x>
<y>3</y>
@@ -24,7 +24,7 @@
<name>Error</name>
<pv_name>$(DIAG_STAT)</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/error@32.png</symbol>
+ <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/error.svg</symbol>
</symbols>
<x>3</x>
<y>43</y>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
index 255c697c..a129176c 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
@@ -17,13 +17,17 @@
<name>BGGrey03-background</name>
<width>221</width>
<height>255</height>
- <line_width>0</line_width>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="RED-GROUP-BORDER" red="167" green="134" blue="130">
+ </color>
+ </line_color>
<background_color>
<color name="RED-GROUP-BACKGROUND" red="208" green="175" blue="172">
</color>
</background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
<rules>
<rule name="Background color" prop_id="background_color" out_exp="false">
<exp bool_exp="pvInt0">
@@ -34,6 +38,15 @@
</exp>
<pv_name>$(P):Cabinet_Stat</pv_name>
</rule>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(P):Cabinet_Stat</pv_name>
+ </rule>
</rules>
</widget>
<widget type="action_button" version="3.0.0">
@@ -76,6 +89,21 @@
<width>201</width>
<height>190</height>
<style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <width>201</width>
+ <height>190</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="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ </widget>
<widget type="led" version="2.0.0">
<name>LED_SM_Stat</name>
<pv_name>$(P):SM_Stat</pv_name>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
index dda5c38f..a8128d6f 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
@@ -17,13 +17,17 @@
<name>BGGrey03-background</name>
<width>221</width>
<height>405</height>
- <line_width>0</line_width>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="RED-GROUP-BORDER" red="167" green="134" blue="130">
+ </color>
+ </line_color>
<background_color>
<color name="RED-GROUP-BACKGROUND" red="208" green="175" blue="172">
</color>
</background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
<rules>
<rule name="Background color" prop_id="background_color" out_exp="false">
<exp bool_exp="pvInt0">
@@ -34,6 +38,15 @@
</exp>
<pv_name>$(P):Cabinet_Stat</pv_name>
</rule>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(P):Cabinet_Stat</pv_name>
+ </rule>
</rules>
</widget>
<widget type="label" version="2.0.0">
@@ -76,6 +89,21 @@
<width>201</width>
<height>340</height>
<style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <width>201</width>
+ <height>340</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="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ </widget>
<widget type="led" version="2.0.0">
<name>LED_SM_Stat</name>
<pv_name>$(P):SM_Stat</pv_name>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
index 048a25cc..df54d5db 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
@@ -13,13 +13,17 @@
<name>BGGrey03-background</name>
<width>221</width>
<height>345</height>
- <line_width>0</line_width>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="RED-GROUP-BORDER" red="167" green="134" blue="130">
+ </color>
+ </line_color>
<background_color>
<color name="RED-GROUP-BACKGROUND" red="208" green="175" blue="172">
</color>
</background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
<rules>
<rule name="Background color" prop_id="background_color" out_exp="false">
<exp bool_exp="pvInt0">
@@ -30,6 +34,15 @@
</exp>
<pv_name>$(P):Cabinet_Stat</pv_name>
</rule>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(P):Cabinet_Stat</pv_name>
+ </rule>
</rules>
</widget>
<widget type="action_button" version="3.0.0">
@@ -72,6 +85,21 @@
<width>201</width>
<height>280</height>
<style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <width>201</width>
+ <height>280</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="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ </widget>
<widget type="led" version="2.0.0">
<name>LED_SM_Stat</name>
<pv_name>$(P):SM_Stat</pv_name>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/checksum.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/checksum.bob
new file mode 100644
index 00000000..edba3c0d
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/checksum.bob
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>CHECKSUM</name>
+ <width>368</width>
+ <height>26</height>
+ <widget type="group" version="2.0.0">
+ <name>Group</name>
+ <width>368</width>
+ <height>26</height>
+ <style>3</style>
+ <widget type="textupdate" version="2.0.0">
+ <name>StandardSW_Chksum0</name>
+ <pv_name>$(CHKSUM_DEVICE):StandardSW_Chksum0</pv_name>
+ <x>3</x>
+ <y>3</y>
+ <width>40</width>
+ <format>4</format>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>StandardSW_Chksum1</name>
+ <pv_name>$(CHKSUM_DEVICE):StandardSW_Chksum1</pv_name>
+ <x>49</x>
+ <y>3</y>
+ <width>40</width>
+ <format>4</format>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>StandardSW_Chksum2</name>
+ <pv_name>$(CHKSUM_DEVICE):StandardSW_Chksum2</pv_name>
+ <x>95</x>
+ <y>3</y>
+ <width>40</width>
+ <format>4</format>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>StandardSW_Chksum3</name>
+ <pv_name>$(CHKSUM_DEVICE):StandardSW_Chksum3</pv_name>
+ <x>141</x>
+ <y>3</y>
+ <width>40</width>
+ <format>4</format>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>StandardSW_Chksum4</name>
+ <pv_name>$(CHKSUM_DEVICE):StandardSW_Chksum4</pv_name>
+ <x>187</x>
+ <y>3</y>
+ <width>40</width>
+ <format>4</format>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>StandardSW_Chksum5</name>
+ <pv_name>$(CHKSUM_DEVICE):StandardSW_Chksum5</pv_name>
+ <x>233</x>
+ <y>3</y>
+ <width>40</width>
+ <format>4</format>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>StandardSW_Chksum6</name>
+ <pv_name>$(CHKSUM_DEVICE):StandardSW_Chksum6</pv_name>
+ <x>279</x>
+ <y>3</y>
+ <width>40</width>
+ <format>4</format>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>StandardSW_Chksum7</name>
+ <pv_name>$(CHKSUM_DEVICE):StandardSW_Chksum7</pv_name>
+ <x>325</x>
+ <y>3</y>
+ <width>40</width>
+ <format>4</format>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/epics.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/epics.bob
new file mode 100644
index 00000000..c16867bf
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/epics.bob
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>EPICS</name>
+ <width>370</width>
+ <height>244</height>
+ <widget type="group" version="2.0.0">
+ <name>Software Diagnostics</name>
+ <width>370</width>
+ <height>244</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Title Background</name>
+ <width>370</width>
+ <height>244</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>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>EPICS Communication</name>
+ <text>EPICS Communication</text>
+ <width>370</width>
+ <height>40</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-TEXT" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="RED-BORDER" red="150" green="8" blue="16">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>EPICS</name>
+ <x>10</x>
+ <y>40</y>
+ <width>350</width>
+ <height>194</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Content Background</name>
+ <width>350</width>
+ <height>194</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="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>ModbusConnected</name>
+ <text>ModbusConnected:</text>
+ <x>20</x>
+ <y>10</y>
+ <width>160</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>ModbusConnectedR</name>
+ <pv_name>$(GPLC):ModbusConnectedR</pv_name>
+ <x>186</x>
+ <y>10</y>
+ <width>154</width>
+ <foreground_color>
+ <color name="ORANGE-BORDER" red="153" green="117" blue="49">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>S7Connected</name>
+ <text>S7Connected:</text>
+ <x>20</x>
+ <y>36</y>
+ <width>160</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>S7ConnectedR</name>
+ <pv_name>$(GPLC):S7ConnectedR</pv_name>
+ <x>186</x>
+ <y>36</y>
+ <width>154</width>
+ <foreground_color>
+ <color name="ORANGE-BORDER" red="153" green="117" blue="49">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Alive</name>
+ <text>Alive:</text>
+ <x>20</x>
+ <y>62</y>
+ <width>160</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>AliveR</name>
+ <pv_name>$(GPLC):AliveR</pv_name>
+ <x>186</x>
+ <y>62</y>
+ <width>154</width>
+ <foreground_color>
+ <color name="ORANGE-BORDER" red="153" green="117" blue="49">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>PLC Hash OK</name>
+ <text>PLC Hash OK:</text>
+ <x>20</x>
+ <y>86</y>
+ <width>160</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>PLCHashCorrectR</name>
+ <pv_name>$(GPLC):PLCHashCorrectR</pv_name>
+ <x>186</x>
+ <y>86</y>
+ <width>154</width>
+ <foreground_color>
+ <color name="ORANGE-BORDER" red="153" green="117" blue="49">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>PLC HASH</name>
+ <text>PLC Hash:</text>
+ <x>20</x>
+ <y>112</y>
+ <width>160</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>CommsHashFromPLCR</name>
+ <pv_name>$(GPLC):CommsHashFromPLCR</pv_name>
+ <x>186</x>
+ <y>112</y>
+ <width>154</width>
+ <foreground_color>
+ <color name="ORANGE-BORDER" red="153" green="117" blue="49">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>IOC HASH</name>
+ <text>IOC Hash:</text>
+ <x>20</x>
+ <y>138</y>
+ <width>160</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>iCommsHashToPLC</name>
+ <pv_name>$(GPLC):iCommsHashToPLC</pv_name>
+ <x>186</x>
+ <y>138</y>
+ <width>154</width>
+ <foreground_color>
+ <color name="ORANGE-BORDER" red="153" green="117" blue="49">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Module Version</name>
+ <text>Module Version:</text>
+ <x>20</x>
+ <y>164</y>
+ <width>160</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>ModVersionR</name>
+ <pv_name>$(GPLC):ModVersionR</pv_name>
+ <x>186</x>
+ <y>164</y>
+ <width>154</width>
+ <foreground_color>
+ <color name="ORANGE-BORDER" red="153" green="117" blue="49">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob
new file mode 100644
index 00000000..acbac277
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>PLC Software</name>
+ <width>395</width>
+ <height>182</height>
+ <widget type="group" version="2.0.0">
+ <name>Software Diagnostics</name>
+ <width>395</width>
+ <height>182</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Title Background</name>
+ <width>395</width>
+ <height>182</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>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>PLC Checksums</name>
+ <text>PLC Code Checksums</text>
+ <width>396</width>
+ <height>40</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-TEXT" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="RED-BORDER" red="150" green="8" blue="16">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Checksums</name>
+ <x>10</x>
+ <y>40</y>
+ <width>375</width>
+ <height>132</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <width>375</width>
+ <height>132</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="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Software Checksum</name>
+ <text>Software Checksum:</text>
+ <x>6</x>
+ <y>10</y>
+ <width>174</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Safety F-Signature</name>
+ <text>Safety F-Signature:</text>
+ <x>6</x>
+ <y>56</y>
+ <width>174</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>FSignature</name>
+ <pv_name>$(PLC):SafetySW_FSignature</pv_name>
+ <x>186</x>
+ <y>56</y>
+ <width>154</width>
+ <foreground_color>
+ <color name="ORANGE-BORDER" red="153" green="117" blue="49">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>GW Software Checksum</name>
+ <text>GW Software Checksum:</text>
+ <x>6</x>
+ <y>79</y>
+ <width>174</width>
+ <font>
+ <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>PLC Checksum</name>
+ <macros>
+ <CHKSUM_DEVICE>$(PLC)</CHKSUM_DEVICE>
+ </macros>
+ <file>checksum.bob</file>
+ <x>3</x>
+ <y>30</y>
+ <width>368</width>
+ <height>26</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>GPLC Checksum</name>
+ <macros>
+ <CHKSUM_DEVICE>$(GPLC)</CHKSUM_DEVICE>
+ </macros>
+ <file>checksum.bob</file>
+ <x>3</x>
+ <y>99</y>
+ <width>368</width>
+ <height>26</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/esob.bob b/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
index 33fb1faa..fb062804 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
@@ -26,23 +26,4 @@
<width>22</width>
<height>22</height>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label</name>
- <text>$(ESOS_IDX)</text>
- <x>3</x>
- <y>3</y>
- <width>22</width>
- <height>22</height>
- <visible>false</visible>
- <font>
- <font family="Source Sans Pro" style="BOLD" size="24.0">
- </font>
- </font>
- <foreground_color>
- <color red="255" green="255" blue="255" alpha="218">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob b/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob
new file mode 100644
index 00000000..4cae4195
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob
@@ -0,0 +1,834 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>PSS Operation mode</name>
+ <width>960</width>
+ <height>56</height>
+ <widget type="group" version="2.0.0">
+ <name>Modes</name>
+ <macros>
+ <MODE_ALARM>Alarm Mode</MODE_ALARM>
+ <MODE_BEAM_ON>Beam On</MODE_BEAM_ON>
+ <MODE_OPEN_ACCESS>Open Access</MODE_OPEN_ACCESS>
+ <MODE_RESTRICTED_ACCESS>Restricted\nAccess</MODE_RESTRICTED_ACCESS>
+ <MODE_RM_INTERLOCK>RM Interlock</MODE_RM_INTERLOCK>
+ <MODE_RP_SURVEY>RP Survey</MODE_RP_SURVEY>
+ <MODE_SEARCH>Search</MODE_SEARCH>
+ <MODE_TUNNEL_CLOSED>Tunnel Closed</MODE_TUNNEL_CLOSED>
+ </macros>
+ <x>3</x>
+ <y>3</y>
+ <width>954</width>
+ <height>50</height>
+ <style>3</style>
+ <foreground_color>
+ <color name="Read_Background" red="230" green="235" blue="232">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="Read_Background" red="230" green="235" blue="232">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <widget type="multi_state_led" version="2.0.0">
+ <name>Beam On</name>
+ <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
+ <width>114</width>
+ <height>50</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </foreground_color>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <square>true</square>
+ <rules>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 4">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <states>
+ <state>
+ <value>0</value>
+ <label>$(MODE_BEAM_ON)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>1</value>
+ <label>$(MODE_BEAM_ON)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>2</value>
+ <label>$(MODE_BEAM_ON)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>3</value>
+ <label>$(MODE_BEAM_ON)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>4</value>
+ <label>$(MODE_BEAM_ON)</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>5</value>
+ <label>$(MODE_BEAM_ON)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>6</value>
+ <label>$(MODE_BEAM_ON)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>7</value>
+ <label>$(MODE_BEAM_ON)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ </states>
+ <fallback_label>$(MODE_BEAM_ON)</fallback_label>
+ </widget>
+ <widget type="multi_state_led" version="2.0.0">
+ <name>Search</name>
+ <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
+ <x>120</x>
+ <width>114</width>
+ <height>50</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </foreground_color>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <square>true</square>
+ <rules>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 2">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <states>
+ <state>
+ <value>0</value>
+ <label>Search</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>1</value>
+ <label>Search</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>2</value>
+ <label>Search</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>3</value>
+ <label>Search</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>4</value>
+ <label>Search</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>5</value>
+ <label>Search</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>6</value>
+ <label>Search</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>7</value>
+ <label>Search</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ </states>
+ <fallback_label>Search</fallback_label>
+ </widget>
+ <widget type="multi_state_led" version="2.0.0">
+ <name>RM Interlock</name>
+ <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
+ <x>240</x>
+ <width>114</width>
+ <height>50</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </foreground_color>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <square>true</square>
+ <rules>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 5">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <states>
+ <state>
+ <value>0</value>
+ <label>RM Interlock</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>1</value>
+ <label>RM Interlock</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>2</value>
+ <label>RM Interlock</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>3</value>
+ <label>RM Interlock</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>4</value>
+ <label>RM Interlock</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>5</value>
+ <label>RM Interlock</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>6</value>
+ <label>RM Interlock</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>7</value>
+ <label>RM Interlock</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ </states>
+ <fallback_label>RM Interlock</fallback_label>
+ </widget>
+ <widget type="multi_state_led" version="2.0.0">
+ <name>Open Access</name>
+ <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
+ <x>360</x>
+ <width>114</width>
+ <height>50</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </foreground_color>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <square>true</square>
+ <rules>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <states>
+ <state>
+ <value>0</value>
+ <label>$(MODE_OPEN_ACCESS)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>1</value>
+ <label>$(MODE_OPEN_ACCESS)</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>2</value>
+ <label>$(MODE_OPEN_ACCESS)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>3</value>
+ <label>$(MODE_OPEN_ACCESS)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>4</value>
+ <label>$(MODE_OPEN_ACCESS)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>5</value>
+ <label>$(MODE_OPEN_ACCESS)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>6</value>
+ <label>$(MODE_OPEN_ACCESS)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>7</value>
+ <label>$(MODE_OPEN_ACCESS)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ </states>
+ <fallback_label>$(MODE_OPEN_ACCESS)</fallback_label>
+ </widget>
+ <widget type="multi_state_led" version="2.0.0">
+ <name>Tunnel Closed</name>
+ <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
+ <x>480</x>
+ <width>114</width>
+ <height>50</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </foreground_color>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <square>true</square>
+ <rules>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 3">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <states>
+ <state>
+ <value>0</value>
+ <label>$(MODE_TUNNEL_CLOSED)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>1</value>
+ <label>$(MODE_TUNNEL_CLOSED)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>2</value>
+ <label>$(MODE_TUNNEL_CLOSED)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>3</value>
+ <label>$(MODE_TUNNEL_CLOSED)</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>4</value>
+ <label>$(MODE_TUNNEL_CLOSED)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>5</value>
+ <label>$(MODE_TUNNEL_CLOSED)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>6</value>
+ <label>$(MODE_TUNNEL_CLOSED)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>7</value>
+ <label>$(MODE_TUNNEL_CLOSED)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ </states>
+ <fallback_label>$(MODE_TUNNEL_CLOSED)</fallback_label>
+ </widget>
+ <widget type="multi_state_led" version="2.0.0">
+ <name>Alarm Mode</name>
+ <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
+ <x>600</x>
+ <width>114</width>
+ <height>50</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </foreground_color>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <square>true</square>
+ <rules>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 0">
+ <value>
+ <color name="RED" red="252" green="13" blue="27">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ <rule name="Font color" prop_id="foreground_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 0">
+ <value>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <states>
+ <state>
+ <value>0</value>
+ <label>$(MODE_ALARM)</label>
+ <color>
+ <color name="RED-BORDER" red="150" green="8" blue="16">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>1</value>
+ <label>$(MODE_ALARM)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>2</value>
+ <label>$(MODE_ALARM)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>3</value>
+ <label>$(MODE_ALARM)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>4</value>
+ <label>$(MODE_ALARM)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>5</value>
+ <label>$(MODE_ALARM)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>6</value>
+ <label>$(MODE_ALARM)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>7</value>
+ <label>$(MODE_ALARM)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ </states>
+ <fallback_label>$(MODE_ALARM)</fallback_label>
+ </widget>
+ <widget type="multi_state_led" version="2.0.0">
+ <name>RP Survey</name>
+ <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
+ <x>720</x>
+ <width>114</width>
+ <height>50</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </foreground_color>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <square>true</square>
+ <rules>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 6">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <states>
+ <state>
+ <value>0</value>
+ <label>$(MODE_RP_SURVEY)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>1</value>
+ <label>$(MODE_RP_SURVEY)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>2</value>
+ <label>$(MODE_RP_SURVEY)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>3</value>
+ <label>$(MODE_RP_SURVEY)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>4</value>
+ <label>$(MODE_RP_SURVEY)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>5</value>
+ <label>$(MODE_RP_SURVEY)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>6</value>
+ <label>$(MODE_RP_SURVEY)</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>7</value>
+ <label>$(MODE_RP_SURVEY)</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ </states>
+ <fallback_label>$(MODE_RP_SURVEY)</fallback_label>
+ </widget>
+ <widget type="multi_state_led" version="2.0.0">
+ <name>Restricted Access</name>
+ <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
+ <x>840</x>
+ <width>114</width>
+ <height>50</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </foreground_color>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <square>true</square>
+ <rules>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 7">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <states>
+ <state>
+ <value>0</value>
+ <label>Restricted
+Access</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>1</value>
+ <label>Restricted
+Access</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>2</value>
+ <label>Restricted
+Access</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>3</value>
+ <label>Restricted
+Access</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>4</value>
+ <label>Restricted
+Access</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>5</value>
+ <label>Restricted
+Access</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>6</value>
+ <label>Restricted
+Access</label>
+ <color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>7</value>
+ <label>Restricted
+Access</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ </states>
+ <fallback_label>Restricted
+Access</fallback_label>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/rad.bob b/NON-APPROVED/pss1-pss/embedded_displays/rad.bob
index 66e08abd..616d89f5 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/rad.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/rad.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>Radiation Monitor</name>
<macros>
- <RAD_STAT_PV>=`$(P):LvlOK` * `$(P):MonitorOK`</RAD_STAT_PV>
+ <RAD_STAT_PV>$(P):Stat</RAD_STAT_PV>
</macros>
<width>30</width>
<height>30</height>
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
index 3c775b3b..3d1f6ea7 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
@@ -2,30 +2,30 @@
<display version="2.0.0">
<name>PSS1 PSS PLC Cabinet Diagnostics</name>
<macros>
+ <EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
<P>FEB-010Row:CnPw-U-001</P>
<PLC>FEB-090:PSS-PLC-1</PLC>
- <EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
<PLC_SYMBOLS>../../symbols/plc</PLC_SYMBOLS>
+ <POPUP_DIAG>popups/diagnostics</POPUP_DIAG>
</macros>
- <width>1550</width>
- <height>980</height>
+ <width>1500</width>
+ <height>1006</height>
<widget type="rectangle" version="2.0.0">
- <name>Rectangle Template</name>
- <width>1550</width>
- <height>50</height>
- <line_width>0</line_width>
- <line_color>
- <color name="IO Line" red="0" green="32" blue="92">
- </color>
- </line_color>
- <background_color>
+ <name>Title Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>1500</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
<color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
</color>
</background_color>
</widget>
<widget type="label" version="2.0.0">
- <name>Label</name>
+ <name>Title</name>
<class>TITLE</class>
<text>PSS1 PSS PLC Cabinet Diagnostics</text>
<x use_class="true">20</x>
@@ -45,421 +45,39 @@
<vertical_alignment use_class="true">1</vertical_alignment>
<wrap_words use_class="true">false</wrap_words>
</widget>
- <widget type="group" version="2.0.0">
- <name>Software Diagnostics</name>
+ <widget type="embedded" version="2.0.0">
+ <name>EPICS</name>
+ <file>$(EMBEDDED_DIAG)//epics.bob</file>
<x>20</x>
- <y>70</y>
+ <y>60</y>
<width>370</width>
- <height>396</height>
- <style>3</style>
+ <height>244</height>
+ <resize>2</resize>
<transparent>true</transparent>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey03-background_5</name>
- <width>370</width>
- <height>396</height>
- <line_width>0</line_width>
- <background_color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>EPICS Communication</name>
- <text>EPICS Communication</text>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>EPICS</name>
- <x>10</x>
- <y>40</y>
- <width>350</width>
- <height>194</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>ModbusConnected</name>
- <text>ModbusConnected:</text>
- <x>20</x>
- <y>10</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModbusConnectedR</name>
- <pv_name>$(GPLC):ModbusConnectedR</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>S7Connected</name>
- <text>S7Connected:</text>
- <x>20</x>
- <y>36</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>S7ConnectedR</name>
- <pv_name>$(GPLC):S7ConnectedR</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Alive</name>
- <text>Alive:</text>
- <x>20</x>
- <y>62</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>AliveR</name>
- <pv_name>$(GPLC):AliveR</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Hash OK</name>
- <text>PLC Hash OK:</text>
- <x>20</x>
- <y>86</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>PLCHashCorrectR</name>
- <pv_name>$(GPLC):PLCHashCorrectR</pv_name>
- <x>186</x>
- <y>86</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC HASH</name>
- <text>PLC Hash:</text>
- <x>20</x>
- <y>112</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>CommsHashFromPLCR</name>
- <pv_name>$(GPLC):CommsHashFromPLCR</pv_name>
- <x>186</x>
- <y>112</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>IOC HASH</name>
- <text>IOC Hash:</text>
- <x>20</x>
- <y>138</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>iCommsHashToPLC</name>
- <pv_name>$(GPLC):iCommsHashToPLC</pv_name>
- <x>186</x>
- <y>138</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Module Version</name>
- <text>Module Version:</text>
- <x>20</x>
- <y>164</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModVersionR</name>
- <pv_name>$(GPLC):ModVersionR</pv_name>
- <x>186</x>
- <y>164</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Checksums</name>
- <text>PLC Code Checksums</text>
- <y>254</y>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>Checksums</name>
- <x>10</x>
- <y>294</y>
- <width>349</width>
- <height>92</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>Software Checksum</name>
- <text>Software Checksum:</text>
- <x>6</x>
- <y>10</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>SW_Checksum</name>
- <pv_name>$(PLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Safety F-Signature</name>
- <text>Safety F-Signature:</text>
- <x>6</x>
- <y>36</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>FSignature</name>
- <pv_name>$(PLC):SafetySW_FSignature</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>GW Software Checksum</name>
- <text>GW Software Checksum:</text>
- <x>6</x>
- <y>62</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>GPLC-SW_Checksum</name>
- <pv_name>$(GPLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
</widget>
- <widget type="polygon" version="2.0.0">
- <name>F Wire</name>
- <x>440</x>
- <y>400</y>
- <width>873</width>
- <height>1</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="873.0" y="0.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
+ <widget type="embedded" version="2.0.0">
+ <name>PLC Software</name>
+ <file>$(EMBEDDED_DIAG)/plc_software.bob</file>
+ <x>20</x>
+ <y>314</y>
+ <width>395</width>
+ <height>182</height>
+ <resize>2</resize>
</widget>
<widget type="polyline" version="2.0.0">
<name>GCPU-CPU Wire</name>
- <x>530</x>
+ <x>520</x>
<y>325</y>
- <width>250</width>
+ <width>220</width>
<height>40</height>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="40.0">
</point>
- <point x="250.0" y="40.0">
+ <point x="220.0" y="40.0">
</point>
- <point x="250.0" y="0.0">
+ <point x="220.0" y="0.0">
</point>
</points>
<line_color>
@@ -515,6 +133,46 @@ widget.setPropertyValue('tooltip', tooltip + """
</scripts>
<tooltip>N/A</tooltip>
</widget>
+ <widget type="polyline" version="2.0.0">
+ <name>F Wire</name>
+ <x>780</x>
+ <y>325</y>
+ <width>365</width>
+ <height>75</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="75.0">
+ </point>
+ <point x="364.99999999999994" y="75.0">
+ </point>
+ <point x="365.0" y="0.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>F Wire 2</name>
+ <x>1145</x>
+ <y>325</y>
+ <width>240</width>
+ <height>75</height>
+ <points>
+ <point x="0.0" y="75.0">
+ </point>
+ <point x="239.99999999999991" y="75.0">
+ </point>
+ <point x="239.99999999999997" y="0.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </line_color>
+ </widget>
<widget type="group" version="2.0.0">
<name>GCPU</name>
<x>450</x>
@@ -559,26 +217,9 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
</widget>
</widget>
- <widget type="polygon" version="2.0.0">
- <name>CPU Wire</name>
- <x>803</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- </widget>
<widget type="group" version="2.0.0">
<name>CPU</name>
- <x>722</x>
+ <x>700</x>
<y>60</y>
<width>162</width>
<height>270</height>
@@ -619,30 +260,26 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
</widget>
</widget>
- <widget type="polygon" version="2.0.0">
+ <widget type="polyline" version="2.0.0">
<name>Switch Wire</name>
- <x>1054</x>
+ <x>970</x>
<y>325</y>
<width>1</width>
- <height>75</height>
+ <height>179</height>
<points>
<point x="0.0" y="0.0">
</point>
- <point x="0.0" y="75.0">
+ <point x="0.0" y="178.99999999999997">
</point>
</points>
<line_color>
<color name="GREEN-BORDER" red="40" green="140" blue="40">
</color>
</line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
</widget>
<widget type="group" version="2.0.0">
<name>Switch</name>
- <x>994</x>
+ <x>890</x>
<y>60</y>
<width>120</width>
<height>270</height>
@@ -668,31 +305,27 @@ widget.setPropertyValue('tooltip', tooltip + """
<width>120</width>
<height>230</height>
</widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>HMI Wire</name>
- <x>1313</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
+ <widget type="symbol" version="2.0.0">
+ <name>SCL_Stat</name>
+ <pv_name>FEB-010Row:CnPw-U-001:SCL_Stat</pv_name>
+ <symbols>
+ <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/error.svg</symbol>
+ </symbols>
+ <x>48</x>
+ <y>126</y>
+ <width>24</width>
+ <height>24</height>
+ <scripts>
+ <script file="$(EMBEDDED_DIAG)/diag_conn_stat.py" check_connections="false">
+ <pv_name>$(pv_name)</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
</widget>
<widget type="group" version="2.0.0">
<name>HMI</name>
- <x>1208</x>
+ <x>1040</x>
<y>60</y>
<width>210</width>
<height>270</height>
@@ -719,10 +352,10 @@ widget.setPropertyValue('tooltip', tooltip + """
<wrap_words>false</wrap_words>
</widget>
<widget type="symbol" version="2.0.0">
- <name>Disconnected</name>
+ <name>HMI_ConnStat</name>
<pv_name>$(PLC):HMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected@32.png</symbol>
+ <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
@@ -736,26 +369,85 @@ widget.setPropertyValue('tooltip', tooltip + """
<tooltip>N/A</tooltip>
</widget>
</widget>
- <widget type="polygon" version="2.0.0">
- <name>Remote I/O Wire</name>
- <x>440</x>
- <y>400</y>
- <width>1</width>
- <height>140</height>
+ <widget type="group" version="2.0.0">
+ <name>PAS HMI</name>
+ <x>1280</x>
+ <y>60</y>
+ <width>210</width>
+ <height>270</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="picture" version="2.0.0">
+ <name>PAS HMI</name>
+ <file>$(PLC_SYMBOLS)/HMI.png</file>
+ <y>40</y>
+ <width>210</width>
+ <height>230</height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title</name>
+ <text>PAS HMI</text>
+ <width>210</width>
+ <height>40</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>PASHMI_ConnStat</name>
+ <pv_name>$(PLC):PASHMI_ConnStat</pv_name>
+ <symbols>
+ <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ </symbols>
+ <x>89</x>
+ <y>93</y>
+ <width>24</width>
+ <height>24</height>
+ <scripts>
+ <script file="$(EMBEDDED_DIAG)/diag_conn_stat.py" check_connections="false">
+ <pv_name>$(pv_name)</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>RIO Wire</name>
+ <x>340</x>
+ <y>506</y>
+ <width>632</width>
+ <height>75</height>
<points>
+ <point x="0.0" y="75.0">
+ </point>
<point x="0.0" y="0.0">
</point>
- <point x="0.0" y="140.0">
+ <point x="632.0" y="0.0">
</point>
</points>
<line_color>
<color name="GREEN-BORDER" red="40" green="140" blue="40">
</color>
</line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>PSS1 PSS $(CABINET) Cabinet</name>
+ <macros>
+ <BOB>$(POPUP_DIAG)/PLC_cabinet_diagnostics.bob</BOB>
+ <CABINET>PLC</CABINET>
+ <P>FEB-010Row:CnPw-U-001</P>
+ <RIO>0</RIO>
+ </macros>
+ <file>$(EMBEDDED_DIAG)/PLC_cabinet.bob</file>
+ <x>20</x>
+ <y>531</y>
+ <width>260</width>
+ <height>465</height>
+ <resize>2</resize>
</widget>
<widget type="group" version="2.0.0">
<name>Remote I/O</name>
@@ -763,14 +455,14 @@ widget.setPropertyValue('tooltip', tooltip + """
<DIAG_CONN_STAT>$(P):$(MOD)_ConnStat</DIAG_CONN_STAT>
<DIAG_STAT>$(P):$(MOD)_Stat</DIAG_STAT>
</macros>
- <x>400</x>
- <y>450</y>
+ <x>300</x>
+ <y>531</y>
<width>1113</width>
<height>390</height>
<style>3</style>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
- <name>Title</name>
+ <name>Title_1</name>
<text>Remote I/O</text>
<width>1113</width>
<height>40</height>
@@ -1076,17 +768,4 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
</widget>
</widget>
- <widget type="embedded" version="2.0.0">
- <name>PSS1 PSS $(CABINET) Cabinet</name>
- <macros>
- <CABINET>PLC</CABINET>
- <P>FEB-010Row:CnPw-U-001</P>
- </macros>
- <file>$(EMBEDDED_DIAG)/PLC_cabinet.bob</file>
- <x>20</x>
- <y>505</y>
- <width>260</width>
- <height>465</height>
- <resize>2</resize>
- </widget>
</display>
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob
index a57e2e8f..82477850 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob
@@ -2,34 +2,33 @@
<display version="2.0.0">
<name>PSS1 PSS $(CABINET) Cabinet Diagnostics</name>
<macros>
+ <EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
<PLC>FEB-090:PSS-PLC-1</PLC>
- <EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
<PLC_SYMBOLS>../../symbols/plc</PLC_SYMBOLS>
</macros>
- <width>1550</width>
- <height>850</height>
+ <width>1433</width>
+ <height>470</height>
<widget type="rectangle" version="2.0.0">
- <name>Rectangle Template</name>
- <width>1550</width>
- <height>50</height>
- <line_width>0</line_width>
- <line_color>
- <color name="IO Line" red="0" green="32" blue="92">
- </color>
- </line_color>
- <background_color>
+ <name>Title Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>1423</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
<color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
</color>
</background_color>
</widget>
<widget type="label" version="2.0.0">
- <name>Label</name>
+ <name>Title</name>
<class>TITLE</class>
<text>PSS1 PSS $(CABINET) Cabinet Diagnostics</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>550</width>
+ <width>1000</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -44,717 +43,15 @@
<vertical_alignment use_class="true">1</vertical_alignment>
<wrap_words use_class="true">false</wrap_words>
</widget>
- <widget type="group" version="2.0.0">
- <name>Software Diagnostics</name>
+ <widget type="embedded" version="2.0.0">
+ <name>PSS1 PSS $(CABINET) Cabinet</name>
+ <file>$(EMBEDDED_DIAG)/cabinet.bob</file>
<x>20</x>
<y>70</y>
- <width>370</width>
- <height>386</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey03-background_5</name>
- <width>370</width>
- <height>386</height>
- <line_width>0</line_width>
- <background_color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>EPICS Communication</name>
- <text>EPICS Communication</text>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>EPICS</name>
- <x>10</x>
- <y>40</y>
- <width>350</width>
- <height>194</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>ModbusConnected</name>
- <text>ModbusConnected:</text>
- <x>20</x>
- <y>10</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModbusConnectedR</name>
- <pv_name>$(GPLC):ModbusConnectedR</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>S7Connected</name>
- <text>S7Connected:</text>
- <x>20</x>
- <y>36</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>S7ConnectedR</name>
- <pv_name>$(GPLC):S7ConnectedR</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Alive</name>
- <text>Alive:</text>
- <x>20</x>
- <y>62</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>AliveR</name>
- <pv_name>$(GPLC):AliveR</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Hash OK</name>
- <text>PLC Hash OK:</text>
- <x>20</x>
- <y>86</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>PLCHashCorrectR</name>
- <pv_name>$(GPLC):PLCHashCorrectR</pv_name>
- <x>186</x>
- <y>86</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC HASH</name>
- <text>PLC Hash:</text>
- <x>20</x>
- <y>112</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>CommsHashFromPLCR</name>
- <pv_name>$(GPLC):CommsHashFromPLCR</pv_name>
- <x>186</x>
- <y>112</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>IOC HASH</name>
- <text>IOC Hash:</text>
- <x>20</x>
- <y>138</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>iCommsHashToPLC</name>
- <pv_name>$(GPLC):iCommsHashToPLC</pv_name>
- <x>186</x>
- <y>138</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Module Version</name>
- <text>Module Version:</text>
- <x>20</x>
- <y>164</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModVersionR</name>
- <pv_name>$(GPLC):ModVersionR</pv_name>
- <x>186</x>
- <y>164</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Checksums</name>
- <text>PLC Code Checksums</text>
- <y>244</y>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>Checksums</name>
- <x>10</x>
- <y>284</y>
- <width>349</width>
- <height>92</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>Software Checksum</name>
- <text>Software Checksum:</text>
- <x>6</x>
- <y>10</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>SW_Checksum</name>
- <pv_name>$(PLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Safety F-Signature</name>
- <text>Safety F-Signature:</text>
- <x>6</x>
- <y>36</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>FSignature</name>
- <pv_name>$(PLC):SafetySW_FSignature</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>GW Software Checksum</name>
- <text>GW Software Checksum:</text>
- <x>6</x>
- <y>62</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>GPLC-SW_Checksum</name>
- <pv_name>$(GPLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>F Wire</name>
- <x>440</x>
- <y>400</y>
- <width>873</width>
- <height>1</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="873.0" y="0.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>GCPU-CPU Wire</name>
- <x>530</x>
- <y>325</y>
- <width>250</width>
- <height>40</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="40.0">
- </point>
- <point x="250.0" y="40.0">
- </point>
- <point x="250.0" y="0.0">
- </point>
- </points>
- <line_color>
- <color name="DISCONNECTED" red="105" green="77" blue="164">
- </color>
- </line_color>
- <line_style>1</line_style>
- <scripts>
- <script file="EmbeddedPy" check_connections="false">
- <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-from org.csstudio.display.builder.model.persist import WidgetColorService
-
-line_style = 1 # dashed
-
-pvSevStr = "N/A"
-pvStatStr = "N/A"
-pvIntStr = "null"
-pvTime = ""
-
-try:
- pvSev = PVUtil.getSeverity(pvs[0])
- pvSevStr = PVUtil.getSeverityString(pvs[0])
- pvStatStr = PVUtil.getStatus(pvs[0])
-
- pvInt = PVUtil.getLong(pvs[0])
- pvIntStr = PVUtil.getString(pvs[0])
-
- pvTime = PVUtil.getTimeString(pvs[0])
-
-
- if pvSev == 3: # INVALID
- raise RuntimeError
-
- if pvInt == True and pvSev == 0:
- line_style = 0 # solid
- line_color = WidgetColorService.getColor("GREEN-BORDER")
- tooltip = "Healthy connection between Gateway and Process PLC"
- else:
- line_color = WidgetColorService.getColor("ERROR")
- tooltip = "NO connection between Gateway and Process PLC"
-except:
- line_color = WidgetColorService.getColor("DISCONNECTED")
- tooltip = "Unknown connection status between Gateway and Process PLC"
-
-widget.setPropertyValue('line_color', line_color)
-widget.setPropertyValue('line_style', line_style)
-widget.setPropertyValue('tooltip', tooltip + """
-{}
-{}, {} - {}, {}""".format(str(pvs[0]), pvIntStr, pvSevStr, pvStatStr, pvTime))]]></text>
- <pv_name>$(PLC):GCPU_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="group" version="2.0.0">
- <name>GCPU</name>
- <x>450</x>
- <y>60</y>
- <width>162</width>
- <height>270</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>Gateway CPU</text>
- <width>162</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>GCPU</name>
- <file>$(PLC_SYMBOLS)/GCPU.png</file>
- <y>40</y>
- <width>162</width>
- <height>230</height>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>Diag</name>
- <macros>
- <DIAG_CONN_STAT>$(GPLC):CPU_ConnStat</DIAG_CONN_STAT>
- <DIAG_STAT>$(GPLC):CPU_Stat</DIAG_STAT>
- </macros>
- <file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
- <x>67</x>
- <y>83</y>
- <width>30</width>
- <height>70</height>
- <visible>false</visible>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>CPU Wire</name>
- <x>803</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- </widget>
- <widget type="group" version="2.0.0">
- <name>CPU</name>
- <x>722</x>
- <y>60</y>
- <width>162</width>
- <height>270</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>CPU</text>
- <width>162</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>CPU</name>
- <file>$(PLC_SYMBOLS)/CPU.png</file>
- <y>40</y>
- <width>162</width>
- <height>230</height>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>Diag</name>
- <macros>
- <DIAG_CONN_STAT>$(PLC):CPU_ConnStat</DIAG_CONN_STAT>
- <DIAG_STAT>$(PLC):CPU_Stat</DIAG_STAT>
- </macros>
- <file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
- <x>67</x>
- <y>83</y>
- <width>30</width>
- <height>70</height>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>Switch Wire</name>
- <x>1054</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
- </widget>
- <widget type="group" version="2.0.0">
- <name>Switch</name>
- <x>994</x>
- <y>60</y>
- <width>120</width>
- <height>270</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>Scalance</text>
- <width>120</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>Switch</name>
- <file>$(PLC_SYMBOLS)/Switch.png</file>
- <y>40</y>
- <width>120</width>
- <height>230</height>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>HMI Wire</name>
- <x>1313</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
- </widget>
- <widget type="group" version="2.0.0">
- <name>HMI</name>
- <x>1208</x>
- <y>60</y>
- <width>210</width>
- <height>270</height>
- <style>3</style>
+ <width>221</width>
+ <height>345</height>
+ <resize>2</resize>
<transparent>true</transparent>
- <widget type="picture" version="2.0.0">
- <name>HMI</name>
- <file>$(PLC_SYMBOLS)/HMI.png</file>
- <y>40</y>
- <width>210</width>
- <height>230</height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>HMI</text>
- <width>210</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="symbol" version="2.0.0">
- <name>Disconnected</name>
- <pv_name>$(PLC):HMI_ConnStat</pv_name>
- <symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected@32.png</symbol>
- </symbols>
- <x>89</x>
- <y>93</y>
- <width>24</width>
- <height>24</height>
- <scripts>
- <script file="$(EMBEDDED_DIAG)/diag_conn_stat.py" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>Remote I/O Wire</name>
- <x>440</x>
- <y>400</y>
- <width>1</width>
- <height>140</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="140.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
</widget>
<widget type="group" version="2.0.0">
<name>Remote I/O</name>
@@ -762,8 +59,8 @@ widget.setPropertyValue('tooltip', tooltip + """
<DIAG_CONN_STAT>$(P):$(MOD)_ConnStat</DIAG_CONN_STAT>
<DIAG_STAT>$(P):$(MOD)_Stat</DIAG_STAT>
</macros>
- <x>400</x>
- <y>450</y>
+ <x>300</x>
+ <y>70</y>
<width>1113</width>
<height>390</height>
<style>3</style>
@@ -1075,13 +372,4 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
</widget>
</widget>
- <widget type="embedded" version="2.0.0">
- <name>PSS1 PSS $(CABINET) Cabinet</name>
- <file>$(EMBEDDED_DIAG)/cabinet.bob</file>
- <x>20</x>
- <y>505</y>
- <width>221</width>
- <height>330</height>
- <resize>2</resize>
- </widget>
</display>
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob
index 662db49a..5b658192 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob
@@ -3,34 +3,33 @@
<name>PSS1 PSS $(CABINET) Cabinet Diagnostics</name>
<macros>
<CABINET>RIO4</CABINET>
+ <EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
<PLC>FEB-090:PSS-PLC-1</PLC>
- <EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
<PLC_SYMBOLS>../../symbols/plc</PLC_SYMBOLS>
</macros>
- <width>1550</width>
- <height>850</height>
+ <width>648</width>
+ <height>461</height>
<widget type="rectangle" version="2.0.0">
- <name>Rectangle Template</name>
- <width>1550</width>
- <height>50</height>
- <line_width>0</line_width>
- <line_color>
- <color name="IO Line" red="0" green="32" blue="92">
- </color>
- </line_color>
- <background_color>
+ <name>Title Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>648</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
<color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
</color>
</background_color>
</widget>
<widget type="label" version="2.0.0">
- <name>Label</name>
+ <name>Title</name>
<class>TITLE</class>
<text>PSS1 PSS $(CABINET) Cabinet Diagnostics</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>550</width>
+ <width>628</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -45,717 +44,15 @@
<vertical_alignment use_class="true">1</vertical_alignment>
<wrap_words use_class="true">false</wrap_words>
</widget>
- <widget type="group" version="2.0.0">
- <name>Software Diagnostics</name>
+ <widget type="embedded" version="2.0.0">
+ <name>PSS1 PSS $(CABINET) Cabinet</name>
+ <file>$(EMBEDDED_DIAG)/RIO4_cabinet.bob</file>
<x>20</x>
<y>70</y>
- <width>370</width>
- <height>386</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey03-background_5</name>
- <width>370</width>
- <height>386</height>
- <line_width>0</line_width>
- <background_color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>EPICS Communication</name>
- <text>EPICS Communication</text>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>EPICS</name>
- <x>10</x>
- <y>40</y>
- <width>350</width>
- <height>194</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>ModbusConnected</name>
- <text>ModbusConnected:</text>
- <x>20</x>
- <y>10</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModbusConnectedR</name>
- <pv_name>$(GPLC):ModbusConnectedR</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>S7Connected</name>
- <text>S7Connected:</text>
- <x>20</x>
- <y>36</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>S7ConnectedR</name>
- <pv_name>$(GPLC):S7ConnectedR</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Alive</name>
- <text>Alive:</text>
- <x>20</x>
- <y>62</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>AliveR</name>
- <pv_name>$(GPLC):AliveR</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Hash OK</name>
- <text>PLC Hash OK:</text>
- <x>20</x>
- <y>86</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>PLCHashCorrectR</name>
- <pv_name>$(GPLC):PLCHashCorrectR</pv_name>
- <x>186</x>
- <y>86</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC HASH</name>
- <text>PLC Hash:</text>
- <x>20</x>
- <y>112</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>CommsHashFromPLCR</name>
- <pv_name>$(GPLC):CommsHashFromPLCR</pv_name>
- <x>186</x>
- <y>112</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>IOC HASH</name>
- <text>IOC Hash:</text>
- <x>20</x>
- <y>138</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>iCommsHashToPLC</name>
- <pv_name>$(GPLC):iCommsHashToPLC</pv_name>
- <x>186</x>
- <y>138</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Module Version</name>
- <text>Module Version:</text>
- <x>20</x>
- <y>164</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModVersionR</name>
- <pv_name>$(GPLC):ModVersionR</pv_name>
- <x>186</x>
- <y>164</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Checksums</name>
- <text>PLC Code Checksums</text>
- <y>244</y>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>Checksums</name>
- <x>10</x>
- <y>284</y>
- <width>349</width>
- <height>92</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>Software Checksum</name>
- <text>Software Checksum:</text>
- <x>6</x>
- <y>10</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>SW_Checksum</name>
- <pv_name>$(PLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Safety F-Signature</name>
- <text>Safety F-Signature:</text>
- <x>6</x>
- <y>36</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>FSignature</name>
- <pv_name>$(PLC):SafetySW_FSignature</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>GW Software Checksum</name>
- <text>GW Software Checksum:</text>
- <x>6</x>
- <y>62</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>GPLC-SW_Checksum</name>
- <pv_name>$(GPLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>F Wire</name>
- <x>440</x>
- <y>400</y>
- <width>873</width>
- <height>1</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="873.0" y="0.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>GCPU-CPU Wire</name>
- <x>530</x>
- <y>325</y>
- <width>250</width>
- <height>40</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="40.0">
- </point>
- <point x="250.0" y="40.0">
- </point>
- <point x="250.0" y="0.0">
- </point>
- </points>
- <line_color>
- <color name="DISCONNECTED" red="105" green="77" blue="164">
- </color>
- </line_color>
- <line_style>1</line_style>
- <scripts>
- <script file="EmbeddedPy" check_connections="false">
- <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-from org.csstudio.display.builder.model.persist import WidgetColorService
-
-line_style = 1 # dashed
-
-pvSevStr = "N/A"
-pvStatStr = "N/A"
-pvIntStr = "null"
-pvTime = ""
-
-try:
- pvSev = PVUtil.getSeverity(pvs[0])
- pvSevStr = PVUtil.getSeverityString(pvs[0])
- pvStatStr = PVUtil.getStatus(pvs[0])
-
- pvInt = PVUtil.getLong(pvs[0])
- pvIntStr = PVUtil.getString(pvs[0])
-
- pvTime = PVUtil.getTimeString(pvs[0])
-
-
- if pvSev == 3: # INVALID
- raise RuntimeError
-
- if pvInt == True and pvSev == 0:
- line_style = 0 # solid
- line_color = WidgetColorService.getColor("GREEN-BORDER")
- tooltip = "Healthy connection between Gateway and Process PLC"
- else:
- line_color = WidgetColorService.getColor("ERROR")
- tooltip = "NO connection between Gateway and Process PLC"
-except:
- line_color = WidgetColorService.getColor("DISCONNECTED")
- tooltip = "Unknown connection status between Gateway and Process PLC"
-
-widget.setPropertyValue('line_color', line_color)
-widget.setPropertyValue('line_style', line_style)
-widget.setPropertyValue('tooltip', tooltip + """
-{}
-{}, {} - {}, {}""".format(str(pvs[0]), pvIntStr, pvSevStr, pvStatStr, pvTime))]]></text>
- <pv_name>$(PLC):GCPU_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="group" version="2.0.0">
- <name>GCPU</name>
- <x>450</x>
- <y>60</y>
- <width>162</width>
- <height>270</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>Gateway CPU</text>
- <width>162</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>GCPU</name>
- <file>$(PLC_SYMBOLS)/GCPU.png</file>
- <y>40</y>
- <width>162</width>
- <height>230</height>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>Diag</name>
- <macros>
- <DIAG_CONN_STAT>$(GPLC):CPU_ConnStat</DIAG_CONN_STAT>
- <DIAG_STAT>$(GPLC):CPU_Stat</DIAG_STAT>
- </macros>
- <file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
- <x>67</x>
- <y>83</y>
- <width>30</width>
- <height>70</height>
- <visible>false</visible>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>CPU Wire</name>
- <x>803</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- </widget>
- <widget type="group" version="2.0.0">
- <name>CPU</name>
- <x>722</x>
- <y>60</y>
- <width>162</width>
- <height>270</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>CPU</text>
- <width>162</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>CPU</name>
- <file>$(PLC_SYMBOLS)/CPU.png</file>
- <y>40</y>
- <width>162</width>
- <height>230</height>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>Diag</name>
- <macros>
- <DIAG_CONN_STAT>$(PLC):CPU_ConnStat</DIAG_CONN_STAT>
- <DIAG_STAT>$(PLC):CPU_Stat</DIAG_STAT>
- </macros>
- <file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
- <x>67</x>
- <y>83</y>
- <width>30</width>
- <height>70</height>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>Switch Wire</name>
- <x>1054</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
- </widget>
- <widget type="group" version="2.0.0">
- <name>Switch</name>
- <x>994</x>
- <y>60</y>
- <width>120</width>
- <height>270</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>Scalance</text>
- <width>120</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>Switch</name>
- <file>$(PLC_SYMBOLS)/Switch.png</file>
- <y>40</y>
- <width>120</width>
- <height>230</height>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>HMI Wire</name>
- <x>1313</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
- </widget>
- <widget type="group" version="2.0.0">
- <name>HMI</name>
- <x>1208</x>
- <y>60</y>
- <width>210</width>
- <height>270</height>
- <style>3</style>
+ <width>221</width>
+ <height>255</height>
+ <resize>2</resize>
<transparent>true</transparent>
- <widget type="picture" version="2.0.0">
- <name>HMI</name>
- <file>$(PLC_SYMBOLS)/HMI.png</file>
- <y>40</y>
- <width>210</width>
- <height>230</height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>HMI</text>
- <width>210</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="symbol" version="2.0.0">
- <name>Disconnected</name>
- <pv_name>$(PLC):HMI_ConnStat</pv_name>
- <symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected@32.png</symbol>
- </symbols>
- <x>89</x>
- <y>93</y>
- <width>24</width>
- <height>24</height>
- <scripts>
- <script file="$(EMBEDDED_DIAG)/diag_conn_stat.py" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>Remote I/O Wire</name>
- <x>440</x>
- <y>400</y>
- <width>1</width>
- <height>140</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="140.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
</widget>
<widget type="group" version="2.0.0">
<name>Remote I/O</name>
@@ -763,8 +60,8 @@ widget.setPropertyValue('tooltip', tooltip + """
<DIAG_CONN_STAT>$(P):$(MOD)_ConnStat</DIAG_CONN_STAT>
<DIAG_STAT>$(P):$(MOD)_Stat</DIAG_STAT>
</macros>
- <x>400</x>
- <y>450</y>
+ <x>300</x>
+ <y>70</y>
<width>338</width>
<height>381</height>
<style>3</style>
@@ -855,13 +152,4 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
</widget>
</widget>
- <widget type="embedded" version="2.0.0">
- <name>PSS1 PSS $(CABINET) Cabinet</name>
- <file>$(EMBEDDED_DIAG)/RIO4_cabinet.bob</file>
- <x>20</x>
- <y>505</y>
- <width>221</width>
- <height>240</height>
- <resize>2</resize>
- </widget>
</display>
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob
index d19785fd..1a0dd7fe 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob
@@ -3,29 +3,28 @@
<name>PSS1 PSS $(CABINET) Cabinet Diagnostics</name>
<macros>
<CABINET>RIO5</CABINET>
+ <EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
<PLC>FEB-090:PSS-PLC-1</PLC>
- <EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
<PLC_SYMBOLS>../../symbols/plc</PLC_SYMBOLS>
</macros>
- <width>1550</width>
- <height>920</height>
+ <width>1376</width>
+ <height>485</height>
<widget type="rectangle" version="2.0.0">
- <name>Rectangle Template</name>
- <width>1550</width>
- <height>50</height>
- <line_width>0</line_width>
- <line_color>
- <color name="IO Line" red="0" green="32" blue="92">
- </color>
- </line_color>
- <background_color>
+ <name>Title Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>1376</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
<color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
</color>
</background_color>
</widget>
<widget type="label" version="2.0.0">
- <name>Label</name>
+ <name>Title</name>
<class>TITLE</class>
<text>PSS1 PSS $(CABINET) Cabinet Diagnostics</text>
<x use_class="true">20</x>
@@ -45,717 +44,15 @@
<vertical_alignment use_class="true">1</vertical_alignment>
<wrap_words use_class="true">false</wrap_words>
</widget>
- <widget type="group" version="2.0.0">
- <name>Software Diagnostics</name>
+ <widget type="embedded" version="2.0.0">
+ <name>PSS1 PSS $(CABINET) Cabinet</name>
+ <file>$(EMBEDDED_DIAG)/RIO5_cabinet.bob</file>
<x>20</x>
<y>70</y>
- <width>370</width>
- <height>386</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey03-background_5</name>
- <width>370</width>
- <height>386</height>
- <line_width>0</line_width>
- <background_color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>EPICS Communication</name>
- <text>EPICS Communication</text>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>EPICS</name>
- <x>10</x>
- <y>40</y>
- <width>350</width>
- <height>194</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>ModbusConnected</name>
- <text>ModbusConnected:</text>
- <x>20</x>
- <y>10</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModbusConnectedR</name>
- <pv_name>$(GPLC):ModbusConnectedR</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>S7Connected</name>
- <text>S7Connected:</text>
- <x>20</x>
- <y>36</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>S7ConnectedR</name>
- <pv_name>$(GPLC):S7ConnectedR</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Alive</name>
- <text>Alive:</text>
- <x>20</x>
- <y>62</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>AliveR</name>
- <pv_name>$(GPLC):AliveR</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Hash OK</name>
- <text>PLC Hash OK:</text>
- <x>20</x>
- <y>86</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>PLCHashCorrectR</name>
- <pv_name>$(GPLC):PLCHashCorrectR</pv_name>
- <x>186</x>
- <y>86</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC HASH</name>
- <text>PLC Hash:</text>
- <x>20</x>
- <y>112</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>CommsHashFromPLCR</name>
- <pv_name>$(GPLC):CommsHashFromPLCR</pv_name>
- <x>186</x>
- <y>112</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>IOC HASH</name>
- <text>IOC Hash:</text>
- <x>20</x>
- <y>138</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>iCommsHashToPLC</name>
- <pv_name>$(GPLC):iCommsHashToPLC</pv_name>
- <x>186</x>
- <y>138</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Module Version</name>
- <text>Module Version:</text>
- <x>20</x>
- <y>164</y>
- <width>160</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>ModVersionR</name>
- <pv_name>$(GPLC):ModVersionR</pv_name>
- <x>186</x>
- <y>164</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
- <widget type="label" version="2.0.0">
- <name>PLC Checksums</name>
- <text>PLC Code Checksums</text>
- <y>244</y>
- <width>370</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="group" version="2.0.0">
- <name>Checksums</name>
- <x>10</x>
- <y>284</y>
- <width>349</width>
- <height>92</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>Software Checksum</name>
- <text>Software Checksum:</text>
- <x>6</x>
- <y>10</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>SW_Checksum</name>
- <pv_name>$(PLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>10</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Safety F-Signature</name>
- <text>Safety F-Signature:</text>
- <x>6</x>
- <y>36</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>FSignature</name>
- <pv_name>$(PLC):SafetySW_FSignature</pv_name>
- <x>186</x>
- <y>36</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>GW Software Checksum</name>
- <text>GW Software Checksum:</text>
- <x>6</x>
- <y>62</y>
- <width>174</width>
- <font>
- <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color name="PRIMARY-DARK" red="31" green="83" blue="102">
- </color>
- </foreground_color>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>GPLC-SW_Checksum</name>
- <pv_name>$(GPLC):StandardSW_Chksum</pv_name>
- <x>186</x>
- <y>62</y>
- <width>154</width>
- <foreground_color>
- <color name="ORANGE-BORDER" red="153" green="117" blue="49">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>F Wire</name>
- <x>440</x>
- <y>400</y>
- <width>873</width>
- <height>1</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="873.0" y="0.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>GCPU-CPU Wire</name>
- <x>530</x>
- <y>325</y>
- <width>250</width>
- <height>40</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="40.0">
- </point>
- <point x="250.0" y="40.0">
- </point>
- <point x="250.0" y="0.0">
- </point>
- </points>
- <line_color>
- <color name="DISCONNECTED" red="105" green="77" blue="164">
- </color>
- </line_color>
- <line_style>1</line_style>
- <scripts>
- <script file="EmbeddedPy" check_connections="false">
- <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-from org.csstudio.display.builder.model.persist import WidgetColorService
-
-line_style = 1 # dashed
-
-pvSevStr = "N/A"
-pvStatStr = "N/A"
-pvIntStr = "null"
-pvTime = ""
-
-try:
- pvSev = PVUtil.getSeverity(pvs[0])
- pvSevStr = PVUtil.getSeverityString(pvs[0])
- pvStatStr = PVUtil.getStatus(pvs[0])
-
- pvInt = PVUtil.getLong(pvs[0])
- pvIntStr = PVUtil.getString(pvs[0])
-
- pvTime = PVUtil.getTimeString(pvs[0])
-
-
- if pvSev == 3: # INVALID
- raise RuntimeError
-
- if pvInt == True and pvSev == 0:
- line_style = 0 # solid
- line_color = WidgetColorService.getColor("GREEN-BORDER")
- tooltip = "Healthy connection between Gateway and Process PLC"
- else:
- line_color = WidgetColorService.getColor("ERROR")
- tooltip = "NO connection between Gateway and Process PLC"
-except:
- line_color = WidgetColorService.getColor("DISCONNECTED")
- tooltip = "Unknown connection status between Gateway and Process PLC"
-
-widget.setPropertyValue('line_color', line_color)
-widget.setPropertyValue('line_style', line_style)
-widget.setPropertyValue('tooltip', tooltip + """
-{}
-{}, {} - {}, {}""".format(str(pvs[0]), pvIntStr, pvSevStr, pvStatStr, pvTime))]]></text>
- <pv_name>$(PLC):GCPU_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="group" version="2.0.0">
- <name>GCPU</name>
- <x>450</x>
- <y>60</y>
- <width>162</width>
- <height>270</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>Gateway CPU</text>
- <width>162</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>GCPU</name>
- <file>$(PLC_SYMBOLS)/GCPU.png</file>
- <y>40</y>
- <width>162</width>
- <height>230</height>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>Diag</name>
- <macros>
- <DIAG_CONN_STAT>$(GPLC):CPU_ConnStat</DIAG_CONN_STAT>
- <DIAG_STAT>$(GPLC):CPU_Stat</DIAG_STAT>
- </macros>
- <file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
- <x>67</x>
- <y>83</y>
- <width>30</width>
- <height>70</height>
- <visible>false</visible>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>CPU Wire</name>
- <x>803</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- </widget>
- <widget type="group" version="2.0.0">
- <name>CPU</name>
- <x>722</x>
- <y>60</y>
- <width>162</width>
- <height>270</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>CPU</text>
- <width>162</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>CPU</name>
- <file>$(PLC_SYMBOLS)/CPU.png</file>
- <y>40</y>
- <width>162</width>
- <height>230</height>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>Diag</name>
- <macros>
- <DIAG_CONN_STAT>$(PLC):CPU_ConnStat</DIAG_CONN_STAT>
- <DIAG_STAT>$(PLC):CPU_Stat</DIAG_STAT>
- </macros>
- <file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
- <x>67</x>
- <y>83</y>
- <width>30</width>
- <height>70</height>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>Switch Wire</name>
- <x>1054</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
- </widget>
- <widget type="group" version="2.0.0">
- <name>Switch</name>
- <x>994</x>
- <y>60</y>
- <width>120</width>
- <height>270</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>Scalance</text>
- <width>120</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>Switch</name>
- <file>$(PLC_SYMBOLS)/Switch.png</file>
- <y>40</y>
- <width>120</width>
- <height>230</height>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>HMI Wire</name>
- <x>1313</x>
- <y>325</y>
- <width>1</width>
- <height>75</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="75.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
- </widget>
- <widget type="group" version="2.0.0">
- <name>HMI</name>
- <x>1208</x>
- <y>60</y>
- <width>210</width>
- <height>270</height>
- <style>3</style>
+ <width>221</width>
+ <height>405</height>
+ <resize>2</resize>
<transparent>true</transparent>
- <widget type="picture" version="2.0.0">
- <name>HMI</name>
- <file>$(PLC_SYMBOLS)/HMI.png</file>
- <y>40</y>
- <width>210</width>
- <height>230</height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Title</name>
- <text>HMI</text>
- <width>210</width>
- <height>40</height>
- <font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="symbol" version="2.0.0">
- <name>Disconnected</name>
- <pv_name>$(PLC):HMI_ConnStat</pv_name>
- <symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected@32.png</symbol>
- </symbols>
- <x>89</x>
- <y>93</y>
- <width>24</width>
- <height>24</height>
- <scripts>
- <script file="$(EMBEDDED_DIAG)/diag_conn_stat.py" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- </widget>
- <widget type="polygon" version="2.0.0">
- <name>Remote I/O Wire</name>
- <x>440</x>
- <y>400</y>
- <width>1</width>
- <height>140</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="140.0">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- <background_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </background_color>
</widget>
<widget type="group" version="2.0.0">
<name>Remote I/O</name>
@@ -763,8 +60,8 @@ widget.setPropertyValue('tooltip', tooltip + """
<DIAG_CONN_STAT>$(P):$(MOD)_ConnStat</DIAG_CONN_STAT>
<DIAG_STAT>$(P):$(MOD)_Stat</DIAG_STAT>
</macros>
- <x>400</x>
- <y>450</y>
+ <x>300</x>
+ <y>70</y>
<width>1066</width>
<height>385</height>
<style>3</style>
@@ -1063,13 +360,4 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
</widget>
</widget>
- <widget type="embedded" version="2.0.0">
- <name>PSS1 PSS $(CABINET) Cabinet</name>
- <file>$(EMBEDDED_DIAG)/RIO5_cabinet.bob</file>
- <x>20</x>
- <y>505</y>
- <width>221</width>
- <height>405</height>
- <resize>2</resize>
- </widget>
</display>
diff --git a/NON-APPROVED/pss1-pss/popups/key_exchange.bob b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
new file mode 100644
index 00000000..35214b99
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
@@ -0,0 +1,1489 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>PSS1 Key Exchange</name>
+ <width>980</width>
+ <height>835</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Title Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>980</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
+ <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title</name>
+ <class>TITLE</class>
+ <text>PSS1 Key Exchange</text>
+ <x use_class="true">20</x>
+ <y use_class="true">0</y>
+ <width>500</width>
+ <height use_class="true">50</height>
+ <font use_class="true">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+ </font>
+ </font>
+ <foreground_color use_class="true">
+ <color name="HEADER-TEXT" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment use_class="true">0</horizontal_alignment>
+ <vertical_alignment use_class="true">1</vertical_alignment>
+ <wrap_words use_class="true">false</wrap_words>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Operation Mode</name>
+ <file>../embedded_displays/operation_mode.bob</file>
+ <x>10</x>
+ <y>60</y>
+ <width>960</width>
+ <height>56</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Legend</name>
+ <x>10</x>
+ <y>275</y>
+ <width>290</width>
+ <height>300</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <width>290</width>
+ <height>300</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>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title</name>
+ <class>GROUP-TITLE</class>
+ <text>Legend</text>
+ <width>290</width>
+ <height use_class="true">30</height>
+ <font use_class="true">
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color use_class="true">
+ <color name="GROUP-TEXT" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
+ <horizontal_alignment use_class="true">1</horizontal_alignment>
+ <vertical_alignment use_class="true">1</vertical_alignment>
+ <wrap_words use_class="true">false</wrap_words>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Content Group</name>
+ <x>10</x>
+ <y>40</y>
+ <width>270</width>
+ <height>250</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Content Rectangle</name>
+ <width>270</width>
+ <height>250</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="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Mech interlock symbol</name>
+ <x>10</x>
+ <y>10</y>
+ <width>80</width>
+ <height>50</height>
+ <points>
+ <point x="0.0" y="25.0">
+ </point>
+ <point x="80.0" y="25.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Mech interlock label</name>
+ <text>The connected slots are mechanically interlocked</text>
+ <x>100</x>
+ <y>10</y>
+ <width>160</width>
+ <height>50</height>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Same key connection symbol</name>
+ <x>10</x>
+ <y>70</y>
+ <width>80</width>
+ <height>50</height>
+ <points>
+ <point x="0.0" y="25.0">
+ </point>
+ <point x="80.0" y="25.0">
+ </point>
+ </points>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Same key connection label</name>
+ <text>The connected slots can be selected by the same key</text>
+ <x>100</x>
+ <y>70</y>
+ <width>160</width>
+ <height>50</height>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="picture" version="2.0.0">
+ <name>Locked symbol</name>
+ <file>../symbols/Key/lock.svg</file>
+ <x>10</x>
+ <y>130</y>
+ <width>80</width>
+ <height>30</height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Locked label</name>
+ <text>Keys locked with solenoid</text>
+ <x>100</x>
+ <y>130</y>
+ <width>160</width>
+ <height>30</height>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>Home symbol</name>
+ <x>10</x>
+ <y>170</y>
+ <width>30</width>
+ <height>30</height>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Slash</name>
+ <text>/</text>
+ <x>40</x>
+ <y>170</y>
+ <width>20</width>
+ <height>30</height>
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>Other symbol</name>
+ <x>60</x>
+ <y>170</y>
+ <width>30</width>
+ <height>30</height>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </on_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Home - other label</name>
+ <text>Home / Other position</text>
+ <x>100</x>
+ <y>170</y>
+ <width>160</width>
+ <height>30</height>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ON circle symbol</name>
+ <x>10</x>
+ <y>210</y>
+ <width>30</width>
+ <height>30</height>
+ <off_color>
+ <color name="On" red="70" green="255" blue="70">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>ON slash</name>
+ <text>/</text>
+ <x>40</x>
+ <y>210</y>
+ <width>20</width>
+ <height>30</height>
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ON square symbol</name>
+ <x>60</x>
+ <y>210</y>
+ <width>30</width>
+ <height>30</height>
+ <off_color>
+ <color name="On" red="70" green="255" blue="70">
+ </color>
+ </off_color>
+ <square>true</square>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>ON label</name>
+ <text>Key inserted in position ON</text>
+ <x>100</x>
+ <y>210</y>
+ <width>160</width>
+ <height>30</height>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Key Exchange</name>
+ <x>310</x>
+ <y>130</y>
+ <width>660</width>
+ <height>695</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="polyline" version="2.0.0">
+ <name>RP Line</name>
+ <x>10</x>
+ <y>320</y>
+ <width>70</width>
+ <height>30</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="30.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>RA Line</name>
+ <x>100</x>
+ <y>320</y>
+ <width>135</width>
+ <height>215</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="215.0">
+ </point>
+ <point x="135.0" y="215.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line 1</name>
+ <x>225</x>
+ <y>70</y>
+ <width>270</width>
+ <height>280</height>
+ <points>
+ <point x="0.0" y="280.0">
+ </point>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="269.99999999999994" y="0.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Main key</name>
+ <x>30</x>
+ <width>240</width>
+ <height>115</height>
+ <style>3</style>
+ <background_color>
+ <color name="GRAY" red="169" green="169" blue="169">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>Main Key</name>
+ <class>HEADER3</class>
+ <text>Main Key</text>
+ <width>230</width>
+ <height>25</height>
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Dashed Line</name>
+ <x>60</x>
+ <y>50</y>
+ <width>120</width>
+ <height>40</height>
+ <points>
+ <point x="0.0" y="20.0">
+ </point>
+ <point x="119.99999999999999" y="20.0">
+ </point>
+ </points>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line Down</name>
+ <x>170</x>
+ <y>85</y>
+ <width>50</width>
+ <height>30</height>
+ <points>
+ <point x="25.0" y="0.0">
+ </point>
+ <point x="25.0" y="30.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line Right</name>
+ <x>215</x>
+ <y>50</y>
+ <width>25</width>
+ <height>40</height>
+ <points>
+ <point x="0.0" y="20.0">
+ </point>
+ <point x="25.0" y="20.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>MainKeySlot1</name>
+ <pv_name>FEB-020Row:CnPw-U-005:MainKeySlot1</pv_name>
+ <x>10</x>
+ <y>35</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>ON</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>ON</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>MainKeySlot2</name>
+ <pv_name>FEB-020Row:CnPw-U-005:MainKeySlot2</pv_name>
+ <x>160</x>
+ <y>35</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>OFF</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>OFF</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <square>true</square>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>MainKeyLocked</name>
+ <pv_name>FEB-020Row:CnPw-U-005:MainKeyLocked</pv_name>
+ <symbols>
+ <symbol>../symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>203</x>
+ <y>80</y>
+ <width>30</width>
+ <height>30</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Shield configuration</name>
+ <x>490</x>
+ <width>170</width>
+ <height>460</height>
+ <style>3</style>
+ <background_color>
+ <color name="GRAY" red="169" green="169" blue="169">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>Shield Configuration</name>
+ <class>HEADER3</class>
+ <text>Shield Configuration</text>
+ <width>170</width>
+ <height>25</height>
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>SC Line</name>
+ <x>50</x>
+ <y>70</y>
+ <width>70</width>
+ <height>355</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="355.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line Left</name>
+ <y>35</y>
+ <width>55</width>
+ <height>70</height>
+ <points>
+ <point x="0.0" y="35.0">
+ </point>
+ <point x="55.0" y="35.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ShieldConfigKeyMain</name>
+ <pv_name>FEB-020Row:CnPw-U-005:ShieldConfigKeyMain</pv_name>
+ <x>50</x>
+ <y>35</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Config.
+Management
+key</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Config.
+Management
+key</on_label>
+ <font>
+ <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ </font>
+ </font>
+ <tooltip>Config. Management key
+$(pv_name)
+$(pv_value)</tooltip>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ShieldConfigKeyMode</name>
+ <pv_name>FEB-020Row:CnPw-U-005:ShieldConfigKeyMode</pv_name>
+ <x>50</x>
+ <y>140</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Shielding
+Config.
+Management</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Shielding
+Config.
+Management</on_label>
+ <font>
+ <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ </font>
+ </font>
+ <tooltip>Shielding Config. Management
+$(pv_name)
+$(pv_value)</tooltip>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>TSWKey</name>
+ <pv_name>FEB-020Row:CnPw-U-005:TSWKey</pv_name>
+ <x>50</x>
+ <y>220</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Temporary
+Shielding wall
+key</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Temporary
+Shielding wall
+key</on_label>
+ <font>
+ <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ </font>
+ </font>
+ <tooltip>Temporary Shielding wall Key
+$(pv_name)
+$(pv_value)</tooltip>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>SpareKey1</name>
+ <pv_name>FEB-020Row:CnPw-U-005:SpareKey1</pv_name>
+ <x>50</x>
+ <y>300</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Spare
+key</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Spare
+key</on_label>
+ <font>
+ <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ </font>
+ </font>
+ <tooltip>Spare key
+$(pv_name)
+$(pv_value)</tooltip>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>SpareKey2</name>
+ <pv_name>FEB-020Row:CnPw-U-005:SpareKey2</pv_name>
+ <x>50</x>
+ <y>380</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Spare
+key</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Spare
+key</on_label>
+ <font>
+ <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ </font>
+ </font>
+ <tooltip>Spare key
+$(pv_name)
+$(pv_value)</tooltip>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Mode selection key</name>
+ <y>125</y>
+ <width>360</width>
+ <style>3</style>
+ <background_color>
+ <color name="GRAY" red="169" green="169" blue="169">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>Mode Selection Key</name>
+ <class>HEADER3</class>
+ <text>Mode Selection Key</text>
+ <width>200</width>
+ <height>25</height>
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line Mode</name>
+ <x>190</x>
+ <width>70</width>
+ <height>30</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="30.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Dashed Line 1</name>
+ <x>10</x>
+ <y>110</y>
+ <width>340</width>
+ <height>40</height>
+ <points>
+ <point x="35.0" y="40.0">
+ </point>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="125.0" y="0.0">
+ </point>
+ <point x="125.0" y="40.0">
+ </point>
+ </points>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Dashed Line 2</name>
+ <x>10</x>
+ <y>80</y>
+ <width>340</width>
+ <height>70</height>
+ <points>
+ <point x="215.0" y="0.0">
+ </point>
+ <point x="215.0" y="70.0">
+ </point>
+ </points>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Dashed Line 3</name>
+ <x>10</x>
+ <y>110</y>
+ <width>340</width>
+ <height>40</height>
+ <points>
+ <point x="125.0" y="0.0">
+ </point>
+ <point x="305.0" y="0.0">
+ </point>
+ <point x="305.0" y="40.0">
+ </point>
+ </points>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line RP</name>
+ <x>10</x>
+ <y>185</y>
+ <width>70</width>
+ <height>15</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="15.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line RA</name>
+ <x>100</x>
+ <y>185</y>
+ <width>70</width>
+ <height>15</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="15.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line Search</name>
+ <x>190</x>
+ <y>185</y>
+ <width>70</width>
+ <height>15</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="15.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ModeKeyHome</name>
+ <pv_name>FEB-020Row:CnPw-U-005:ModeKeyHome</pv_name>
+ <x>190</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Mode
+Key</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Mode
+Key</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ModeKeyRPM</name>
+ <pv_name>FEB-020Row:CnPw-U-005:ModeKeyRPM</pv_name>
+ <x>10</x>
+ <y>140</y>
+ <width>70</width>
+ <height>50</height>
+ <off_label>RP
+Survey</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>RP
+Survey</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <square>true</square>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ModeKeyRAM</name>
+ <pv_name>FEB-020Row:CnPw-U-005:ModeKeyRAM</pv_name>
+ <x>100</x>
+ <y>140</y>
+ <width>70</width>
+ <height>50</height>
+ <off_label>Restricted
+Access</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Restricted
+Access</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <square>true</square>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ModeKeySM</name>
+ <pv_name>FEB-020Row:CnPw-U-005:ModeKeySM</pv_name>
+ <x>190</x>
+ <y>140</y>
+ <width>70</width>
+ <height>50</height>
+ <off_label>Search</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Search</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <square>true</square>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ModeKeyOAM</name>
+ <pv_name>FEB-020Row:CnPw-U-005:ModeKeyOAM</pv_name>
+ <x>280</x>
+ <y>140</y>
+ <width>70</width>
+ <height>50</height>
+ <off_label>Open
+Access</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Open
+Access</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <square>true</square>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Entry key unlock</name>
+ <y>345</y>
+ <width>360</width>
+ <height>120</height>
+ <style>3</style>
+ <background_color>
+ <color name="GRAY" red="169" green="169" blue="169">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>Entry Key Unlock</name>
+ <class>HEADER3</class>
+ <text>Entry Key Unlock</text>
+ <width>360</width>
+ <height>25</height>
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Dashed Line 1</name>
+ <x>10</x>
+ <y>80</y>
+ <width>250</width>
+ <height>30</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="25.0">
+ </point>
+ <point x="215.0" y="25.0">
+ </point>
+ <point x="215.0" y="0.0">
+ </point>
+ </points>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line RP</name>
+ <x>10</x>
+ <width>70</width>
+ <height>30</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="30.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line RA</name>
+ <x>100</x>
+ <width>70</width>
+ <height>30</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="30.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line Search</name>
+ <x>190</x>
+ <width>70</width>
+ <height>30</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="30.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Dashed Line RA</name>
+ <x>100</x>
+ <y>85</y>
+ <width>70</width>
+ <height>35</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="35.0">
+ </point>
+ </points>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>RPKey</name>
+ <pv_name>FEB-020Row:CnPw-U-005:RPKey</pv_name>
+ <x>10</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>RP
+Key</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>RP
+Key</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>RAKey</name>
+ <pv_name>FEB-020Row:CnPw-U-005:RAKey</pv_name>
+ <x>100</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>RA
+Key</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>RA
+Key</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>SMKey</name>
+ <pv_name>FEB-020Row:CnPw-U-005:SMKey</pv_name>
+ <x>190</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Search
+Key</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Search
+Key</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>FEB PAS</name>
+ <x>90</x>
+ <y>465</y>
+ <width>90</width>
+ <height>115</height>
+ <style>3</style>
+ <background_color>
+ <color name="GRAY" red="169" green="169" blue="169">
+ </color>
+ </background_color>
+ <widget type="polyline" version="2.0.0">
+ <name>Dashed Line</name>
+ <x>10</x>
+ <width>70</width>
+ <height>40</height>
+ <points>
+ <point x="35.0" y="0.0">
+ </point>
+ <point x="35.0" y="40.0">
+ </point>
+ </points>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line Right</name>
+ <x>75</x>
+ <y>35</y>
+ <width>15</width>
+ <height>70</height>
+ <points>
+ <point x="0.0" y="35.0">
+ </point>
+ <point x="15.0" y="35.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>FEBKeySlot</name>
+ <pv_name>FEB-090:PSS-PAS-1:FEBKeySlot</pv_name>
+ <x>10</x>
+ <y>35</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>FEB
+PAS</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>FEB
+PAS</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <square>true</square>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Entry keys</name>
+ <x>200</x>
+ <y>475</y>
+ <width>360</width>
+ <height>105</height>
+ <style>3</style>
+ <background_color>
+ <color name="GRAY" red="169" green="169" blue="169">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>Entry Keys</name>
+ <class>HEADER3</class>
+ <text>Entry Keys</text>
+ <width>360</width>
+ <height>25</height>
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line</name>
+ <y>25</y>
+ <width>340</width>
+ <height>70</height>
+ <points>
+ <point x="0.0" y="35.0">
+ </point>
+ <point x="305.0" y="35.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>EntryKey1</name>
+ <pv_name>FEB-090:PSS-PAS-1:EntryKey1</pv_name>
+ <x>10</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Entry key
+1</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Entry key
+1</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>EntryKey1Locked</name>
+ <pv_name>FEB-090:PSS-PAS-1:EntryKey1Locked</pv_name>
+ <symbols>
+ <symbol>../symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>55</x>
+ <y>70</y>
+ <width>30</width>
+ <height>30</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>EntryKey2</name>
+ <pv_name>FEB-090:PSS-PAS-1:EntryKey2</pv_name>
+ <x>100</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Entry key
+2</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Entry key
+2</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>EntryKey2Locked</name>
+ <pv_name>FEB-090:PSS-PAS-1:EntryKey2Locked</pv_name>
+ <symbols>
+ <symbol>../symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>145</x>
+ <y>70</y>
+ <width>30</width>
+ <height>30</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>EntryKey3</name>
+ <pv_name>FEB-090:PSS-PAS-1:EntryKey3</pv_name>
+ <x>190</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Entry key
+3</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Entry key
+3</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>EntryKey4</name>
+ <pv_name>FEB-090:PSS-PAS-1:EntryKey4</pv_name>
+ <x>280</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Entry key
+4</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Entry key
+4</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>EntryKey3Locked</name>
+ <pv_name>FEB-090:PSS-PAS-1:EntryKey3Locked</pv_name>
+ <symbols>
+ <symbol>../symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>235</x>
+ <y>70</y>
+ <width>30</width>
+ <height>30</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>EntryKey1Locked_3</name>
+ <pv_name>FEB-090:PSS-PAS-1:EntryKey1Locked</pv_name>
+ <symbols>
+ <symbol>../symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>325</x>
+ <y>70</y>
+ <width>30</width>
+ <height>30</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Access veto key</name>
+ <x>200</x>
+ <y>590</y>
+ <width>210</width>
+ <height>105</height>
+ <style>3</style>
+ <background_color>
+ <color name="GRAY" red="169" green="169" blue="169">
+ </color>
+ </background_color>
+ <widget type="label" version="2.0.0">
+ <name>Access Veto Key</name>
+ <class>HEADER3</class>
+ <text>Access Veto Key</text>
+ <width>210</width>
+ <height>25</height>
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Line</name>
+ <x>10</x>
+ <y>25</y>
+ <width>190</width>
+ <height>70</height>
+ <points>
+ <point x="35.0" y="35.0">
+ </point>
+ <point x="155.0" y="35.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>RAVKey</name>
+ <pv_name>FEB-020Row:CnPw-U-005:RAVKey</pv_name>
+ <x>10</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Release
+Access
+Veto</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Release
+Access
+Veto</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ <square>true</square>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>AVKey</name>
+ <pv_name>FEB-020Row:CnPw-U-005:AVKey</pv_name>
+ <x>130</x>
+ <y>25</y>
+ <width>70</width>
+ <height>70</height>
+ <off_label>Access
+Veto</off_label>
+ <off_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </off_color>
+ <on_label>Access
+Veto</on_label>
+ <font>
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+ </font>
+ </font>
+ </widget>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/dtl2_dtl3.bob b/NON-APPROVED/pss1-pss/popups/permits/dtl2_dtl3.bob
index c8a64d47..1011a6a4 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/dtl2_dtl3.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/dtl2_dtl3.bob
@@ -107,10 +107,14 @@
<pv_name>KG-NCG:PSS-ICC-2:DTL2DTL3_ActuatorsEnergised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL2DTL3_ActuatorsEnergised</name>
- <text>Actuators energised</text>
+ <text>Contactors closed</text>
<x>46</x>
<y>20</y>
<width>230</width>
@@ -254,6 +258,10 @@
<pv_name>KG-NCG:PSS-LLRRB-6:DTL2_LLRF_Energised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL2_LLRF_Energised</name>
@@ -290,6 +298,10 @@
<pv_name>KG-NCG:PSS-LLRRB-7:DTL3_LLRF_Energised</pv_name>
<x>20</x>
<y>100</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL3_LLRF_Energised</name>
@@ -393,6 +405,10 @@
<pv_name>KG-NCG:PSS-Area-1:DTL2DTL3isolationConfirmed</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL2DTL3isolationConfirmed</name>
@@ -404,7 +420,6 @@
</widget>
<widget type="led" version="2.0.0">
<name>DTL2DTL3_fbkErrorLLRF_DTL2_1</name>
- <pv_name>KG-NCG:PSS-LLRRB-6:DTL2DTL3_fbkErrorLLRF_DTL2</pv_name>
<x>20</x>
<y>60</y>
<visible>false</visible>
@@ -428,7 +443,6 @@
</widget>
<widget type="led" version="2.0.0">
<name>DTL3_LLRF_Energised_1</name>
- <pv_name>KG-NCG:PSS-LLRRB-7:DTL3_LLRF_Energised</pv_name>
<x>20</x>
<y>100</y>
<visible>false</visible>
@@ -444,7 +458,6 @@
</widget>
<widget type="led" version="2.0.0">
<name>DTL2DTL3_fbkErrorLLRF_DTL3_1</name>
- <pv_name>KG-NCG:PSS-LLRRB-7:DTL2DTL3_fbkErrorLLRF_DTL3</pv_name>
<x>20</x>
<y>140</y>
<visible>false</visible>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/dtl4.bob b/NON-APPROVED/pss1-pss/popups/permits/dtl4.bob
index aa7baaba..6a6f1fd0 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/dtl4.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/dtl4.bob
@@ -107,10 +107,14 @@
<pv_name>KG-NCG:PSS-ICC-3:DTL4_ActuatorsEnergised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL4_ActuatorsEnergised</name>
- <text>Actuators energised</text>
+ <text>Contactors closed</text>
<x>46</x>
<y>20</y>
<width>230</width>
@@ -161,7 +165,7 @@
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
- <name>DT4_fbkErrorC2</name>
+ <name>DTL4_fbkErrorC2</name>
<pv_name>KG-NCG:PSS-ICC-3:DTL4_fbkErrorC2</pv_name>
<x>20</x>
<y>140</y>
@@ -254,6 +258,10 @@
<pv_name>KG-NCG:PSS-LLRRB-8:DTL4_LLRF_Energised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL4_LLRF_Energised</name>
@@ -357,6 +365,10 @@
<pv_name>KG-NCG:PSS-Area-1:DTL4isolationConfirmed</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL4isolationConfirmed</name>
@@ -368,7 +380,6 @@
</widget>
<widget type="led" version="2.0.0">
<name>DTL2DTL3_fbkErrorLLRF_DTL2_1</name>
- <pv_name>KG-NCG:PSS-LLRRB-6:DTL2DTL3_fbkErrorLLRF_DTL2</pv_name>
<x>20</x>
<y>60</y>
<visible>false</visible>
@@ -392,7 +403,6 @@
</widget>
<widget type="led" version="2.0.0">
<name>DTL3_LLRF_Energised_1</name>
- <pv_name>KG-NCG:PSS-LLRRB-7:DTL3_LLRF_Energised</pv_name>
<x>20</x>
<y>100</y>
<visible>false</visible>
@@ -408,7 +418,6 @@
</widget>
<widget type="led" version="2.0.0">
<name>DTL2DTL3_fbkErrorLLRF_DTL3_1</name>
- <pv_name>KG-NCG:PSS-LLRRB-7:DTL2DTL3_fbkErrorLLRF_DTL3</pv_name>
<x>20</x>
<y>140</y>
<visible>false</visible>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
index c4ad0ddc..147a75dc 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
@@ -107,6 +107,10 @@
<pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_Grly_ConnectedToGround</name>
@@ -232,10 +236,14 @@
<pv_name>FEB-010Row:CnPw-U-007:ISrcHVPS_ActuatorsEnergised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_ISrcHVPS_ActuatorsEnergised</name>
- <text>Actuators energised</text>
+ <text>Contactors closed</text>
<x>46</x>
<y>20</y>
<width>230</width>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/isrc_magnetron.bob b/NON-APPROVED/pss1-pss/popups/permits/isrc_magnetron.bob
index 89b2ca75..95a524f7 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/isrc_magnetron.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/isrc_magnetron.bob
@@ -108,10 +108,14 @@
<pv_name>AccPSS-Z0:PSS-RIO-4:ISrcMagPS_ActuatorsEnergised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_ISrcMagPS_ActuatorsEnergised</name>
- <text>Actuators Energised</text>
+ <text>Contactors closed</text>
<x>46</x>
<y>20</y>
<width>210</width>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob b/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob
index 77293ff1..0306c22a 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob
@@ -107,10 +107,14 @@
<pv_name>KG-NCG:PSS-ICC-4:MEBT1_ActuatorsEnergised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_MEBT1_ActuatorsEnergised</name>
- <text>Actuators energised</text>
+ <text>Contactors closed</text>
<x>46</x>
<y>20</y>
<width>230</width>
@@ -232,6 +236,10 @@
<pv_name>KG-NCG:PSS-LLRRB-2:MEBT1_LLRF_Energised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_MEBT1_LLRF_Energised</name>
@@ -335,6 +343,10 @@
<pv_name>TBD</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL2DTL3isolationConfirmed</name>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob b/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob
index 6bf85f1b..18be2001 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob
@@ -107,10 +107,14 @@
<pv_name>KG-NCG:PSS-ICC-4:MEBT2_ActuatorsEnergised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_MEBT2_ActuatorsEnergised</name>
- <text>Actuators energised</text>
+ <text>Contactors closed</text>
<x>46</x>
<y>20</y>
<width>230</width>
@@ -232,6 +236,10 @@
<pv_name>KG-NCG:PSS-LLRRB-3:MEBT2_LLRF_Energised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_MEBT2_LLRF_Energised</name>
@@ -335,6 +343,10 @@
<pv_name>TBD</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL2DTL3isolationConfirmed</name>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob b/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob
index 71288f2a..8b5dcf42 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob
@@ -107,10 +107,14 @@
<pv_name>KG-NCG:PSS-ICC-4:MEBT3_ActuatorsEnergised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_MEBT3_ActuatorsEnergised</name>
- <text>Actuators energised</text>
+ <text>Contactors closed</text>
<x>46</x>
<y>20</y>
<width>230</width>
@@ -232,6 +236,10 @@
<pv_name>KG-NCG:PSS-LLRRB-4:MEBT3_LLRF_Energised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_MEBT3_LLRF_Energised</name>
@@ -335,6 +343,10 @@
<pv_name>TBD</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL2DTL3isolationConfirmed</name>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/rfq_dtl1.bob b/NON-APPROVED/pss1-pss/popups/permits/rfq_dtl1.bob
index 2739fc47..23dd14cc 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/rfq_dtl1.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/rfq_dtl1.bob
@@ -107,10 +107,14 @@
<pv_name>KG-NCG:PSS-ICC-1:RFQDTL1_ActuatorsEnergised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_RFQDTL1_ActuatorsEnergised</name>
- <text>Actuators energised</text>
+ <text>Contactors closed</text>
<x>46</x>
<y>20</y>
<width>230</width>
@@ -161,8 +165,8 @@
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
- <name>RFQDTL1_fbkErrorC1</name>
- <pv_name>KG-NCG:PSS-ICC-1:RFQDTL1_fbkErrorC1</pv_name>
+ <name>RFQDTL1_fbkErrorC2</name>
+ <pv_name>KG-NCG:PSS-ICC-1:RFQDTL1_fbkErrorC2</pv_name>
<x>20</x>
<y>140</y>
<off_color>
@@ -175,7 +179,7 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_RFQDTL1_fbkErrorC1</name>
+ <name>LB_RFQDTL1_fbkErrorC2</name>
<text>Feedback error in contactor 2</text>
<x>46</x>
<y>140</y>
@@ -254,6 +258,10 @@
<pv_name>KG-NCG:PSS-LLRRB-1:RFQ_LLRF_Energised</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_RFQ_LLRF_Energised</name>
@@ -290,6 +298,10 @@
<pv_name>KG-NCG:PSS-LLRRB-5:DTL1_LLRF_Energised</pv_name>
<x>20</x>
<y>100</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL1_LLRF_Energised</name>
@@ -393,6 +405,10 @@
<pv_name>KG-NCG:PSS-Area-1:RFQDTL1isolationConfirmed</pv_name>
<x>20</x>
<y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_DTL2DTL3isolationConfirmed</name>
@@ -404,7 +420,6 @@
</widget>
<widget type="led" version="2.0.0">
<name>DTL2DTL3_fbkErrorLLRF_DTL2_1</name>
- <pv_name>KG-NCG:PSS-LLRRB-6:DTL2DTL3_fbkErrorLLRF_DTL2</pv_name>
<x>20</x>
<y>60</y>
<visible>false</visible>
@@ -428,7 +443,6 @@
</widget>
<widget type="led" version="2.0.0">
<name>DTL3_LLRF_Energised_1</name>
- <pv_name>KG-NCG:PSS-LLRRB-7:DTL3_LLRF_Energised</pv_name>
<x>20</x>
<y>100</y>
<visible>false</visible>
@@ -444,7 +458,6 @@
</widget>
<widget type="led" version="2.0.0">
<name>DTL2DTL3_fbkErrorLLRF_DTL3_1</name>
- <pv_name>KG-NCG:PSS-LLRRB-7:DTL2DTL3_fbkErrorLLRF_DTL3</pv_name>
<x>20</x>
<y>140</y>
<visible>false</visible>
diff --git a/NON-APPROVED/pss1-pss/symbols/Key/lock.svg b/NON-APPROVED/pss1-pss/symbols/Key/lock.svg
new file mode 100644
index 00000000..8ed0971e
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/Key/lock.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+<path d="M384,224v-96C384,57.438,326.594,0,256,0c-70.578,0-128,57.438-128,128v96c-35.344,0-64,28.656-64,64v160
+ c0,35.344,28.656,64,64,64h256c35.344,0,64-28.656,64-64V288C448,252.656,419.344,224,384,224z M272,379.094V432
+ c0,8.844-7.156,16-16,16s-16-7.156-16-16v-52.906c-9.391-5.563-16-15.375-16-27.094c0-17.688,14.328-32,32-32s32,14.313,32,32
+ C288,363.719,281.391,373.531,272,379.094z M320,224H192v-96c0-35.313,28.703-64,64-64c35.281,0,64,28.688,64,64V224z"/>
+</svg>
--
GitLab