From 5101bde0b3f6341909698e17886c031fcfdc56b7 Mon Sep 17 00:00:00 2001
From: Susanne Regnell <susanne.regnell@ess.eu>
Date: Wed, 25 Nov 2020 15:12:38 +0100
Subject: [PATCH] Revert "Merge branch 'master' into 'master'"
This reverts merge request !239
---
NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob | 4 ++--
NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
index c9dab453..f6a48312 100755
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
@@ -2083,11 +2083,11 @@
<name>WaterScreen_Button</name>
<actions>
<action type="open_display">
- <file>../../../../../../../../opt/opis/20-SystemExpert/10-ACC/999-TS2/99-WtrC/10-Top/P&ID.bob</file>
+ <file>../ts2-wtrc/ts2-wtrc.bob</file>
<macros>
<PLCName>TS2-010CRM:Cryo-PLC-001</PLCName>
</macros>
- <target>window</target>
+ <target>standalone</target>
<description>Open Display</description>
</action>
</actions>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob b/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
index f7ff82e8..0bdb5c8e 100644
--- a/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
+++ b/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
@@ -1221,8 +1221,8 @@
<WIDDev>PT</WIDDev>
<WIDDis>WtrC</WIDDis>
<WIDIndex>501</WIDIndex>
- <WIDLabel>Pressure</WIDLabel>
- <WIDSecSub>CWM-CWS05</WIDSecSub>
+ <WIDLabel>Temperature</WIDLabel>
+ <WIDSecSub>TS2-010CRM</WIDSecSub>
</macros>
<x>800</x>
<y>410</y>
@@ -1323,7 +1323,7 @@
<name>Action Button</name>
<actions>
<action type="open_display">
- <file>../../../../opis/20-SystemExpert/10-ACC/999-TS2/99-WtrC/10-Top/Overview.bob</file>
+ <file>CWM-CWS05/10-Top/Overview.bob</file>
<target>window</target>
<description>Open Display</description>
</action>
--
GitLab