Commit 7e4f7825 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

AT5-259: removed overwrite of ObsState method.

parent eb17214b

csp-lmc-common/csp_lmc_common/CspBeamCapabilityBaseClass.py

+1 −43
Original line number Diff line number Diff line
@@ -46,40 +46,16 @@ class CspBeamCapabilityBaseClass(with_metaclass(DeviceMeta, SKACapability)): 
    # -----------------

    # Device Properties

    # -----------------

















  # ----------

    # Attributes

    # ----------































    subarrayMembership = attribute(

        dtype='DevUShort',

        label="The Beam Capability subarray affiliation.",

        doc="The subarray ID the CSP Beam Capability belongs to.",

    )







    # ---------------

    # General methods

    # ---------------
@@ -115,25 +91,7 @@ class CspBeamCapabilityBaseClass(with_metaclass(DeviceMeta, SKACapability)): 
        # PROTECTED REGION END #    //  CspBeamCapabilityBaseClass.subarrayMembership_read





    # --------

    # Commands

    # --------



    @command(

        dtype_out='ConstDevString',

        doc_out="Observation state",

    )

    @DebugIt()

    def ObsState(self):

        # PROTECTED REGION ID(CspBeamCapabilityBaseClass.ObsState) ENABLED START #

        """

        Set the observation state



        :return:'ConstDevString'

        Observation state

        """

        return ""

        # PROTECTED REGION END #    //  CspBeamCapabilityBaseClass.ObsState



# ----------

# Run server

csp-lmc-common/pogo/CspBeamCapabilityBaseClass.xmi

+2 −2
Original line number Diff line number Diff line
@@ -37,14 +37,14 @@ 
      <type xsi:type="pogoDsl:StringType"/>

      <status abstract="false" inherited="true" concrete="true"/>

    </deviceProperties>

    <commands name="ObsState" description="Set the observation state" execMethod="obs_state" displayLevel="OPERATOR" polledPeriod="0">

    <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="true" concrete="true" concreteHere="true"/>

      <status abstract="true" inherited="true" concrete="true" 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">