From d957390b9ea75df062c6d22a087be36c6fc24d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Thu, 19 Nov 2020 16:07:23 +0100
Subject: [PATCH] Updates:
ISrc grounding
Waveguide SCP
TSW key
Acknowledgement required
---
NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob | 380 +++++++++++++++---------
1 file changed, 238 insertions(+), 142 deletions(-)
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index b5423478..225cb49b 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -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>
@@ -1303,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>
@@ -1641,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>
@@ -1752,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">
@@ -1780,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">
@@ -1808,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">
@@ -1836,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">
@@ -1864,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>
@@ -1928,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">
@@ -2385,29 +2375,135 @@ Door</text>
</rule>
</rules>
</widget>
- <widget type="symbol" version="2.0.0">
+ <widget type="embedded" version="2.0.0">
+ <name>Operation Mode</name>
+ <file>embedded_displays/operation_mode.bob</file>
+ <x>35</x>
+ <y>185</y>
+ <width>960</width>
+ <height>56</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="group" version="2.0.0">
<name>Grly_ConnectedToGround</name>
- <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
<x>749</x>
<y>661</y>
<width>46</width>
<height>40</height>
+ <style>3</style>
+ <transparent>true</transparent>
<rules>
<rule name="Visibility" prop_id="visible" out_exp="true">
<exp bool_exp="True">
<expression>pvInt0</expression>
</exp>
- <pv_name>$(pv_name)</pv_name>
+ <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>5</y>
+ <width>3</width>
+ <height>15</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="15.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Lower Line </name>
+ <x>5</x>
+ <y>15</y>
+ <width>36</width>
+ <height>5</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="5.0">
+ </point>
+ <point x="36.0" y="5.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>
+ </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>
- <widget type="embedded" version="2.0.0">
- <name>Operation Mode</name>
- <file>embedded_displays/operation_mode.bob</file>
- <x>35</x>
- <y>185</y>
- <width>960</width>
- <height>56</height>
- <resize>2</resize>
+ <widget 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>
--
GitLab