From 37d5c8b4fa8f6228a7d4a0e3bec723123d77ee39 Mon Sep 17 00:00:00 2001
From: Emanuele Laface <emanuele.laface@esss.se>
Date: Fri, 27 Mar 2020 12:09:52 +0100
Subject: [PATCH] Fix alarms in ODH
---
PythonServer/screens/odh.py | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/PythonServer/screens/odh.py b/PythonServer/screens/odh.py
index e142bae..0929fe2 100755
--- a/PythonServer/screens/odh.py
+++ b/PythonServer/screens/odh.py
@@ -114,14 +114,12 @@ class odhScreen(Thread):
status = False
if epics_dict[pv[0:-6] + "DHWarning"].connected:
- json_dict[pv]["status"] += epics_dict[
- pv[0:-6] + "DHWarning"
- ].value
+ if epics_dict[pv[0:-6] + "DHWarning"].value == 1:
+ json_dict[pv]["status"] = 1
status = True
if epics_dict[pv[0:-6] + "DHAlarm"].connected:
- json_dict[pv]["status"] += epics_dict[
- pv[0:-6] + "DHAlarm"
- ].value
+ if epics_dict[pv[0:-6] + "DHAlarm"].value == 1:
+ json_dict[pv]["status"] = 2
status = True
if not status:
json_dict[pv]["status"] = 3
--
GitLab