From dd1958d67f4d85c89662bb49f8d780353a21cd6e Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 4 Dec 2020 13:50:40 +0100
Subject: [PATCH] Touchups.
---
RCUSCC/RCUSCC/RCUSCC.py | 43 ++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/RCUSCC/RCUSCC/RCUSCC.py b/RCUSCC/RCUSCC/RCUSCC.py
index cfde3d46b..d14d3c04e 100644
--- a/RCUSCC/RCUSCC/RCUSCC.py
+++ b/RCUSCC/RCUSCC/RCUSCC.py
@@ -49,11 +49,9 @@ def only_when_on(func):
return when_on_wrapper
-def fault_on_opcua_error(func):
+def fault_on_error(func):
"""
- Wrapper to catch exceptions generated by the OPC-UA connection.
-
- Sets the device in a FAULT state if that occurs.
+ Wrapper to catch exceptions. Sets the device in a FAULT state if any occurs.
"""
@wraps(func)
@@ -69,7 +67,8 @@ def fault_on_opcua_error(func):
class OPCUAConnection(Thread):
"""
- Run a connector function in the background, until it succeeds.
+ Connects to OPC-UA in the foreground or background, and sends HELLO
+ messages to keep a check on the connection. On connection failure, reconnects once.
"""
def __init__(self, client, on_func, fault_func, streams, try_interval=2):
@@ -410,21 +409,21 @@ class RCUSCC(Device):
# ------------------
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_Attenuator_R(self):
"""Return the Attenuator_R attribute."""
self._Attenuator_R = numpy.array([self.attribute_mapping["Attenuator_R"][0].get_value(), self.attribute_mapping["Attenuator_R"][1].get_value(), self.attribute_mapping["Attenuator_R"][2].get_value()])
return self._Attenuator_R
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_Attenuator_RW(self):
"""Return the Attenuator_R attribute."""
self._Attenuator_RW = numpy.array([self.attribute_mapping["Attenuator_RW"][0].get_value(), self.attribute_mapping["Attenuator_RW"][1].get_value(), self.attribute_mapping["Attenuator_RW"][2].get_value()])
return self._Attenuator_RW
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def write_Attenuator_RW(self, value):
"""Set the Attenuator_RW attribute."""
self.attribute_mapping["Attenuator_RW"][0].set_value(value[0].tolist())
@@ -433,21 +432,21 @@ class RCUSCC(Device):
self._Attenuator_RW = value
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_Band_R(self):
"""Return the Band_R attribute."""
self._Band_R = numpy.array([self.attribute_mapping["Band_R"][0].get_value(), self.attribute_mapping["Band_R"][1].get_value(), self.attribute_mapping["Band_R"][2].get_value()])
return self._Band_R
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_Band_RW(self):
"""Return the Band_R attribute."""
self._Band_RW = numpy.array([self.attribute_mapping["Band_RW"][0].get_value(), self.attribute_mapping["Band_RW"][1].get_value(), self.attribute_mapping["Band_RW"][2].get_value()])
return self._Band_RW
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def write_Band_RW(self, value):
"""Set the Band_RW attribute."""
self.attribute_mapping["Band_RW"][0].set_value(value[0].tolist())
@@ -456,28 +455,28 @@ class RCUSCC(Device):
self._Band_RW = value
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_ADC_JESD_R(self):
- """Return the Band_R attribute."""
+ """Return the ADC_JESD_R attribute."""
self._ADC_JESD_R = numpy.array([self.attribute_mapping["ADC_JESD_R"][0].get_value(), self.attribute_mapping["ADC_JESD_R"][1].get_value(), self.attribute_mapping["ADC_JESD_R"][2].get_value()])
return self._ADC_JESD_R
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_Dither_Frequency_R(self):
"""Return the Dither_Frequency_R attribute."""
self._Dither_Frequency_R = numpy.array([self.attribute_mapping["Dither_Frequency_R"][0].get_value(), self.attribute_mapping["Dither_Frequency_R"][1].get_value()])
return self._Dither_Frequency_R
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_Dither_Frequency_RW(self):
"""Return the Dither_Frequency_R attribute."""
self._Dither_Frequency_RW = numpy.array([self.attribute_mapping["Dither_Frequency_RW"][0].get_value(), self.attribute_mapping["Dither_Frequency_RW"][1].get_value()])
return self._Dither_Frequency_RW
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def write_Dither_Frequency_RW(self, value):
"""Set the Dither_Frequency_RW attribute."""
self.attribute_mapping["Dither_Frequency_RW"][0].set_value(value[0].tolist())
@@ -485,42 +484,42 @@ class RCUSCC(Device):
self._Dither_Frequency_RW = value
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_LED_R(self):
"""Return the LED_R attribute."""
self._LED_R = self.attribute_mapping["LED_R"].get_value()
return self._LED_R
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_LED_RW(self):
"""Return the LED_RW attribute."""
self._LED_RW = self.attribute_mapping["LED_RW"].get_value()
return self._LED_RW
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def write_LED_RW(self, value):
"""Set the LED_RW attribute."""
self.attribute_mapping["LED_RW"].set_value(value.tolist())
self._LED_RW = value
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_Pwr_dig_R(self):
"""Return the Pwr_dig_R attribute."""
self._Pwr_dig_R = self.attribute_mapping["Pwr_dig_R"].get_value()
return self._Pwr_dig_R
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_Temperature_R(self):
"""Return the Temperature_R attribute."""
self._Temperature_R = self.attribute_mapping["Temperature_R"].get_value()
return self._Temperature_R
@only_when_on
- @fault_on_opcua_error
+ @fault_on_error
def read_CLK_PLL_locked_R(self):
"""Return the CLK_PLL_locked_R attribute."""
self._CLK_PLL_locked_R = self.attribute_mapping["CLK_PLL_locked_R"].get_value()
--
GitLab