diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index f4ea0fa9431698fad8d948d87ffd99499ce9b255..eae76495f0ceafa609abf397a0c728313c0617ce 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -454,6 +454,7 @@
<description>Open Diagnostics</description>
</action>
</actions>
+ <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
<x>440</x>
<y>80</y>
<width>150</width>
@@ -466,7 +467,7 @@
</color>
</value>
</exp>
- <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
+ <pv_name>$(pv_name)</pv_name>
</rule>
<rule name="Diagnostics Alarm Foreground" prop_id="foreground_color" out_exp="false">
<exp bool_exp="pvInt0">
@@ -475,7 +476,7 @@
</color>
</value>
</exp>
- <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
+ <pv_name>$(pv_name)</pv_name>
</rule>
<rule name="Diagnostics Alarm Font" prop_id="font" out_exp="false">
<exp bool_exp="pvInt0">
@@ -484,7 +485,7 @@
</font>
</value>
</exp>
- <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
+ <pv_name>$(pv_name)</pv_name>
</rule>
</rules>
<tooltip>$(actions)</tooltip>
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
index aac3935e2922d08d767fe1ddbdce604911f2ec41..bd444db0ad4fbb4195289979dbb90c818f8da625 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
@@ -65,204 +65,15 @@
<height>182</height>
<resize>2</resize>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>GCPU Wire</name>
- <x>520</x>
- <y>325</y>
- <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="220.0" y="40.0">
- </point>
- <point x="220.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="$(WIRE_PY)" check_connections="false">
- <pv_name>$(PLC):GCPU_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>CPU Wire</name>
- <x>777</x>
- <y>320</y>
- <width>180</width>
- <height>85</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="85.0">
- </point>
- <point x="180.0" y="85.0">
- </point>
- <point x="180.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="$(WIRE_PY)" check_connections="false">
- <pv_name>$(PLC):CPU_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>HMI Wire</name>
- <x>980</x>
- <y>325</y>
- <width>165</width>
- <height>70</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="70.0">
- </point>
- <point x="165.0" y="70.0">
- </point>
- <point x="165.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="$(WIRE_PY)" check_connections="false">
- <pv_name>$(PLC):HMI_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>PAS HMI Wire</name>
- <x>972</x>
- <y>325</y>
- <width>410</width>
- <height>80</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="80.0">
- </point>
- <point x="410.0" y="80.0">
- </point>
- <point x="410.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="$(WIRE_PY)" check_connections="false">
- <pv_name>$(PLC):PASHMI_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="group" version="2.0.0">
- <name>GCPU</name>
+ <widget type="embedded" version="2.0.0">
+ <name>Diagnostics overview</name>
+ <file>$(EMBEDDED_DIAG)/system_overview.bob</file>
<x>450</x>
<y>60</y>
- <width>162</width>
- <height>270</height>
- <style>3</style>
+ <width>1040</width>
+ <height>350</height>
+ <resize>2</resize>
<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="group" version="2.0.0">
- <name>CPU</name>
- <x>700</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="polyline" version="2.0.0">
<name>Switch Wire</name>
@@ -281,144 +92,6 @@
</color>
</line_color>
</widget>
- <widget type="group" version="2.0.0">
- <name>Switch</name>
- <x>890</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 type="symbol" version="2.0.0">
- <name>SCL_Stat</name>
- <pv_name>FEB-010Row:CnPw-U-001:SCL_Stat</pv_name>
- <symbols>
- <symbol>$(SYMBOLS)/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>1040</x>
- <y>60</y>
- <width>210</width>
- <height>270</height>
- <style>3</style>
- <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>HMI_ConnStat</name>
- <pv_name>$(PLC):HMI_ConnStat</pv_name>
- <symbols>
- <symbol>$(SYMBOLS)/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="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>$(SYMBOLS)/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>
@@ -478,7 +151,7 @@
</line_color>
<line_style>1</line_style>
<scripts>
- <script file="$(WIRE_PY)">
+ <script file="$(WIRE_PY)" check_connections="false">
<pv_name>FEB-010Row:CnPw-U-002:IM_ConnStat</pv_name>
</script>
</scripts>
@@ -502,7 +175,7 @@
</line_color>
<line_style>1</line_style>
<scripts>
- <script file="$(WIRE_PY)">
+ <script file="$(WIRE_PY)" check_connections="false">
<pv_name>FEB-010Row:CnPw-U-003:IM_ConnStat</pv_name>
</script>
</scripts>
@@ -526,7 +199,7 @@
</line_color>
<line_style>1</line_style>
<scripts>
- <script file="$(WIRE_PY)">
+ <script file="$(WIRE_PY)" check_connections="false">
<pv_name>FEB-010Row:CnPw-U-004:IM_ConnStat</pv_name>
</script>
</scripts>
@@ -550,7 +223,7 @@
</line_color>
<line_style>1</line_style>
<scripts>
- <script file="$(WIRE_PY)">
+ <script file="$(WIRE_PY)" check_connections="false">
<pv_name>AccPSS-Z0:PSS-RIO-4:IM_ConnStat</pv_name>
</script>
</scripts>
@@ -574,7 +247,7 @@
</line_color>
<line_style>1</line_style>
<scripts>
- <script file="$(WIRE_PY)">
+ <script file="$(WIRE_PY)" check_connections="false">
<pv_name>FEB-090:PSS-RIO-5:IM_ConnStat</pv_name>
</script>
</scripts>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/system_overview.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/system_overview.bob
new file mode 100644
index 0000000000000000000000000000000000000000..f7a5306335d28faaf2b1d4a04ab362a427143309
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/system_overview.bob
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>Diagnostics overview</name>
+ <macros>
+ <EMBEDDED_DIAG>.</EMBEDDED_DIAG>
+ <GPLC>FEB-090:PSS-GPLC-1</GPLC>
+ <PLC>FEB-090:PSS-PLC-1</PLC>
+ <PLC_SYMBOLS>$(SYMBOLS)/plc</PLC_SYMBOLS>
+ <SYMBOLS>../../symbols</SYMBOLS>
+ <WIRE_PY>../../scripts/wire.py</WIRE_PY>
+ </macros>
+ <width>1040</width>
+ <height>350</height>
+ <widget type="polyline" version="2.0.0">
+ <name>GCPU Wire</name>
+ <x>70</x>
+ <y>265</y>
+ <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="220.0" y="40.0">
+ </point>
+ <point x="220.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="$(WIRE_PY)" check_connections="false">
+ <pv_name>$(PLC):GCPU_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>CPU Wire</name>
+ <x>327</x>
+ <y>260</y>
+ <width>180</width>
+ <height>85</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="85.0">
+ </point>
+ <point x="180.0" y="85.0">
+ </point>
+ <point x="180.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="$(WIRE_PY)" check_connections="false">
+ <pv_name>$(PLC):CPU_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>HMI Wire</name>
+ <x>530</x>
+ <y>265</y>
+ <width>165</width>
+ <height>70</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="70.0">
+ </point>
+ <point x="165.0" y="70.0">
+ </point>
+ <point x="165.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="$(WIRE_PY)" check_connections="false">
+ <pv_name>$(PLC):HMI_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>PAS HMI Wire</name>
+ <x>522</x>
+ <y>265</y>
+ <width>410</width>
+ <height>80</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="80.0">
+ </point>
+ <point x="410.0" y="80.0">
+ </point>
+ <point x="410.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="$(WIRE_PY)" check_connections="false">
+ <pv_name>$(PLC):PASHMI_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>GCPU</name>
+ <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>
+ <widget type="group" version="2.0.0">
+ <name>CPU</name>
+ <x>250</x>
+ <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):GCPU_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="group" version="2.0.0">
+ <name>Switch</name>
+ <x>440</x>
+ <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 type="embedded" version="2.0.0">
+ <name>Diag</name>
+ <macros>
+ <DIAG_CONN_STAT>$(PLC):CPU_ConnStat</DIAG_CONN_STAT>
+ <DIAG_STAT>FEB-010Row:CnPw-U-001:SCL_Stat</DIAG_STAT>
+ </macros>
+ <file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
+ <x>45</x>
+ <y>83</y>
+ <width>30</width>
+ <height>70</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>HMI</name>
+ <x>590</x>
+ <width>210</width>
+ <height>270</height>
+ <style>3</style>
+ <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>HMI_ConnStat</name>
+ <pv_name>$(PLC):HMI_ConnStat</pv_name>
+ <symbols>
+ <symbol>$(SYMBOLS)/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="group" version="2.0.0">
+ <name>PAS HMI</name>
+ <x>830</x>
+ <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>$(SYMBOLS)/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>
+</display>
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 68de413e616cbde3def65972fef088dddbe0b0b6..b2758bb72eb12e86010a35e8a99058244099f01a 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
@@ -66,342 +66,15 @@
<height>182</height>
<resize>2</resize>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>GCPU Wire</name>
- <x>520</x>
- <y>325</y>
- <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="220.0" y="40.0">
- </point>
- <point x="220.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="$(WIRE_PY)">
- <pv_name>$(PLC):GCPU_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>CPU Wire</name>
- <x>777</x>
- <y>320</y>
- <width>180</width>
- <height>85</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="85.0">
- </point>
- <point x="180.0" y="85.0">
- </point>
- <point x="180.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="$(WIRE_PY)">
- <pv_name>$(PLC):CPU_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>HMI Wire</name>
- <x>980</x>
- <y>325</y>
- <width>165</width>
- <height>70</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="70.0">
- </point>
- <point x="164.99999999999997" y="70.0">
- </point>
- <point x="164.99999999999997" 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="$(WIRE_PY)">
- <pv_name>$(PLC):HMI_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>PAS HMI Wire</name>
- <x>972</x>
- <y>325</y>
- <width>410</width>
- <height>80</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="80.0">
- </point>
- <point x="410.0" y="80.0">
- </point>
- <point x="410.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="$(WIRE_PY)">
- <pv_name>$(PLC):PASHMI_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="group" version="2.0.0">
- <name>GCPU</name>
+ <widget type="embedded" version="2.0.0">
+ <name>Diagnostics overview</name>
+ <file>$(EMBEDDED_DIAG)/system_overview.bob</file>
<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="group" version="2.0.0">
- <name>CPU</name>
- <x>700</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="group" version="2.0.0">
- <name>Switch</name>
- <x>890</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 type="symbol" version="2.0.0">
- <name>SCL_Stat</name>
- <pv_name>FEB-010Row:CnPw-U-001:SCL_Stat</pv_name>
- <symbols>
- <symbol>$(SYMBOLS)/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>1040</x>
- <y>60</y>
- <width>210</width>
- <height>270</height>
- <style>3</style>
- <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>HMI_ConnStat</name>
- <pv_name>$(PLC):HMI_ConnStat</pv_name>
- <symbols>
- <symbol>$(SYMBOLS)/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="group" version="2.0.0">
- <name>PAS HMI</name>
- <x>1280</x>
- <y>60</y>
- <width>210</width>
- <height>270</height>
- <style>3</style>
+ <width>1040</width>
+ <height>350</height>
+ <resize>2</resize>
<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>$(SYMBOLS)/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>
@@ -425,7 +98,7 @@
</line_color>
<line_style>1</line_style>
<scripts>
- <script file="$(WIRE_PY)">
+ <script file="$(WIRE_PY)" check_connections="false">
<pv_name>$(P):IM_ConnStat</pv_name>
</script>
</scripts>