From 0ba8eaf3b0e9cf3c0b1e83e3d063068a6623285b Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Thu, 28 Oct 2021 17:01:20 +0200 Subject: [PATCH] L2SS-392: Resync command list with those now available on the hardware. --- .../tangostationcontrol/devices/apsct.py | 18 ++++------------- .../tangostationcontrol/devices/recv.py | 8 ++++---- .../tangostationcontrol/devices/unb2.py | 20 +++++++++++++++++++ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/tangostationcontrol/tangostationcontrol/devices/apsct.py b/tangostationcontrol/tangostationcontrol/devices/apsct.py index 78a0626d8..b32c5d0c8 100644 --- a/tangostationcontrol/tangostationcontrol/devices/apsct.py +++ b/tangostationcontrol/tangostationcontrol/devices/apsct.py @@ -103,32 +103,22 @@ class APSCT(opcua_device): @command() @DebugIt() @only_when_on() - def CLK_off(self): + def APSCT_off(self): """ :return:None """ - self.opcua_connection.call_method(["CLK_off"]) + self.opcua_connection.call_method(["APSCT_off"]) @command() @DebugIt() @only_when_on() - def CLK_on(self): + def APSCT_on(self): """ :return:None """ - self.opcua_connection.call_method(["CLK_on"]) - - @command() - @DebugIt() - @only_when_on() - def CLK_PLL_setup(self): - """ - - :return:None - """ - self.opcua_connection.call_method(["CLK_PLL_setup"]) + self.opcua_connection.call_method(["APSCT_on"]) # ---------- # Run server diff --git a/tangostationcontrol/tangostationcontrol/devices/recv.py b/tangostationcontrol/tangostationcontrol/devices/recv.py index a9eee4160..f53bb8044 100644 --- a/tangostationcontrol/tangostationcontrol/devices/recv.py +++ b/tangostationcontrol/tangostationcontrol/devices/recv.py @@ -131,22 +131,22 @@ class RECV(opcua_device): @command() @DebugIt() @only_when_on() - def ADC_on(self): + def RCU_DTH_off(self): """ :return:None """ - self.opcua_connection.call_method(["ADC_on"]) + self.opcua_connection.call_method(["RCU_DTH_off"]) @command() @DebugIt() @only_when_on() - def RCU_update(self): + def RCU_DTH_on(self): """ :return:None """ - self.opcua_connection.call_method(["RCU_update"]) + self.opcua_connection.call_method(["RCU_DTH_on"]) def _initialise_hardware(self): """ Initialise the RCU hardware. """ diff --git a/tangostationcontrol/tangostationcontrol/devices/unb2.py b/tangostationcontrol/tangostationcontrol/devices/unb2.py index 0076a37a2..bf06f4c6a 100644 --- a/tangostationcontrol/tangostationcontrol/devices/unb2.py +++ b/tangostationcontrol/tangostationcontrol/devices/unb2.py @@ -121,6 +121,26 @@ class UNB2(opcua_device): # Commands # -------- + @command() + @DebugIt() + @only_when_on() + def UNB2_off(self): + """ + + :return:None + """ + self.opcua_connection.call_method(["UNB2_off"]) + + @command() + @DebugIt() + @only_when_on() + def UNB2_on(self): + """ + + :return:None + """ + self.opcua_connection.call_method(["UNB2_on"]) + # ---------- # Run server # ---------- -- GitLab