diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index 41464b0ce02d58a08e670eb41f3b1028d634e381..cf2f891b29bfd67a4fa875b3c7b44dcb5d69e3b1 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -56,16 +56,16 @@
<wrap_words use_class="true">false</wrap_words>
</widget>
<widget type="group" version="2.0.0">
- <name>Top Left</name>
+ <name>Acknowledgement</name>
<x>20</x>
<y>73</y>
- <height>118</height>
+ <height>60</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>Background</name>
<width>300</width>
- <height>118</height>
+ <height>60</height>
<line_width>0</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -104,37 +104,18 @@
</font>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="label" version="2.0.0">
- <name>Occupancy</name>
- <text>Current occupancy:</text>
- <x>26</x>
- <y>64</y>
- <width>131</width>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>AccPSS:PSS-Area-1:Occupancy</name>
- <pv_name>AccPSS:PSS-Area-1:Occupancy</pv_name>
- <x>167</x>
- <y>63</y>
- <width>110</width>
- <height>30</height>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</widget>
<widget type="group" version="2.0.0">
<name>Mode of Operation</name>
<x>20</x>
- <y>211</y>
- <height>130</height>
+ <y>153</y>
+ <height>120</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>Background</name>
<width>300</width>
- <height>130</height>
+ <height>120</height>
<line_width>0</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -163,23 +144,23 @@
<name>Operation Mode</name>
<file>embedded_displays/operation_mode.bob</file>
<x>40</x>
- <y>57</y>
+ <y>50</y>
<width>220</width>
<height>50</height>
<resize>2</resize>
</widget>
</widget>
<widget type="group" version="2.0.0">
- <name>Diagnostics</name>
+ <name>Occupancy</name>
<x>20</x>
- <y>361</y>
- <height>130</height>
+ <y>293</y>
+ <height>60</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>Background</name>
<width>300</width>
- <height>130</height>
+ <height>60</height>
<line_width>0</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -193,72 +174,33 @@
<corner_height>10</corner_height>
</widget>
<widget type="label" version="2.0.0">
- <name>Diagnostics</name>
- <text>Diagnostics</text>
- <width>300</width>
- <height>50</height>
+ <name>Occupancy</name>
+ <text>Current occupancy:</text>
+ <x>5</x>
+ <y>16</y>
+ <width>152</width>
<font>
- <font family="Source Sans Pro" style="BOLD" size="21.0">
+ <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
</font>
</font>
- <horizontal_alignment>1</horizontal_alignment>
+ <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>Open Diagnostics</name>
- <actions>
- <action type="open_display">
- <file>PSS1_PSS_Diagnostics.bob</file>
- <target>window</target>
- <description>Open Diagnostics</description>
- </action>
- </actions>
- <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
- <text>Open</text>
- <x>40</x>
- <y>55</y>
- <width>220</width>
- <height>50</height>
- <font>
- <font family="Source Sans Pro Semibold" style="REGULAR" size="18.0">
- </font>
- </font>
- <rules>
- <rule name="Diagnostics Alarm Background" prop_id="background_color" out_exp="false">
- <exp bool_exp="pvInt0">
- <value>
- <color name="ERROR" red="252" green="13" blue="27">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- <rule name="Diagnostics Alarm Foreground" prop_id="foreground_color" out_exp="false">
- <exp bool_exp="pvInt0">
- <value>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- <rule name="Diagnostics Alarm Font" prop_id="font" out_exp="false">
- <exp bool_exp="pvInt0">
- <value>
- <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <tooltip>$(actions)</tooltip>
+ <widget type="textupdate" version="2.0.0">
+ <name>AccPSS:PSS-Area-1:Occupancy</name>
+ <pv_name>AccPSS:PSS-Area-1:Occupancy</pv_name>
+ <x>167</x>
+ <y>16</y>
+ <width>110</width>
+ <height>30</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
</widget>
</widget>
<widget type="group" version="2.0.0">
<name>Permits</name>
<x>20</x>
- <y>511</y>
+ <y>373</y>
<height>459</height>
<style>3</style>
<font>
@@ -658,6 +600,92 @@
<tooltip>$(actions)</tooltip>
</widget>
</widget>
+ <widget type="group" version="2.0.0">
+ <name>Diagnostics</name>
+ <x>20</x>
+ <y>852</y>
+ <height>130</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>Background</name>
+ <width>300</width>
+ <height>130</height>
+ <line_width>0</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Diagnostics</name>
+ <text>Diagnostics</text>
+ <width>300</width>
+ <height>50</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD" size="21.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Open Diagnostics</name>
+ <actions>
+ <action type="open_display">
+ <file>PSS1_PSS_Diagnostics.bob</file>
+ <target>window</target>
+ <description>Open Diagnostics</description>
+ </action>
+ </actions>
+ <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
+ <text>Open</text>
+ <x>40</x>
+ <y>55</y>
+ <width>220</width>
+ <height>50</height>
+ <font>
+ <font family="Source Sans Pro Semibold" style="REGULAR" size="18.0">
+ </font>
+ </font>
+ <rules>
+ <rule name="Diagnostics Alarm Background" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ <rule name="Diagnostics Alarm Foreground" prop_id="foreground_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ <rule name="Diagnostics Alarm Font" prop_id="font" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ </widget>
<widget type="symbol" version="2.0.0">
<name>map solid</name>
<symbols>
@@ -720,10 +748,10 @@
</widget>
<widget type="group" version="2.0.0">
<name>Occupancy warning</name>
- <x>339</x>
- <y>73</y>
- <width>296</width>
- <height>118</height>
+ <x>340</x>
+ <y>278</y>
+ <width>272</width>
+ <height>92</height>
<style>3</style>
<transparent>true</transparent>
<rules>
@@ -736,8 +764,8 @@
</rules>
<widget type="rectangle" version="2.0.0">
<name>Background</name>
- <width>296</width>
- <height>118</height>
+ <width>272</width>
+ <height>92</height>
<line_color>
<color name="RED-BORDER" red="150" green="8" blue="16">
</color>
@@ -751,10 +779,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Warning</name>
- <text>The occupancy number in the controlled area is >= 10</text>
- <y>8</y>
- <width>296</width>
- <height>60</height>
+ <text>The occupancy number is >= 10</text>
+ <y>4</y>
+ <width>272</width>
+ <height>46</height>
<font>
<font name="MEDIUM-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="18.0">
</font>
@@ -774,8 +802,8 @@ ScriptUtil.findWidgetByName(widget, "Occupancy warning").setPropertyValue("visib
</action>
</actions>
<text>Hide</text>
- <x>102</x>
- <y>73</y>
+ <x>90</x>
+ <y>49</y>
<font>
<font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
</font>
@@ -785,7 +813,7 @@ ScriptUtil.findWidgetByName(widget, "Occupancy warning").setPropertyValue("visib
</widget>
<widget type="group" version="2.0.0">
<name>HMI Usage</name>
- <x>657</x>
+ <x>340</x>
<y>73</y>
<width>296</width>
<height>55</height>
@@ -1107,6 +1135,60 @@ ScriptUtil.findWidgetByName(widget, "Occupancy warning").setPropertyValue("visib
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
+ <widget type="group" version="2.0.0">
+ <name>Key exchange</name>
+ <x>1380</x>
+ <y>320</y>
+ <width>200</width>
+ <height>50</height>
+ <style>3</style>
+ <widget type="action_button" version="3.0.0">
+ <name>Background</name>
+ <text></text>
+ <width>200</width>
+ <height>50</height>
+ <tooltip></tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title</name>
+ <text>Key Exchange</text>
+ <x>60</x>
+ <width>130</width>
+ <height>50</height>
+ <font>
+ <font family="Source Code Pro Semibold" style="REGULAR" size="16.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="HEADER-TEXT" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
+ <widget type="picture" version="2.0.0">
+ <name>Picture</name>
+ <file>symbols/Key/Key-black@256.png</file>
+ <y>5</y>
+ <width>60</width>
+ <height>40</height>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="open_display">
+ <file>popups/key_exchange.bob</file>
+ <target>window</target>
+ <description>Open Display</description>
+ </action>
+ </actions>
+ <text></text>
+ <width>200</width>
+ <height>50</height>
+ <transparent>true</transparent>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ </widget>
<widget type="embedded" version="2.0.0">
<name>AMM G0102</name>
<macros>
@@ -1929,11 +2011,11 @@ Exit Door 1</text>
<x>1633</x>
<y>826</y>
<off_color>
- <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+ <color name="OK" red="61" green="216" blue="61">
</color>
</off_color>
<on_color>
- <color name="OK" red="61" green="216" blue="61">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</on_color>
<border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/waveguide.bob b/NON-APPROVED/pss1-pss/embedded_displays/waveguide.bob
index f166a0d30fe3ca5faba180fcca632952294a2907..f6e8aa5621c7ae8878dce2fa627a0587d5abef8e 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/waveguide.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/waveguide.bob
@@ -47,16 +47,11 @@
</on_color>
<square>true</square>
<rules>
- <rule name="XPos" prop_id="x" out_exp="false">
- <exp bool_exp="pvInt0">
- <value>40</value>
- </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>
+ <expression>not pvInt0 and not pvInt1</expression>
</exp>
+ <pv_name>$(pv_name)</pv_name>
<pv_name>$(SCP_INSTALLED_PV)</pv_name>
</rule>
</rules>
diff --git a/NON-APPROVED/pss1-pss/popups/PSS1_Legend.bob b/NON-APPROVED/pss1-pss/popups/PSS1_Legend.bob
index 2e418cb7a7dc353b5187c3c452eeeeaa56f9664b..3dcd9d2e057ce310362b14624258dfd17f33ae3a 100644
--- a/NON-APPROVED/pss1-pss/popups/PSS1_Legend.bob
+++ b/NON-APPROVED/pss1-pss/popups/PSS1_Legend.bob
@@ -483,6 +483,14 @@ Major fault</text>
<width>40</width>
<height>40</height>
<initial_index>1</initial_index>
+ <rules>
+ <rule name="Blinking" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>sim://flipflop</pv_name>
+ </rule>
+ </rules>
<tooltip></tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
@@ -506,14 +514,6 @@ Major fault</text>
<width>40</width>
<height>40</height>
<initial_index>1</initial_index>
- <rules>
- <rule name="Blinking" prop_id="visible" out_exp="true">
- <exp bool_exp="True">
- <expression>pvInt0</expression>
- </exp>
- <pv_name>sim://flipflop</pv_name>
- </rule>
- </rules>
<tooltip></tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
index e0238096f9e39a217c6bbf2a503f03b3b0c8a363..7aaa2a4645ec0adad4ba26c5d5ff92494c1d65af 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>Ion source HV PS and grounding relay</name>
<width>690</width>
- <height>330</height>
+ <height>290</height>
<grid_visible>false</grid_visible>
<widget type="rectangle" version="2.0.0">
<name>Title Rectangle_1</name>
@@ -39,7 +39,7 @@
<name>Grounding Relay</name>
<x>30</x>
<y>80</y>
- <height>220</height>
+ <height>180</height>
<style>3</style>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -48,7 +48,7 @@
<widget type="rectangle" version="2.0.0">
<name>GR-titlebar</name>
<width>300</width>
- <height>220</height>
+ <height>180</height>
<line_width>2</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -79,13 +79,13 @@
<x>10</x>
<y>30</y>
<width>280</width>
- <height>180</height>
+ <height>140</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>GR-background</name>
<width>280</width>
- <height>180</height>
+ <height>140</height>
<line_width>2</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -104,25 +104,7 @@
<x>20</x>
<y>20</y>
<off_color>
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </off_color>
- </widget>
- <widget type="label" version="2.0.0">
- <name>LB_Grly_ConnectedToGround</name>
- <text>Connected to ground</text>
- <x>46</x>
- <y>20</y>
- <width>230</width>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="led" version="2.0.0">
- <name>Grly_ConnectedToGround</name>
- <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
- <x>20</x>
- <y>60</y>
- <off_color>
- <color name="LED-RED-ON" red="255" green="60" blue="46">
+ <color name="GREEN" red="61" green="216" blue="61">
</color>
</off_color>
<on_color>
@@ -131,10 +113,10 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_Grly_ConnectedToGround_1</name>
- <text>Disconnected from ground</text>
+ <name>LB_Grly_ConnectedToGround</name>
+ <text>Connected to ground</text>
<x>46</x>
- <y>60</y>
+ <y>20</y>
<width>230</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -142,7 +124,7 @@
<name>Grly_fbkError</name>
<pv_name>AccPSS-Z0:PSS-GRly-1:Grly_fbkError</pv_name>
<x>20</x>
- <y>100</y>
+ <y>60</y>
<off_color>
<color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
@@ -156,7 +138,7 @@
<name>LB_Grly_fbkError</name>
<text>Feedback error in grounding relay</text>
<x>46</x>
- <y>100</y>
+ <y>60</y>
<width>230</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -164,7 +146,7 @@
<name>Grly_fbkErrorGrCr</name>
<pv_name>FEB-010Row:CnPw-U-007:Grly_fbkErrorGrCr</pv_name>
<x>20</x>
- <y>140</y>
+ <y>100</y>
<off_color>
<color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
@@ -178,7 +160,7 @@
<name>LB_Grly_fbkErrorGrCr</name>
<text>Feedback error in control relay</text>
<x>46</x>
- <y>140</y>
+ <y>100</y>
<width>230</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -188,7 +170,7 @@
<name>HV PS</name>
<x>360</x>
<y>80</y>
- <height>220</height>
+ <height>180</height>
<style>3</style>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -197,7 +179,7 @@
<widget type="rectangle" version="2.0.0">
<name>HVPS-titlebar</name>
<width>300</width>
- <height>220</height>
+ <height>180</height>
<line_width>2</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -228,13 +210,13 @@
<x>10</x>
<y>30</y>
<width>280</width>
- <height>180</height>
+ <height>140</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>HVPS-background</name>
<width>280</width>
- <height>180</height>
+ <height>140</height>
<line_width>2</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">