diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index d74b18dc3754796e788206506784083ef17259bc..e8443624b35057faa15a0be69edcdab72482c8c0 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>PSS1 PSS</name>
+ <name>PSS1</name>
<width>1040</width>
<height>830</height>
<widget type="rectangle" version="2.0.0">
@@ -460,7 +460,7 @@
</color>
</off_color>
<on_color>
- <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
</on_color>
</widget>
@@ -643,6 +643,44 @@
<height>28</height>
<preserve_ratio>false</preserve_ratio>
</widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Door1Stat - Locked</name>
+ <pv_name>FEB-090:PSS-MAS-1:Door1Stat</pv_name>
+ <symbols>
+ <symbol>symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>40</x>
+ <y>28</y>
+ <width>20</width>
+ <height>20</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 != 3">
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Door2Stat - Locked</name>
+ <pv_name>FEB-090:PSS-MAS-1:Door2Stat</pv_name>
+ <symbols>
+ <symbol>symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>40</x>
+ <y>80</y>
+ <width>20</width>
+ <height>20</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 != 3">
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
</widget>
<widget type="embedded" version="2.0.0">
<name>ESOS1_Z2</name>
@@ -800,6 +838,44 @@
<height>28</height>
<preserve_ratio>false</preserve_ratio>
</widget>
+ <widget type="symbol" version="2.0.0">
+ <name>PAS Door1Stat - Locked</name>
+ <pv_name>FEB-090:PSS-PAS-1:Door1Stat</pv_name>
+ <symbols>
+ <symbol>symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>15</x>
+ <y>28</y>
+ <width>20</width>
+ <height>20</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 != 2">
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>PAS Door2Stat - Locked</name>
+ <pv_name>FEB-090:PSS-PAS-1:Door2Stat</pv_name>
+ <symbols>
+ <symbol>symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>15</x>
+ <y>61</y>
+ <width>20</width>
+ <height>20</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 != 2">
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
</widget>
<widget type="embedded" version="2.0.0">
<name>ESOS2_Z2</name>
@@ -1227,7 +1303,7 @@ Exit Door 1</text>
</widget>
<widget type="rectangle" version="2.0.0">
<name>Rectangle_21</name>
- <x>129</x>
+ <x>130</x>
<y>655</y>
<width>15</width>
<height>74</height>
@@ -1358,7 +1434,7 @@ Exit Door 1</text>
</widget>
<widget type="polyline" version="2.0.0">
<name>Polyline_8</name>
- <x>100</x>
+ <x>102</x>
<y>660</y>
<width>1</width>
<height>120</height>
@@ -1565,91 +1641,6 @@ Exit Door 1</text>
</font>
<horizontal_alignment>2</horizontal_alignment>
</widget>
- <widget type="rectangle" version="2.0.0">
- <name>DTL-4 removable waveguide</name>
- <x>115</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <visible>false</visible>
- <line_width>2</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
- </color>
- </line_color>
- <background_color>
- <color name="OK" red="61" green="216" blue="61">
- </color>
- </background_color>
- </widget>
- <widget type="rectangle" version="2.0.0">
- <name>DTL-3 removable waveguide</name>
- <x>200</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <visible>false</visible>
- <line_width>2</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
- </color>
- </line_color>
- <background_color>
- <color name="OK" red="61" green="216" blue="61">
- </color>
- </background_color>
- </widget>
- <widget type="rectangle" version="2.0.0">
- <name>DTL-2 removable waveguide</name>
- <x>285</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <visible>false</visible>
- <line_width>2</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
- </color>
- </line_color>
- <background_color>
- <color name="OK" red="61" green="216" blue="61">
- </color>
- </background_color>
- </widget>
- <widget type="rectangle" version="2.0.0">
- <name>DTL-1 removable waveguide</name>
- <x>370</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <visible>false</visible>
- <line_width>2</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
- </color>
- </line_color>
- <background_color>
- <color name="OK" red="61" green="216" blue="61">
- </color>
- </background_color>
- </widget>
- <widget type="rectangle" version="2.0.0">
- <name>RFQ removable waveguide</name>
- <x>458</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <visible>false</visible>
- <line_width>2</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
- </color>
- </line_color>
- <background_color>
- <color name="OK" red="61" green="216" blue="61">
- </color>
- </background_color>
- </widget>
<widget type="led" version="2.0.0">
<name>DTL-4 removable waveguide</name>
<pv_name>KG-NCG:PSS-Area-1:DTL4_RWG_Removed</pv_name>
@@ -1676,6 +1667,12 @@ Exit Door 1</text>
</exp>
<pv_name>$(pv_name)</pv_name>
</rule>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>not pvInt0</expression>
+ </exp>
+ <pv_name>KG-NCG:PSS-Area-1:DTL4_SCP_Installed</pv_name>
+ </rule>
</rules>
</widget>
<widget type="led" version="2.0.0">
@@ -1704,6 +1701,12 @@ Exit Door 1</text>
</exp>
<pv_name>$(pv_name)</pv_name>
</rule>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>not pvInt0</expression>
+ </exp>
+ <pv_name>KG-NCG:PSS-Area-1:DTL3_SCP_Installed</pv_name>
+ </rule>
</rules>
</widget>
<widget type="led" version="2.0.0">
@@ -1732,6 +1735,12 @@ Exit Door 1</text>
</exp>
<pv_name>$(pv_name)</pv_name>
</rule>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>not pvInt0</expression>
+ </exp>
+ <pv_name>KG-NCG:PSS-Area-1:DTL2_SCP_Installed</pv_name>
+ </rule>
</rules>
</widget>
<widget type="led" version="2.0.0">
@@ -1760,6 +1769,12 @@ Exit Door 1</text>
</exp>
<pv_name>$(pv_name)</pv_name>
</rule>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>not pvInt0</expression>
+ </exp>
+ <pv_name>KG-NCG:PSS-Area-1:DTL1_SCP_Installed</pv_name>
+ </rule>
</rules>
</widget>
<widget type="led" version="2.0.0">
@@ -1788,63 +1803,113 @@ Exit Door 1</text>
</exp>
<pv_name>$(pv_name)</pv_name>
</rule>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>not pvInt0</expression>
+ </exp>
+ <pv_name>KG-NCG:PSS-Area-1:RFQ_SCP_Installed</pv_name>
+ </rule>
</rules>
</widget>
- <widget type="rectangle" version="2.0.0">
+ <widget type="led" version="2.0.0">
<name>DTL-4 SCP</name>
- <x>135</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <line_width>1</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
- </color>
- </line_color>
- <background_color>
- <color name="OK" red="61" green="216" blue="61">
+ <pv_name>KG-NCG:PSS-Area-1:DTL4_SCP_Installed</pv_name>
+ <x>105</x>
+ <y>528</y>
+ <width>40</width>
+ <on_color>
+ <color name="Off" red="90" green="110" blue="90">
</color>
- </background_color>
- <transparent>true</transparent>
+ </on_color>
+ <square>true</square>
+ <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="rectangle" version="2.0.0">
+ <widget type="led" version="2.0.0">
<name>DTL-3 SCP</name>
- <x>220</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <line_width>1</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
+ <pv_name>KG-NCG:PSS-Area-1:DTL3_SCP_Installed</pv_name>
+ <x>190</x>
+ <y>528</y>
+ <width>40</width>
+ <on_color>
+ <color name="Off" red="90" green="110" blue="90">
</color>
- </line_color>
- <transparent>true</transparent>
+ </on_color>
+ <square>true</square>
+ <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="rectangle" version="2.0.0">
+ <widget type="led" version="2.0.0">
<name>DTL-2 SCP</name>
- <x>305</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <line_width>1</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
+ <pv_name>KG-NCG:PSS-Area-1:DTL2_SCP_Installed</pv_name>
+ <x>275</x>
+ <y>528</y>
+ <width>40</width>
+ <on_color>
+ <color name="Off" red="90" green="110" blue="90">
</color>
- </line_color>
- <transparent>true</transparent>
+ </on_color>
+ <square>true</square>
+ <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="rectangle" version="2.0.0">
+ <widget type="led" version="2.0.0">
<name>DTL-1 SCP</name>
- <x>390</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <line_width>1</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
+ <pv_name>KG-NCG:PSS-Area-1:DTL1_SCP_Installed</pv_name>
+ <x>360</x>
+ <y>528</y>
+ <width>40</width>
+ <on_color>
+ <color name="Off" red="90" green="110" blue="90">
</color>
- </line_color>
- <transparent>true</transparent>
+ </on_color>
+ <square>true</square>
+ <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>RFQ SCP</name>
+ <pv_name>KG-NCG:PSS-Area-1:RFQ_SCP_Installed</pv_name>
+ <x>448</x>
+ <y>528</y>
+ <width>40</width>
+ <on_color>
+ <color name="Off" red="90" green="110" blue="90">
+ </color>
+ </on_color>
+ <square>true</square>
+ <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="rectangle" version="2.0.0">
<name>RFQ SCP</name>
@@ -1852,6 +1917,7 @@ Exit Door 1</text>
<y>523</y>
<width>20</width>
<height>30</height>
+ <visible>false</visible>
<line_width>1</line_width>
<line_color>
<color name="Text" red="25" green="25" blue="25">
@@ -1911,6 +1977,25 @@ Door</text>
<height>54</height>
<preserve_ratio>false</preserve_ratio>
</widget>
+ <widget type="symbol" version="2.0.0">
+ <name>AccPSS-Z1:PSS-EscD-1:DoorStat - Locked</name>
+ <pv_name>AccPSS-Z1:PSS-EscD-1:DoorStat</pv_name>
+ <symbols>
+ <symbol>symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>770</x>
+ <y>615</y>
+ <width>20</width>
+ <height>20</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 != 2">
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
<widget type="symbol" version="2.0.0">
<name>AccPSS-Z1:PSS-EscD-2:DoorStat</name>
<pv_name>AccPSS-Z1:PSS-EscD-2:DoorStat</pv_name>
@@ -1929,13 +2014,36 @@ Door</text>
<pv_name>AccPSS-Z2:PSS-EscD-1:DoorStat</pv_name>
<symbols>
<symbol>symbols/door v2/Door_thin/Left-right-RED.png</symbol>
+ <symbol>symbols/door v2/Door_thin/Left-right-RED.png</symbol>
+ <symbol>symbols/door v2/Door_thin/Left-right-GREEN.png</symbol>
+ <symbol>symbols/door v2/Door_thin/Left-right-BLACK.png</symbol>
+ <symbol>symbols/door v2/Door_thin/Left-right-GREEN.png</symbol>
</symbols>
- <x>51</x>
+ <x>56</x>
<y>732</y>
<width>50</width>
<height>50</height>
<preserve_ratio>false</preserve_ratio>
</widget>
+ <widget type="symbol" version="2.0.0">
+ <name>AccPSS-Z2:PSS-EscD-1:DoorStat - Locked</name>
+ <pv_name>AccPSS-Z2:PSS-EscD-1:DoorStat</pv_name>
+ <symbols>
+ <symbol>symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>77</x>
+ <y>747</y>
+ <width>20</width>
+ <height>20</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 != 3">
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
<widget type="label" version="2.0.0">
<name>Permits</name>
<text>Permits</text>
@@ -1973,7 +2081,6 @@ Door</text>
</widget>
<widget type="symbol" version="2.0.0">
<name>Key</name>
- <pv_name>TBD</pv_name>
<symbols>
<symbol>symbols/Key/Key-black@256.png</symbol>
</symbols>
@@ -2209,6 +2316,25 @@ Door</text>
</font>
</widget>
</widget>
+ <widget type="symbol" version="2.0.0">
+ <name>MiniMAS1Stat - Locked</name>
+ <pv_name>FEB-090:PSS-PAS-1:MiniMAS1Stat</pv_name>
+ <symbols>
+ <symbol>symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>828</x>
+ <y>525</y>
+ <width>20</width>
+ <height>20</height>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 != 2">
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
<widget type="group" version="2.0.0">
<name>MiniMAS</name>
<x>828</x>
@@ -2273,16 +2399,19 @@ Door</text>
</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>
+ <name>MiniMAS2Stat - Locked</name>
+ <pv_name>FEB-090:PSS-PAS-1:MiniMAS2Stat</pv_name>
+ <symbols>
+ <symbol>symbols/Key/lock.svg</symbol>
+ </symbols>
+ <x>828</x>
+ <y>573</y>
+ <width>20</width>
+ <height>20</height>
<rules>
- <rule name="Visibility" prop_id="visible" out_exp="true">
- <exp bool_exp="True">
- <expression>pvInt0</expression>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 != 2">
+ <value>false</value>
</exp>
<pv_name>$(pv_name)</pv_name>
</rule>
@@ -2297,4 +2426,154 @@ Door</text>
<height>56</height>
<resize>2</resize>
</widget>
+ <widget type="group" version="2.0.0">
+ <name>Grly_ConnectedToGround</name>
+ <x>749</x>
+ <y>661</y>
+ <width>46</width>
+ <height>40</height>
+ <style>3</style>
+ <background_color>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <rules>
+ <rule name="Transparency" prop_id="transparent" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
+ </rule>
+ </rules>
+ <widget type="polyline" version="2.0.0">
+ <name>Upper Line</name>
+ <x>3</x>
+ <y>5</y>
+ <width>40</width>
+ <height>3</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="40.0" y="0.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>Vertical Line</name>
+ <x>22</x>
+ <y>3</y>
+ <width>3</width>
+ <height>17</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="17.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>Lower Line </name>
+ <x>5</x>
+ <y>11</y>
+ <width>36</width>
+ <height>9</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="9.0">
+ </point>
+ <point x="36.0" y="9.0">
+ </point>
+ <point x="36.0" y="0.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <rules>
+ <rule name="Pos" prop_id="y" out_exp="false">
+ <exp bool_exp="not pvInt0">
+ <value>5</value>
+ </exp>
+ <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
+ </rule>
+ <rule name="Height" prop_id="height" out_exp="false">
+ <exp bool_exp="not pvInt0">
+ <value>14</value>
+ </exp>
+ <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="polygon" version="2.0.0">
+ <name>Polygon</name>
+ <x>5</x>
+ <y>20</y>
+ <width>36</width>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="9.0" y="20.0">
+ </point>
+ <point x="27.0" y="20.0">
+ </point>
+ <point x="36.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>
+ <background_color>
+ <color name="ActiveText" red="254" green="194" blue="81">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Grounding relay</name>
+ <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
+ <text></text>
+ <width>46</width>
+ <height>40</height>
+ <transparent>true</transparent>
+ <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+ </widget>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>TSW</name>
+ <pv_name>FEB-020Row:CnPw-U-005:TSWKey</pv_name>
+ <x>130</x>
+ <y>710</y>
+ <width>15</width>
+ <height>74</height>
+ <off_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </on_color>
+ <square>true</square>
+ <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>
</display>
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
index f6cdb7d2bb6dfc5014d700321a38c98d8db1c911..a5fb389ff8504fe352b3b34736088737274764c7 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>PSS1 PSS Diagnostics</name>
+ <name>PSS1 Diagnostics</name>
<macros>
<EMBEDDED_DIAG>embedded_displays/diagnostics</EMBEDDED_DIAG>
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
<PLC>FEB-090:PSS-PLC-1</PLC>
<POPUP_DIAG>popups/diagnostics</POPUP_DIAG>
+ <SYMBOLS>symbols</SYMBOLS>
+ <PLC_SYMBOLS>$(SYMBOLS)/plc</PLC_SYMBOLS>
</macros>
<width>1500</width>
<height>1006</height>
@@ -25,7 +27,7 @@
<widget type="label" version="2.0.0">
<name>Title</name>
<class>TITLE</class>
- <text>PSS1 PSS Diagnostics</text>
+ <text>PSS1 Diagnostics</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>550</width>
@@ -194,7 +196,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</widget>
<widget type="picture" version="2.0.0">
<name>GCPU</name>
- <file>symbols/plc/GCPU.png</file>
+ <file>$(PLC_SYMBOLS)/GCPU.png</file>
<y>40</y>
<width>162</width>
<height>230</height>
@@ -238,7 +240,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</widget>
<widget type="picture" version="2.0.0">
<name>CPU</name>
- <file>symbols/plc/CPU.png</file>
+ <file>$(PLC_SYMBOLS)/CPU.png</file>
<y>40</y>
<width>162</width>
<height>230</height>
@@ -298,7 +300,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</widget>
<widget type="picture" version="2.0.0">
<name>Switch</name>
- <file>symbols/plc/Switch.png</file>
+ <file>$(PLC_SYMBOLS)/Switch.png</file>
<y>40</y>
<width>120</width>
<height>230</height>
@@ -307,7 +309,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<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>
+ <symbol>$(SYMBOLS)/alarms/error.svg</symbol>
</symbols>
<x>48</x>
<y>126</y>
@@ -331,7 +333,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>HMI</name>
- <file>symbols/plc/HMI.png</file>
+ <file>$(PLC_SYMBOLS)/HMI.png</file>
<y>40</y>
<width>210</width>
<height>230</height>
@@ -353,7 +355,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>Disconnected</name>
<pv_name>$(PLC):HMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
@@ -377,7 +379,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>PAS HMI</name>
- <file>symbols/plc/HMI.png</file>
+ <file>$(PLC_SYMBOLS)/HMI.png</file>
<y>40</y>
<width>210</width>
<height>230</height>
@@ -399,7 +401,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>PASHMI_ConnStat</name>
<pv_name>$(PLC):PASHMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
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 0ae33860ced1f1e550c6d36153e5bc68eff44e01..3578baa281bc5338f8b288a0231f7fc035dc8064 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
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <macros>
+ <SYMBOLS>../../symbols</SYMBOLS>
+ </macros>
<name>Diag</name>
<width>30</width>
<height>70</height>
@@ -7,7 +10,7 @@
<name>Disconnected</name>
<pv_name>$(DIAG_CONN_STAT)</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>3</x>
<y>3</y>
@@ -24,7 +27,7 @@
<name>Error</name>
<pv_name>$(DIAG_STAT)</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/error.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/error.svg</symbol>
</symbols>
<x>3</x>
<y>43</y>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/esob.bob b/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
index fb062804eac02a0d73dff387f0f26d647938ac01..c038e073b0e52f7ee8ee234d0ff017ce789e1f37 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
@@ -18,8 +18,8 @@
<name>$(ESOS):ESOBStat</name>
<pv_name>$(ESOS):ESOBStat</pv_name>
<symbols>
- <symbol>../symbols/esos/emergency-button-OFF.svg</symbol>
<symbol>../symbols/esos/emergency-button-RED.svg</symbol>
+ <symbol>../symbols/esos/emergency-button-ON.svg</symbol>
</symbols>
<x>3</x>
<y>3</y>
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 3d1f6ea72225de5e7594248b546b038b82499654..2e977d8800d1b1199d2080c547f35de5cedf4de9 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>PSS1 PSS PLC Cabinet Diagnostics</name>
+ <name>PSS1 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>
- <PLC_SYMBOLS>../../symbols/plc</PLC_SYMBOLS>
+ <PLC_SYMBOLS>$(SYMBOLS)/plc</PLC_SYMBOLS>
<POPUP_DIAG>popups/diagnostics</POPUP_DIAG>
+ <SYMBOLS>../../symbols</SYMBOLS>
</macros>
<width>1500</width>
<height>1006</height>
@@ -27,7 +28,7 @@
<widget type="label" version="2.0.0">
<name>Title</name>
<class>TITLE</class>
- <text>PSS1 PSS PLC Cabinet Diagnostics</text>
+ <text>PSS1 PLC Cabinet Diagnostics</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>550</width>
@@ -309,7 +310,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<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>
+ <symbol>$(SYMBOLS)/alarms/error.svg</symbol>
</symbols>
<x>48</x>
<y>126</y>
@@ -355,7 +356,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>HMI_ConnStat</name>
<pv_name>$(PLC):HMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
@@ -401,7 +402,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>PASHMI_ConnStat</name>
<pv_name>$(PLC):PASHMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
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 82477850818497f4ea5f99e32a34e2b68ccb919c..dce7fb19c73f73b62184bf5a730efce899c0d091 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>PSS1 PSS $(CABINET) Cabinet Diagnostics</name>
+ <name>PSS1 $(CABINET) Cabinet Diagnostics</name>
<macros>
<EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
@@ -25,7 +25,7 @@
<widget type="label" version="2.0.0">
<name>Title</name>
<class>TITLE</class>
- <text>PSS1 PSS $(CABINET) Cabinet Diagnostics</text>
+ <text>PSS1 $(CABINET) Cabinet Diagnostics</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>1000</width>
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 5b658192a50404d751bc8c78095b816d04083fdb..e13e9413945fa7a724062f3da4c9a977b9bbd362 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>PSS1 PSS $(CABINET) Cabinet Diagnostics</name>
+ <name>PSS1 $(CABINET) Cabinet Diagnostics</name>
<macros>
<CABINET>RIO4</CABINET>
<EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
@@ -26,7 +26,7 @@
<widget type="label" version="2.0.0">
<name>Title</name>
<class>TITLE</class>
- <text>PSS1 PSS $(CABINET) Cabinet Diagnostics</text>
+ <text>PSS1 $(CABINET) Cabinet Diagnostics</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>628</width>
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 1a0dd7fe2c59bf86c25ed8345bd0e116a1dbcef9..51394d867429900d86744db0208df4af4cedf611 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>PSS1 PSS $(CABINET) Cabinet Diagnostics</name>
+ <name>PSS1 $(CABINET) Cabinet Diagnostics</name>
<macros>
<CABINET>RIO5</CABINET>
<EMBEDDED_DIAG>../../embedded_displays/diagnostics</EMBEDDED_DIAG>
@@ -26,7 +26,7 @@
<widget type="label" version="2.0.0">
<name>Title</name>
<class>TITLE</class>
- <text>PSS1 PSS $(CABINET) Cabinet Diagnostics</text>
+ <text>PSS1 $(CABINET) Cabinet Diagnostics</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>550</width>
diff --git a/NON-APPROVED/pss1-pss/popups/key_exchange.bob b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
index 35214b99cd8bdb17e6d670afd6cd0882de4a3617..661bdb2cad1d270be12c65f19b996fb09864e86b 100644
--- a/NON-APPROVED/pss1-pss/popups/key_exchange.bob
+++ b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>PSS1 Key Exchange</name>
+ <macros>
+ <SYMBOLS>../symbols</SYMBOLS>
+ </macros>
<width>980</width>
<height>835</height>
<widget type="rectangle" version="2.0.0">
@@ -174,7 +177,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>Locked symbol</name>
- <file>../symbols/Key/lock.svg</file>
+ <file>$(SYMBOLS)/Key/lock.svg</file>
<x>10</x>
<y>130</y>
<width>80</width>
@@ -488,7 +491,7 @@
<name>MainKeyLocked</name>
<pv_name>FEB-020Row:CnPw-U-005:MainKeyLocked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>203</x>
<y>80</y>
@@ -1262,7 +1265,7 @@ PAS</on_label>
<name>EntryKey1Locked</name>
<pv_name>FEB-090:PSS-PAS-1:EntryKey1Locked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>55</x>
<y>70</y>
@@ -1301,7 +1304,7 @@ PAS</on_label>
<name>EntryKey2Locked</name>
<pv_name>FEB-090:PSS-PAS-1:EntryKey2Locked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>145</x>
<y>70</y>
@@ -1360,7 +1363,7 @@ PAS</on_label>
<name>EntryKey3Locked</name>
<pv_name>FEB-090:PSS-PAS-1:EntryKey3Locked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>235</x>
<y>70</y>
@@ -1376,10 +1379,10 @@ PAS</on_label>
</rules>
</widget>
<widget type="symbol" version="2.0.0">
- <name>EntryKey1Locked_3</name>
- <pv_name>FEB-090:PSS-PAS-1:EntryKey1Locked</pv_name>
+ <name>EntryKey4Locked</name>
+ <pv_name>FEB-090:PSS-PAS-1:EntryKey4Locked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>325</x>
<y>70</y>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob b/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob
index 0306c22a21e65a9daa2a4d9e4abafa0640e07c53..a0829f6c0b16b2992657ff28a95a8c1ca29f7f86 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob
@@ -121,8 +121,8 @@
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
- <name>METB1_fbkErrorC1</name>
- <pv_name>KG-NCG:PSS-ICC-4:METB1_fbkErrorC1</pv_name>
+ <name>MEBT1_fbkErrorC1</name>
+ <pv_name>KG-NCG:PSS-ICC-4:MEBT1_fbkErrorC1</pv_name>
<x>20</x>
<y>60</y>
<off_color>
@@ -135,7 +135,7 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_METB1_fbkErrorC1</name>
+ <name>LB_MEBT1_fbkErrorC1</name>
<text>Feedback error in contactor 1</text>
<x>46</x>
<y>60</y>
@@ -340,7 +340,6 @@
<transparent>true</transparent>
<widget type="led" version="2.0.0">
<name>DTL2DTL3isolationConfirmed</name>
- <pv_name>TBD</pv_name>
<x>20</x>
<y>20</y>
<off_color>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob b/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob
index 18be20017db231d297e707ce1ec6bf2c70ce131f..9724a10b0a22609fc172fe36045e686c50b74eb0 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob
@@ -340,7 +340,6 @@
<transparent>true</transparent>
<widget type="led" version="2.0.0">
<name>DTL2DTL3isolationConfirmed</name>
- <pv_name>TBD</pv_name>
<x>20</x>
<y>20</y>
<off_color>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob b/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob
index 8b5dcf428c63c843bd6c209d6ca082fc786ce3f1..e0984691a8ad89482a9b2ea0139547d31a0e57e5 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob
@@ -340,7 +340,6 @@
<transparent>true</transparent>
<widget type="led" version="2.0.0">
<name>DTL2DTL3isolationConfirmed</name>
- <pv_name>TBD</pv_name>
<x>20</x>
<y>20</y>
<off_color>
diff --git a/NON-APPROVED/pss1-pss/symbols/alarms/error.svg b/NON-APPROVED/pss1-pss/symbols/alarms/error.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7b800a7607ef69cbb69249b2ed9b1455c91c20c8
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/alarms/error.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<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"
+ viewBox="0 0 14 14" style="enable-background:new 0 0 14 14;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#FC0D1B;}
+ .st1{fill:#960810;}
+ .st2{fill:#FFFFFF;}
+ .st3{fill:none;}
+</style>
+<g>
+ <circle class="st0" cx="7" cy="7" r="5.5"/>
+ <path class="st1" d="M7,2c2.8,0,5,2.2,5,5s-2.2,5-5,5S2,9.8,2,7S4.2,2,7,2 M7,1C3.7,1,1,3.7,1,7s2.7,6,6,6s6-2.7,6-6S10.3,1,7,1
+ L7,1z"/>
+</g>
+<g>
+ <g>
+ <path class="st2" d="M6.1,4.6c0-0.2-0.1-0.7-0.1-0.8C6.1,3.3,6.6,3,7,3c0.4,0,0.9,0.3,0.9,0.8c0,0.1,0,0.6-0.1,0.8L7.4,8.5
+ C7.3,9,7.3,9.1,7,9.1C6.7,9.1,6.7,9,6.6,8.5L6.1,4.6z"/>
+ </g>
+ <circle class="st2" cx="7" cy="10.3" r="0.7"/>
+</g>
+<rect x="1" y="1" class="st3" width="12" height="12"/>
+<rect class="st3" width="14" height="14"/>
+</svg>
diff --git a/NON-APPROVED/pss1-pss/symbols/alarms/unconnected.svg b/NON-APPROVED/pss1-pss/symbols/alarms/unconnected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0528f4fddf16477698437a7ab83f5d9a12ed0797
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/alarms/unconnected.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<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"
+ viewBox="0 0 14 14" style="enable-background:new 0 0 14 14;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#D32D9C;}
+ .st1{fill:#871D64;}
+ .st2{fill:#FFFFFF;}
+ .st3{fill:none;}
+</style>
+<g>
+ <rect x="1.5" y="1.5" class="st0" width="11" height="11"/>
+ <path class="st1" d="M12,2v10H2V2H12 M13,1H1v12h12V1L13,1z"/>
+</g>
+<g>
+ <g>
+ <path class="st2" d="M6.8,5.7L8.6,4c0,0,0.1,0,0.2,0L10,5.3c0,0,0,0.1,0,0.2L8.3,7.2L9.1,8l1.7-1.7c0.5-0.5,0.5-1.3,0-1.8L9.5,3.2
+ C9,2.7,8.2,2.7,7.7,3.2L6,4.9L6.8,5.7z"/>
+ <path class="st2" d="M7.2,8.3L5.4,10c0,0-0.1,0-0.2,0L4,8.7c0,0,0-0.1,0-0.2l1.7-1.7L4.9,6L3.2,7.7C2.7,8.2,2.7,9,3.2,9.5l1.3,1.3
+ c0.5,0.5,1.3,0.5,1.8,0L8,9.1L7.2,8.3z"/>
+ </g>
+ <g>
+ <g>
+ <path class="st2" d="M5,5.4c-0.1,0-0.2,0-0.3-0.1l-1-1c-0.1-0.1-0.1-0.4,0-0.5c0.1-0.1,0.4-0.1,0.5,0l1,1c0.1,0.1,0.1,0.4,0,0.5
+ C5.2,5.4,5.1,5.4,5,5.4z"/>
+ </g>
+ <g>
+ <path class="st2" d="M5.8,4.4C5.8,4.4,5.8,4.4,5.8,4.4C5.6,4.4,5.4,4.2,5.4,4l0-1.6c0-0.2,0.2-0.4,0.4-0.4c0,0,0,0,0,0
+ c0.2,0,0.4,0.2,0.4,0.4l0,1.6C6.2,4.2,6,4.4,5.8,4.4z"/>
+ </g>
+ <g>
+ <path class="st2" d="M2.4,6.2C2.2,6.2,2.1,6,2.1,5.8c0-0.2,0.2-0.4,0.4-0.4l1.6,0c0,0,0,0,0,0c0.2,0,0.4,0.2,0.4,0.4
+ C4.4,6,4.2,6.2,4,6.2L2.4,6.2C2.4,6.2,2.4,6.2,2.4,6.2z"/>
+ </g>
+ <g>
+ <path class="st2" d="M10,10.4c-0.1,0-0.2,0-0.3-0.1l-1-1c-0.1-0.1-0.1-0.4,0-0.5c0.1-0.1,0.4-0.1,0.5,0l1,1
+ c0.1,0.1,0.1,0.4,0,0.5C10.2,10.3,10.1,10.4,10,10.4z"/>
+ </g>
+ <g>
+ <path class="st2" d="M10,8.6c-0.2,0-0.4-0.2-0.4-0.4C9.6,8,9.8,7.8,10,7.8l1.6,0c0,0,0,0,0,0c0.2,0,0.4,0.2,0.4,0.4
+ c0,0.2-0.2,0.4-0.4,0.4L10,8.6C10,8.6,10,8.6,10,8.6z"/>
+ </g>
+ <g>
+ <path class="st2" d="M8.2,11.9C8.2,11.9,8.2,11.9,8.2,11.9c-0.2,0-0.4-0.2-0.4-0.4l0-1.6c0-0.2,0.2-0.4,0.4-0.4c0,0,0,0,0,0
+ c0.2,0,0.4,0.2,0.4,0.4l0,1.6C8.6,11.8,8.4,11.9,8.2,11.9z"/>
+ </g>
+ </g>
+</g>
+<rect x="1" y="1" class="st3" width="12" height="12"/>
+<rect class="st3" width="14" height="14"/>
+</svg>
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Left-right-BLACK.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Left-right-BLACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..2afef94ab841536db01ed71f636a28a732cb0be3
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Left-right-BLACK.png differ