From 3c22e7daf29b8bc8d41adbb8420aed0ad2d65ae6 Mon Sep 17 00:00:00 2001
From: Thomas Juerges <4-jurges@users.noreply.git.astron.nl>
Date: Thu, 19 Nov 2020 19:15:54 +0100
Subject: [PATCH] Correct a handful of bugs to make it work with Paulus' server
---
RCUSCC/RCUSCC/RCUSCC.py | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/RCUSCC/RCUSCC/RCUSCC.py b/RCUSCC/RCUSCC/RCUSCC.py
index 9db2f942b..8af704045 100644
--- a/RCUSCC/RCUSCC/RCUSCC.py
+++ b/RCUSCC/RCUSCC/RCUSCC.py
@@ -270,7 +270,7 @@ class RCUSCC(Device):
self.name_space_index = 2
self.obj_node = self.client.get_objects_node()
- self.pcc_node = self.pcc_node.get_child([ "{}:PCC".format(self.name_space_index)])
+ self.pcc_node = self.obj_node.get_child([ "{}:PCC".format(self.name_space_index)])
self.debug_stream("Mapping OPC-UA MP/CP to attributes...")
@@ -306,13 +306,13 @@ class RCUSCC(Device):
self.attribute_mapping["RCU01_Dither2_Frequency_RW"] = self.pcc_node.get_child(["{}:RCU01_Dither2_Frequency_RW".format(self.name_space_index)])
- self.attribute_mapping["RCU01_LED0_R"] = self.obj_node.get_child([ "{}:RCU01_LED0_R".format(self.name_space_index)])
+ self.attribute_mapping["RCU01_LED0_R"] = self.pcc_node.get_child([ "{}:RCU01_LED0_R".format(self.name_space_index)])
- self.attribute_mapping["RCU01_LED0_RW"] = self.obj_node.get_child([ "{}:RCU01_LED0_RW".format(self.name_space_index)])
+ self.attribute_mapping["RCU01_LED0_RW"] = self.pcc_node.get_child([ "{}:RCU01_LED0_RW".format(self.name_space_index)])
self.attribute_mapping["RCU01_Pwr_dig_R"] = self.pcc_node.get_child([ "{}:RCU01_Pwr_dig_R".format(self.name_space_index)])
- self.attribute_mapping["RCU01_Pwr_dig_RW"] = self.pcc_node.get_child([ "{}:_RCU01_Pwr_dig_RW".format(self.name_space_index)])
+ self.attribute_mapping["RCU01_Pwr_dig_RW"] = self.pcc_node.get_child([ "{}:RCU01_Pwr_dig_RW".format(self.name_space_index)])
self.attribute_mapping["RCU01_Temp_R"] = self.pcc_node.get_child([ "{}:RCU01_Temp_R".format(self.name_space_index)])
@@ -461,6 +461,27 @@ class RCUSCC(Device):
self._RCU01_Band2_RW = value
# PROTECTED REGION END # // RCUSCC.RCU01_Band2_RW_write
+ def read_RCU01_Band3_R(self):
+ # PROTECTED REGION ID(RCUSCC.RCU01_Band3_R_read) ENABLED START #
+ """Return the RCU01_Band3_R attribute."""
+ self._RCU01_Band3_R = self.attribute_mapping["RCU01_Band3_R"].get_value()
+ return self._RCU01_Band3_R
+ # PROTECTED REGION END # // RCUSCC.RCU01_Band3_R_read
+
+ def read_RCU01_Band3_RW(self):
+ # PROTECTED REGION ID(RCUSCC.RCU01_Band3_RW_read) ENABLED START #
+ """Return the RCU01_Band3_R attribute."""
+ self._RCU01_Band3_RW = self.attribute_mapping["RCU01_Band3_RW"].get_value()
+ return self._RCU01_Band3_RW
+ # PROTECTED REGION END # // RCUSCC.RCU01_Band3_RW_read
+
+ def write_RCU01_Band3_RW(self, value):
+ # PROTECTED REGION ID(RCUSCC.RCU01_Band3_RW_write) ENABLED START #
+ """Set the RCU01_Band3_RW attribute."""
+ self.attribute_mapping["RCU01_Band3_RW"].set_value(value)
+ self._RCU01_Band3_RW = value
+ # PROTECTED REGION END # // RCUSCC.RCU01_Band3_RW_write
+
def read_RCU01_Dither1_Frequency_R(self):
# PROTECTED REGION ID(RCUSCC.RCU01_Dither1_Frequency_R_read) ENABLED START #
"""Return the RCU01_Dither1_Frequency_R attribute."""
--
GitLab