diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index db6575e6a8a933eb06ab8a6db97dfd8dde428840..4b80dfe2bfef1bb51a825f502b441700fcd2d6c5 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>
@@ -512,7 +513,7 @@
<height>36</height>
<line_width>0</line_width>
<background_color>
- <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ <color red="0" green="204" blue="255">
</color>
</background_color>
</widget>
@@ -523,7 +524,7 @@
<height>36</height>
<line_width>0</line_width>
<background_color>
- <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ <color red="0" green="204" blue="255">
</color>
</background_color>
</widget>
@@ -534,7 +535,7 @@
<height>120</height>
<line_width>0</line_width>
<background_color>
- <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ <color red="0" green="204" blue="255">
</color>
</background_color>
</widget>
@@ -561,7 +562,7 @@
<height>90</height>
<line_width>0</line_width>
<background_color>
- <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ <color red="0" green="204" blue="255">
</color>
</background_color>
</widget>
@@ -572,7 +573,7 @@
<height>120</height>
<line_width>0</line_width>
<background_color>
- <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ <color red="0" green="204" blue="255">
</color>
</background_color>
</widget>
@@ -600,6 +601,18 @@
</color>
</background_color>
</widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Zone1 ISrc small square</name>
+ <x>795</x>
+ <y>690</y>
+ <width>14</width>
+ <height>12</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="Button_Background" red="236" green="236" blue="236">
+ </color>
+ </background_color>
+ </widget>
<widget type="label" version="2.0.0">
<name>Zone_2</name>
<text>ZONE 2</text>
@@ -1003,7 +1016,7 @@ Exit Door 1</text>
<name>FEB Camera </name>
<actions>
<action type="command">
- <command>totem rtsp://pss-pas1-camera1.tn.esss.lu.se</command>
+ <command>vlc 'rtsp://LCRstream:password!@172.16.64.139:554/Streaming/Channels/102'</command>
<description>Open Video feed</description>
</action>
<action type="open_webpage">
@@ -1419,14 +1432,14 @@ Exit Door 1</text>
<widget type="action_button" version="3.0.0">
<name>PAS Camera</name>
<actions>
+ <action type="command">
+ <command>vlc 'rtsp://LCRstream:password!@172.16.64.140:554/Streaming/Channels/102'</command>
+ <description>Open Video feed</description>
+ </action>
<action type="open_webpage">
<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>30</x>
@@ -1438,14 +1451,14 @@ Exit Door 1</text>
<widget type="action_button" version="3.0.0">
<name>Controlled Area Camera</name>
<actions>
+ <action type="command">
+ <command>vlc 'rtsp://LCRstream:password!@172.16.64.141:554/Streaming/Channels/102'</command>
+ <description>Open Video feed</description>
+ </action>
<action type="open_webpage">
<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>30</x>
@@ -1503,18 +1516,6 @@ Exit Door 1</text>
</color>
</line_color>
</widget>
- <widget type="rectangle" version="2.0.0">
- <name>Rectangle_28</name>
- <x>795</x>
- <y>690</y>
- <width>14</width>
- <height>12</height>
- <line_width>0</line_width>
- <background_color>
- <color name="Button_Background" red="236" green="236" blue="236">
- </color>
- </background_color>
- </widget>
<widget type="polyline" version="2.0.0">
<name>Polyline_8</name>
<x>102</x>
@@ -1917,7 +1918,7 @@ Exit Door 1</text>
<expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
- <pv_name>KG-NCG:PSS-Area-1:DTL4isolationConfirmed</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:DTL4_waveguide_Isolated</pv_name>
<pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
@@ -1945,7 +1946,7 @@ Exit Door 1</text>
<expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
- <pv_name>KG-NCG:PSS-Area-1:DTL2DTL3isolationConfirmed</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:DTL3_waveguide_Isolated</pv_name>
<pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
@@ -1973,7 +1974,7 @@ Exit Door 1</text>
<expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
- <pv_name>KG-NCG:PSS-Area-1:DTL2DTL3isolationConfirmed</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:DTL2_waveguide_Isolated</pv_name>
<pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
@@ -2001,7 +2002,7 @@ Exit Door 1</text>
<expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
- <pv_name>KG-NCG:PSS-Area-1:RFQDTL1isolationConfirmed</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:DTL1_waveguide_Isolated</pv_name>
<pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
@@ -2029,7 +2030,7 @@ Exit Door 1</text>
<expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
- <pv_name>KG-NCG:PSS-Area-1:RFQDTL1isolationConfirmed</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:RFQ_waveguide_Isolated</pv_name>
<pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
index aac3935e2922d08d767fe1ddbdce604911f2ec41..1426625ac79964e437ded184091fa323495de87c 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
@@ -94,19 +94,19 @@
<tooltip>N/A</tooltip>
</widget>
<widget type="polyline" version="2.0.0">
- <name>CPU Wire</name>
+ <name>FCPU Wire</name>
<x>777</x>
<y>320</y>
- <width>180</width>
+ <width>150</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 x="150.0" y="85.0">
</point>
- <point x="180.0" y="0.0">
+ <point x="150.0" y="0.0">
</point>
</points>
<line_color>
@@ -121,6 +121,62 @@
</scripts>
<tooltip>N/A</tooltip>
</widget>
+ <widget type="polyline" version="2.0.0">
+ <name>PLC Wire</name>
+ <x>150</x>
+ <y>325</y>
+ <width>795</width>
+ <height>254</height>
+ <points>
+ <point x="795.0" y="0.0">
+ </point>
+ <point x="795.0" y="179.0">
+ </point>
+ <point x="0.0" y="179.0">
+ </point>
+ <point x="0.0" y="254.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>FEB-010Row:CnPw-U-001:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>RIO4 Wire</name>
+ <x>962</x>
+ <y>325</y>
+ <width>170</width>
+ <height>254</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="179.0">
+ </point>
+ <point x="170.0" y="179.0">
+ </point>
+ <point x="170.0" y="254.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>AccPSS-Z0:PSS-RIO-4:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
<widget type="polyline" version="2.0.0">
<name>HMI Wire</name>
<x>980</x>
@@ -150,19 +206,125 @@
<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>
+ <name>RIO1 Wire</name>
+ <x>224</x>
+ <y>876</y>
+ <width>131</width>
+ <height>75</height>
+ <points>
+ <point x="0.0" y="75.0">
+ </point>
+ <point x="131.0" y="75.0">
+ </point>
+ <point x="131.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>FEB-010Row:CnPw-U-002:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>RIO2 Wire</name>
+ <x>465</x>
+ <y>876</y>
+ <width>131</width>
+ <height>75</height>
<points>
<point x="0.0" y="0.0">
</point>
- <point x="0.0" y="80.0">
+ <point x="0.0" y="75.0">
</point>
- <point x="410.0" y="80.0">
+ <point x="131.0" y="75.0">
</point>
- <point x="410.0" y="0.0">
+ <point x="131.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>FEB-010Row:CnPw-U-003:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>RIO3 Wire</name>
+ <x>706</x>
+ <y>876</y>
+ <width>131</width>
+ <height>75</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="75.0">
+ </point>
+ <point x="131.0" y="75.0">
+ </point>
+ <point x="131.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>FEB-010Row:CnPw-U-004:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>RIO5 Wire</name>
+ <x>947</x>
+ <y>876</y>
+ <width>372</width>
+ <height>75</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="75.0">
+ </point>
+ <point x="372.0" y="75.0">
+ </point>
+ <point x="372.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>FEB-090:PSS-RIO-5:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>PAS HMI Wire</name>
+ <x>1380</x>
+ <y>340</y>
+ <width>1</width>
+ <height>200</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="1.0" y="199.99999999999997">
</point>
</points>
<line_color>
@@ -182,14 +344,14 @@
<x>450</x>
<y>60</y>
<width>162</width>
- <height>270</height>
+ <height>285</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>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -201,39 +363,24 @@
<widget type="picture" version="2.0.0">
<name>GCPU</name>
<file>$(PLC_SYMBOLS)/GCPU.png</file>
- <y>40</y>
+ <y>55</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>
+ <name>FCPU</name>
<x>700</x>
<y>60</y>
<width>162</width>
- <height>270</height>
+ <height>285</height>
<style>3</style>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
<name>Title</name>
- <text>CPU</text>
+ <text>F-CPU</text>
<width>162</width>
- <height>40</height>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -243,57 +390,41 @@
<wrap_words>false</wrap_words>
</widget>
<widget type="picture" version="2.0.0">
- <name>CPU</name>
+ <name>FCPU</name>
<file>$(PLC_SYMBOLS)/CPU.png</file>
- <y>40</y>
+ <y>55</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_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>
+ <y>98</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>
- <x>965</x>
- <y>325</y>
- <width>1</width>
- <height>179</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="179.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>Switch</name>
<x>890</x>
<y>60</y>
<width>120</width>
- <height>270</height>
+ <height>285</height>
<style>3</style>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
<name>Title</name>
- <text>Scalance</text>
+ <text>PLC Cabinet
+Scalance</text>
<width>120</width>
- <height>40</height>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -305,26 +436,23 @@
<widget type="picture" version="2.0.0">
<name>Switch</name>
<file>$(PLC_SYMBOLS)/Switch.png</file>
- <y>40</y>
+ <y>55</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 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>98</y>
+ <width>30</width>
+ <height>70</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
</widget>
</widget>
<widget type="group" version="2.0.0">
@@ -332,21 +460,14 @@
<x>1040</x>
<y>60</y>
<width>210</width>
- <height>270</height>
+ <height>285</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>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -355,6 +476,13 @@
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="picture" version="2.0.0">
+ <name>HMI</name>
+ <file>$(PLC_SYMBOLS)/HMI.png</file>
+ <y>55</y>
+ <width>210</width>
+ <height>230</height>
+ </widget>
<widget type="symbol" version="2.0.0">
<name>HMI_ConnStat</name>
<pv_name>$(PLC):HMI_ConnStat</pv_name>
@@ -362,7 +490,7 @@
<symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
- <y>93</y>
+ <y>108</y>
<width>24</width>
<height>24</height>
<scripts>
@@ -378,21 +506,14 @@
<x>1280</x>
<y>60</y>
<width>210</width>
- <height>270</height>
+ <height>285</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>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -401,6 +522,13 @@
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="picture" version="2.0.0">
+ <name>PAS HMI</name>
+ <file>$(PLC_SYMBOLS)/HMI.png</file>
+ <y>55</y>
+ <width>210</width>
+ <height>230</height>
+ </widget>
<widget type="symbol" version="2.0.0">
<name>PASHMI_ConnStat</name>
<pv_name>$(PLC):PASHMI_ConnStat</pv_name>
@@ -408,7 +536,7 @@
<symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
- <y>93</y>
+ <y>108</y>
<width>24</width>
<height>24</height>
<scripts>
@@ -419,167 +547,6 @@
<tooltip>N/A</tooltip>
</widget>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>RIO Wire</name>
- <x>150</x>
- <y>506</y>
- <width>1223</width>
- <height>3</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="1223.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>RIO0 Wire</name>
- <x>150</x>
- <y>506</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="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>FEB-010Row:CnPw-U-001:IM_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>RIO1 Wire</name>
- <x>410</x>
- <y>506</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="DISCONNECTED" red="105" green="77" blue="164">
- </color>
- </line_color>
- <line_style>1</line_style>
- <scripts>
- <script file="$(WIRE_PY)">
- <pv_name>FEB-010Row:CnPw-U-002:IM_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>RIO2 Wire</name>
- <x>651</x>
- <y>506</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="DISCONNECTED" red="105" green="77" blue="164">
- </color>
- </line_color>
- <line_style>1</line_style>
- <scripts>
- <script file="$(WIRE_PY)">
- <pv_name>FEB-010Row:CnPw-U-003:IM_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>RIO3 Wire</name>
- <x>891</x>
- <y>506</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="DISCONNECTED" red="105" green="77" blue="164">
- </color>
- </line_color>
- <line_style>1</line_style>
- <scripts>
- <script file="$(WIRE_PY)">
- <pv_name>FEB-010Row:CnPw-U-004:IM_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>RIO4 Wire</name>
- <x>1132</x>
- <y>506</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="DISCONNECTED" red="105" green="77" blue="164">
- </color>
- </line_color>
- <line_style>1</line_style>
- <scripts>
- <script file="$(WIRE_PY)">
- <pv_name>AccPSS-Z0:PSS-RIO-4:IM_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>RIO5 Wire</name>
- <x>1373</x>
- <y>506</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="DISCONNECTED" red="105" green="77" blue="164">
- </color>
- </line_color>
- <line_style>1</line_style>
- <scripts>
- <script file="$(WIRE_PY)">
- <pv_name>FEB-090:PSS-RIO-5:IM_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
<widget type="embedded" version="2.0.0">
<name>PSS1 PSS $(CABINET) Cabinet</name>
<macros>
@@ -591,7 +558,7 @@
<file>$(EMBEDDED_DIAG)/PLC_cabinet.bob</file>
<x>20</x>
<y>531</y>
- <width>260</width>
+ <width>240</width>
<height>465</height>
<resize>2</resize>
</widget>
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 a19382d6c340d6cc2f47fc028bdd62b9ac45b6d3..a5a23c9c6c422ff057b368735b6ec0a143cf67a5 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>PSS1 PSS PLC Cabinet</name>
- <width>260</width>
+ <width>240</width>
<height>465</height>
<widget type="group" version="2.0.0">
<name>Cabinet</name>
- <width>260</width>
- <height>330</height>
+ <width>240</width>
+ <height>465</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background</name>
- <width>260</width>
+ <width>240</width>
<height>465</height>
<line_width>2</line_width>
<line_color>
@@ -58,7 +58,7 @@
<text>PLC Cabinet</text>
<x>10</x>
<y>5</y>
- <width>240</width>
+ <width>220</width>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -85,7 +85,7 @@
<text>=ESS.ACC.F01.K01.U1</text>
<x>10</x>
<y>35</y>
- <width>240</width>
+ <width>220</width>
<font>
<font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
@@ -97,13 +97,13 @@
<name>Signals</name>
<x>10</x>
<y>55</y>
- <width>240</width>
+ <width>220</width>
<height>400</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>Rectangle</name>
- <width>240</width>
+ <width>220</width>
<height>400</height>
<line_width>2</line_width>
<line_color>
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 f3a6b9228c808253c05ec877020079838936d77b..8ced6ffd355129b4c623b4bc52ebfccc88b0bf77 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
@@ -232,7 +232,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_PSRed_24vOK</name>
- <pv_name>$(P):PS2_24vOK</pv_name>
+ <pv_name>$(P):PSRed_24vOK</pv_name>
<x>15</x>
<y>160</y>
<off_color>
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..f7b913b7f9ad9bdb76843c99a1d53e9be0f375ad 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
@@ -11,14 +11,14 @@
<SYMBOLS>../../symbols</SYMBOLS>
<WIRE_PY>../../scripts/wire.py</WIRE_PY>
</macros>
- <width>1500</width>
- <height>1006</height>
+ <width>1433</width>
+ <height>545</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>1500</width>
+ <width>1433</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -47,390 +47,6 @@
<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>EPICS</name>
- <file>$(EMBEDDED_DIAG)//epics.bob</file>
- <x>20</x>
- <y>60</y>
- <width>370</width>
- <height>244</height>
- <resize>2</resize>
- <transparent>true</transparent>
- </widget>
- <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 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>
- <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>
- <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>340</x>
- <y>325</y>
- <width>625</width>
- <height>254</height>
- <points>
- <point x="0.0" y="254.0">
- </point>
- <point x="0.0" y="185.0">
- </point>
- <point x="625.0" y="185.0">
- </point>
- <point x="625.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>$(P):IM_ConnStat</pv_name>
- </script>
- </scripts>
- <tooltip>N/A</tooltip>
- </widget>
<widget type="embedded" version="2.0.0">
<name>PSS1 PSS $(CABINET) Cabinet</name>
<macros>
@@ -441,7 +57,7 @@
</macros>
<file>$(EMBEDDED_DIAG)/PLC_cabinet.bob</file>
<x>20</x>
- <y>531</y>
+ <y>70</y>
<width>260</width>
<height>465</height>
<resize>2</resize>
@@ -453,7 +69,7 @@
<DIAG_STAT>$(P):$(MOD)_Stat</DIAG_STAT>
</macros>
<x>300</x>
- <y>531</y>
+ <y>70</y>
<width>1113</width>
<height>390</height>
<style>3</style>