L2SS-470: Allow initialisation commands to be called in STANDBY state, and fix...

L2SS-470: Allow initialisation commands to be called in STANDBY state, and fix references to APSCT power functions.

tangostationcontrol/tangostationcontrol/devices/apsct.py

@@ -74,9 +74,9 @@ class APSCT(opcua_device):
         """ Initialise the APSCT hardware. """
 
         # Cycle clock
-        self.CLK_off()
+        self.APSCT_off()
         self.wait_attribute("APSCTTR_translator_busy_R", False, 10)
-        self.CLK_on()
+        self.APSCT_on()
         self.wait_attribute("APSCTTR_translator_busy_R", False, 10)
 
         if not self.proxy.APSCT_PLL_200MHz_locked_R:
@@ -91,7 +91,7 @@ class APSCT(opcua_device):
 
     @command()
     @DebugIt()
-    @only_when_on()
+    @only_in_states([DevState.STANDBY, DevState.ON])
     def APSCT_off(self):
         """
 
@@ -101,7 +101,7 @@ class APSCT(opcua_device):
 
     @command()
     @DebugIt()
-    @only_when_on()
+    @only_in_states([DevState.STANDBY, DevState.ON])
     def APSCT_on(self):
         """
 

tangostationcontrol/tangostationcontrol/devices/recv.py

@@ -110,7 +110,7 @@ class RECV(opcua_device):
     # --------
     @command()
     @DebugIt()
-    @only_when_on()
+    @only_in_states([DevState.STANDBY, DevState.ON])
     def RCU_off(self):
         """
 
@@ -120,7 +120,7 @@ class RECV(opcua_device):
 
     @command()
     @DebugIt()
-    @only_when_on()
+    @only_in_states([DevState.STANDBY, DevState.ON])
     def RCU_on(self):
         """
 
@@ -130,7 +130,7 @@ class RECV(opcua_device):
 
     @command()
     @DebugIt()
-    @only_when_on()
+    @only_in_states([DevState.STANDBY, DevState.ON])
     def RCU_DTH_off(self):
         """
 
@@ -140,7 +140,7 @@ class RECV(opcua_device):
 
     @command()
     @DebugIt()
-    @only_when_on()
+    @only_in_states([DevState.STANDBY, DevState.ON])
     def RCU_DTH_on(self):
         """
 

tangostationcontrol/tangostationcontrol/devices/unb2.py

@@ -21,7 +21,7 @@ from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
 from tangostationcontrol.devices.opcua_device import opcua_device
 from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
-from tangostationcontrol.devices.device_decorators import only_when_on
+from tangostationcontrol.devices.device_decorators import only_in_states
 
 import numpy
 
@@ -124,7 +124,7 @@ class UNB2(opcua_device):
 
     @command()
     @DebugIt()
-    @only_when_on()
+    @only_in_states([DevState.STANDBY, DevState.ON])
     def UNB2_off(self):
         """
 
@@ -134,7 +134,7 @@ class UNB2(opcua_device):
 
     @command()
     @DebugIt()
-    @only_when_on()
+    @only_in_states([DevState.STANDBY, DevState.ON])
     def UNB2_on(self):
         """