diff --git a/README.md b/README.md index a275cebef637a127990d2e2bee952dc9d3282c06..1d8fe917ddc0174d5ad4e877751ad7f4a6e82ed5 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,11 @@ The lmc-base-classe repository contains set of eight classes as mentioned in SKA ## Version History +#### (unreleased) +- Remove `ObsState` command from SKACapability, SKAObsDevice and SKASubarray Pogo XMI files. It should not + have been included - the `obsState` attribute provides this information. The command was not in the Python + files, so no change to usage. It only affects future Pogo code generation. + #### 0.5.3 - Setting `loggingTargets` attribute to empty list no longer raises exception. - Change syslog targets in `loggingTargets` attribute to a full URL so that remote syslog servers can be specified. diff --git a/pogo/SKACapability.xmi b/pogo/SKACapability.xmi index b9ee668a4ee84f265cb9e613763c4a32ce6bc7ad..22dcbeae281cbccbdc66718538bf74ba738a9c6e 100644 --- a/pogo/SKACapability.xmi +++ b/pogo/SKACapability.xmi @@ -36,15 +36,6 @@ <type xsi:type="pogoDsl:StringType"/> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/> </deviceProperties> - <commands name="ObsState" description="Set the observation state" execMethod="obs_state" displayLevel="OPERATOR" polledPeriod="0"> - <argin description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argin> - <argout description="Observation state"> - <type xsi:type="pogoDsl:ConstStringType"/> - </argout> - <status abstract="true" inherited="true" concrete="false"/> - </commands> <commands name="State" description="This command gets the device state (stored in its device_state data member) and returns it to the caller." execMethod="dev_state" displayLevel="OPERATOR" polledPeriod="0"> <argin description="none"> <type xsi:type="pogoDsl:VoidType"/> diff --git a/pogo/SKAObsDevice.xmi b/pogo/SKAObsDevice.xmi index 2e953df66c0590ba3a7d0a78ce77db781b77a274..a583296bea9b4436ff8c79cf26efc4ba76382619 100644 --- a/pogo/SKAObsDevice.xmi +++ b/pogo/SKAObsDevice.xmi @@ -24,15 +24,6 @@ <type xsi:type="pogoDsl:StringVectorType"/> <status abstract="false" inherited="true" concrete="true"/> </deviceProperties> - <commands name="ObsState" description="Set the observation state" execMethod="obs_state" displayLevel="OPERATOR" polledPeriod="0" isDynamic="false"> - <argin description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argin> - <argout description="Observation state"> - <type xsi:type="pogoDsl:ConstStringType"/> - </argout> - <status abstract="true" inherited="false" concrete="false" concreteHere="false"/> - </commands> <commands name="State" description="This command gets the device state (stored in its device_state data member) and returns it to the caller." execMethod="dev_state" displayLevel="OPERATOR" polledPeriod="0"> <argin description="none"> <type xsi:type="pogoDsl:VoidType"/> diff --git a/pogo/SKASubarray.xmi b/pogo/SKASubarray.xmi index 3778c15038c8da5d5ec58346836e6d0d46a129a2..fee6b291a6318210840eb132e1a1110bed7cad57 100644 --- a/pogo/SKASubarray.xmi +++ b/pogo/SKASubarray.xmi @@ -122,15 +122,6 @@ </argout> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/> </commands> - <commands name="ObsState" description="Set the observation state" execMethod="obs_state" displayLevel="OPERATOR" polledPeriod="0"> - <argin description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argin> - <argout description="Observation state"> - <type xsi:type="pogoDsl:ConstStringType"/> - </argout> - <status abstract="true" inherited="true" concrete="true" concreteHere="false"/> - </commands> <commands name="Pause" description="Pause scan." execMethod="pause" displayLevel="OPERATOR" polledPeriod="0" isDynamic="false"> <argin description=""> <type xsi:type="pogoDsl:VoidType"/>