From 52432b917f32eb28f495c6771696fa6edfc978bb Mon Sep 17 00:00:00 2001 From: Thomas Juerges <4-jurges@users.noreply.git.astron.nl> Date: Thu, 26 Nov 2020 14:06:15 +0100 Subject: [PATCH] Remove Pwr_dig_RW MP --- CDB/LOFAR_ConfigDb.json | 11 ----------- CDB/thomas_ConfigDb.json | 11 ----------- RCUSCC/RCUSCC/RCUSCC.py | 24 ------------------------ 3 files changed, 46 deletions(-) diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json index ff1951244..927cd0830 100644 --- a/CDB/LOFAR_ConfigDb.json +++ b/CDB/LOFAR_ConfigDb.json @@ -195,15 +195,6 @@ "1" ] }, - "Pwr_dig_RW": { - "event_period": [ - "0" - ], - "rel_change": [ - "-1", - "1" - ] - }, "Temp_R": { "event_period": [ "0" @@ -279,8 +270,6 @@ "0", "pwr_dig_r", "0", - "pwr_dig_rw", - "0", "temp_r", "0", "state", diff --git a/CDB/thomas_ConfigDb.json b/CDB/thomas_ConfigDb.json index a497ada24..6888a539c 100644 --- a/CDB/thomas_ConfigDb.json +++ b/CDB/thomas_ConfigDb.json @@ -195,15 +195,6 @@ "1" ] }, - "Pwr_dig_RW": { - "event_period": [ - "0" - ], - "rel_change": [ - "-1", - "1" - ] - }, "Temp_R": { "event_period": [ "0" @@ -279,8 +270,6 @@ "0", "pwr_dig_r", "0", - "pwr_dig_rw", - "0", "temp_r", "0", "state", diff --git a/RCUSCC/RCUSCC/RCUSCC.py b/RCUSCC/RCUSCC/RCUSCC.py index cb5136b2e..8460c7b44 100644 --- a/RCUSCC/RCUSCC/RCUSCC.py +++ b/RCUSCC/RCUSCC/RCUSCC.py @@ -164,11 +164,6 @@ class RCUSCC(Device): dtype='DevLong64', ) -# Pwr_dig_RW = attribute( -# dtype='DevLong64', -# access=AttrWriteType.READ_WRITE, -# ) -# # Temp_R = attribute( # dtype='DevDouble', # ) @@ -247,9 +242,6 @@ class RCUSCC(Device): self._Pwr_dig_R = 0 self.attribute_mapping["Pwr_dig_R"] = {} -# self._Pwr_dig_RW = 0 -# self.attribute_mapping["Pwr_dig_RW"] = {} -# # self._Temp_R = 0 # self.attribute_mapping["Temp_R"] = {} # @@ -312,8 +304,6 @@ class RCUSCC(Device): self.attribute_mapping["Pwr_dig_R"] = self.pcc_node.get_child(["{}:RCU{:02d}_Pwr_dig_R".format(self.name_space_index, self.RCU)]) -# self.attribute_mapping["Pwr_dig_RW"] = self.pcc_node.get_child(["{}:RCU{:02d}_Pwr_dig_RW".format(self.name_space_index, self.RCU)]) -# # self.attribute_mapping["Temp_R"] = self.pcc_node.get_child(["{}:RCU{:02d}_Temp_R".format(self.name_space_index, self.RCU)]) # # self.attribute_mapping["RCU_off"] = self.pcc_node.get_child(["{}:RCU{:02d}_RCU_off".format(self.name_space_index, self.RCU)]) @@ -549,20 +539,6 @@ class RCUSCC(Device): return self._Pwr_dig_R # PROTECTED REGION END # // RCUSCC.Pwr_dig_R_read -# def read_Pwr_dig_RW(self): -# # PROTECTED REGION ID(RCUSCC.Pwr_dig_RW_read) ENABLED START # -# """Return the Pwr_dig_RW attribute.""" -# self._Pwr_dig_RW = self.attribute_mapping["Pwr_dig_RW"].get_value() -# return self._Pwr_dig_RW -# # PROTECTED REGION END # // RCUSCC.Pwr_dig_RW_read -# -# def write_Pwr_dig_RW(self, value): -# # PROTECTED REGION ID(RCUSCC.Pwr_dig_RW_write) ENABLED START # -# """Set the Pwr_dig_RW attribute.""" -# self.attribute_mapping["Pwr_dig_RW"].set_value(value) -# self._Pwr_dig_RW = value -# # PROTECTED REGION END # // RCUSCC.Pwr_dig_RW_write -# # def read_Temp_R(self): # # PROTECTED REGION ID(RCUSCC.Temp_R_read) ENABLED START # # """Return the Temp_R attribute.""" -- GitLab