Commit 221be16f authored by Drew Devereux's avatar Drew Devereux
Browse files

Merge branch '0.6.5_observation_state_machine_fix' into 'master'

0.6.5 observation state machine fix

See merge request ska-telescope/lmc-base-classes!27
parents d6363294 321005f6
release=0.6.4
tag=lmcbaseclasses-0.6.4
release=0.6.5
tag=lmcbaseclasses-0.6.5
......@@ -25,6 +25,10 @@ The lmc-base-classe repository contains set of eight classes as mentioned in SKA
## Version History
#### 0.6.5
- Fix to observation state machine: allow Abort() from RESETTING observation
state
#### 0.6.4
- Refactor state machine to use pytransitions library.
- Minor behavioural change: Off() command is accepted in every obsState, rather
......
......@@ -7,7 +7,7 @@
"""Release information for lmc-base-classes Python Package"""
name = """lmcbaseclasses"""
version = "0.6.4"
version = "0.6.5"
version_info = version.split(".")
description = """A set of generic base devices for SKA Telescope."""
author = "SKA India and SARAO and CSIRO"
......
......@@ -404,6 +404,7 @@ class ObservationStateMachine(Machine):
"source": [
ObsState.IDLE.name, ObsState.CONFIGURING.name,
ObsState.READY.name, ObsState.SCANNING.name,
ObsState.RESETTING.name,
],
"trigger": "abort_started",
"dest": ObsState.ABORTING.name,
......
......@@ -189,6 +189,11 @@
"obs_reset_failed",
"FAULT"
],
[
"RESETTING",
"abort_started",
"ABORTING"
],
[
"RESETTING",
"fatal_error",
......
......@@ -494,6 +494,11 @@
"obs_reset_failed",
"FAULT"
],
[
"RESETTING",
"abort_started",
"ABORTING"
],
[
"RESETTING",
"fatal_error",
......
Supports Markdown
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