From 88d718e7ea8baf52960c4b5c4dc38964d6b26a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Tue, 17 Nov 2020 17:48:42 +0100
Subject: [PATCH] Updated
---
NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob | 17 +++++++----------
.../diagnostics/plc_software.bob | 6 +++---
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index 5df43f73..5305971b 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -448,7 +448,7 @@
<x>30</x>
<y>70</y>
<width>280</width>
- <height>49</height>
+ <height>26</height>
<style>3</style>
<widget type="led" version="2.0.0">
<name>PSSAckRequired</name>
@@ -488,34 +488,31 @@
<height>37</height>
<rules>
<rule name="Diagnostics Alarm Background" prop_id="background_color" out_exp="false">
- <exp bool_exp="pvInt0 or not pvInt1">
+ <exp bool_exp="pvInt0">
<value>
<color name="ERROR" red="252" green="13" blue="27">
</color>
</value>
</exp>
- <pv_name>$(SEC)-$(SUBSEC):$(DIS)-PLC-1:Sys_Stat</pv_name>
- <pv_name>$(SEC)-$(SUBSEC):$(DIS)-GPLC-1:AliveR</pv_name>
+ <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
</rule>
<rule name="Diagnostics Alarm Foreground" prop_id="foreground_color" out_exp="false">
- <exp bool_exp="pvInt0 or not pvInt1">
+ <exp bool_exp="pvInt0">
<value>
<color name="WHITE" red="255" green="255" blue="255">
</color>
</value>
</exp>
- <pv_name>$(SEC)-$(SUBSEC):$(DIS)-PLC-1:Sys_Stat</pv_name>
- <pv_name>$(SEC)-$(SUBSEC):$(DIS)-GPLC-1:AliveR</pv_name>
+ <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
</rule>
<rule name="Diagnostics Alarm Font" prop_id="font" out_exp="false">
- <exp bool_exp="pvInt0 or not pvInt1">
+ <exp bool_exp="pvInt0">
<value>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</value>
</exp>
- <pv_name>$(SEC)-$(SUBSEC):$(DIS)-PLC-1:Sys_Stat</pv_name>
- <pv_name>$(SEC)-$(SUBSEC):$(DIS)-GPLC-1:AliveR</pv_name>
+ <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
</rule>
</rules>
<tooltip>$(actions)</tooltip>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob
index acbac277..ef5697c7 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob
@@ -88,7 +88,7 @@
<name>Safety F-Signature</name>
<text>Safety F-Signature:</text>
<x>6</x>
- <y>56</y>
+ <y>59</y>
<width>174</width>
<font>
<font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -105,8 +105,8 @@
<name>FSignature</name>
<pv_name>$(PLC):SafetySW_FSignature</pv_name>
<x>186</x>
- <y>56</y>
- <width>154</width>
+ <y>59</y>
+ <width>181</width>
<foreground_color>
<color name="ORANGE-BORDER" red="153" green="117" blue="49">
</color>
--
GitLab