From ba9f179504740ecc45044cd1569677f04f99bcb8 Mon Sep 17 00:00:00 2001
From: Marko Mecina <marko.mecina@univie.ac.at>
Date: Tue, 12 Sep 2023 18:15:46 +0200
Subject: [PATCH] Communication module: fix return format of generic processing
function
---
Ccs/communication.py | 4 ++--
Ccs/scripts/iwf_egse_template.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Ccs/communication.py b/Ccs/communication.py
index 766f290..576ab8a 100644
--- a/Ccs/communication.py
+++ b/Ccs/communication.py
@@ -288,7 +288,7 @@ class Receiver:
continue
except Exception as err:
print('Processing error:', err)
- break
+ self._isrunning = False
print('Processing stopped')
self.proc_data_fd.close()
@@ -327,4 +327,4 @@ def proc_func_generic(data, ts=None):
else:
ts = '{:.6f}'.format(ts)
- return [(ts, str(data))]
+ return [ts, str(data)]
diff --git a/Ccs/scripts/iwf_egse_template.py b/Ccs/scripts/iwf_egse_template.py
index ff67c58..fe29d02 100644
--- a/Ccs/scripts/iwf_egse_template.py
+++ b/Ccs/scripts/iwf_egse_template.py
@@ -19,7 +19,7 @@ econ.send(iwf.Command.set_psu_ok_signal(1,1), rx=False) # set IWF_EGSE_PSU_OK =
econ.send(iwf.Command.set_psu_ok_signal(3,1), rx=False) # set IWF_EGSE_RSE_OK = 1
econ.send(iwf.Command.set_psu_ok_signal(4,1), rx=False) # set IWF_EGSE_PIN_PULL_OK = 1
econ.send(iwf.Command.set_rsm_end_switch(1,1), rx=False) # set IWF_EGSE_CLOSE_POS = 1; response 'R7' -> only for EBOX
-econ.send(iwf.Command.set_psu_analogue_value(iwf.Signal.EGSE_I_HEATER, 0), rx=False) # set IWF_EGSE_I_HEATER
+econ.send(iwf.Command.set_psu_analogue_value(iwf.Signal.EGSE_I_HEATER, 2000), rx=False) # set IWF_EGSE_I_HEATER
econ.send(iwf.Command.set_pwm(2, 1663), rx=False) # set CCD Thermistor
econ.send(iwf.Command.inject_errors(6,0,3,0,11,0), rx=False) # inject RSE error
--
GitLab