Commit dcd2911f authored by Tobias Winchen's avatar Tobias Winchen
Browse files

Fixed master_controller state machine

parent 6f3ed6a8
Pipeline #106034 passed with stages
in 2 minutes and 13 seconds
......@@ -327,7 +327,7 @@ class EddMasterController(EDDPipeline):
self.__eddDataStore._dataStreams.flushdb()
@state_change(target="streaming", allowed=["configured"], intermediate="capture_starting")
@state_change(target="ready", allowed=["configured"], intermediate="capture_starting")
@coroutine
def capture_start(self):
"""
......@@ -353,7 +353,7 @@ class EddMasterController(EDDPipeline):
yield futures
@state_change(target="ready", allowed=["ready", "measurement_stopping"], intermediate="measurement_preparing")
@state_change(target="set", allowed=["ready", "measurement_starting", "configured", "streaming"], intermediate="measurement_preparing")
@coroutine
def measurement_prepare(self, config_json=""):
"""
......@@ -377,7 +377,7 @@ class EddMasterController(EDDPipeline):
yield futures
@state_change(target="measuring", allowed=["ready"], intermediate="measurement_starting")
@state_change(target="measuring", allowed=["set", "ready", "measurement_preparing"], waitfor="set", intermediate="measurement_starting")
@coroutine
def measurement_start(self):
"""
......@@ -389,7 +389,7 @@ class EddMasterController(EDDPipeline):
yield futures
@state_change(target="ready", allowed=["measuring", "error"], intermediate="measurement_stopping")
@state_change(target="ready", allowed="measuring", intermediate="measurement_stopping")
@coroutine
def measurement_stop(self):
"""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment