Skip to content
Snippets Groups Projects
Commit f720a919 authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'L2SS-331-force-fault-off' into 'master'

L2SS-331: Only allow to transistion to init from off

Closes L2SS-331

See merge request !166
parents 70adba37 8899e426
No related branches found
No related tags found
1 merge request!166L2SS-331: Only allow to transistion to init from off
...@@ -102,7 +102,7 @@ class hardware_device(Device, metaclass=AbstractDeviceMetas): ...@@ -102,7 +102,7 @@ class hardware_device(Device, metaclass=AbstractDeviceMetas):
# -------- # --------
@command() @command()
@only_in_states([DevState.FAULT, DevState.OFF]) @only_in_states([DevState.OFF])
@DebugIt() @DebugIt()
@fault_on_error() @fault_on_error()
@log_exceptions() @log_exceptions()
......
...@@ -62,7 +62,7 @@ class Observation(Device): ...@@ -62,7 +62,7 @@ class Observation(Device):
# Lifecycle functions # Lifecycle functions
@command(dtype_in = DevString) @command(dtype_in = DevString)
@only_in_states([DevState.FAULT, DevState.OFF]) @only_in_states([DevState.OFF])
@log_exceptions() @log_exceptions()
def Initialise(self, parameters: DevString = None): def Initialise(self, parameters: DevString = None):
self.set_state(DevState.INIT) self.set_state(DevState.INIT)
......
...@@ -123,7 +123,7 @@ class ObservationControl(Device): ...@@ -123,7 +123,7 @@ class ObservationControl(Device):
# Lifecycle functions # Lifecycle functions
@command() @command()
@only_in_states([DevState.FAULT, DevState.OFF]) @only_in_states([DevState.OFF])
@log_exceptions() @log_exceptions()
@DebugIt() @DebugIt()
def Initialise(self): def Initialise(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment