Commit 352fa43b authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

CT69-integration-with-cbf: Removed the cbfOutputLink forwarded attribute. 

New TANGO DB configuration for MID.CBF and MidCspSubarray.
parent f1a6f0f8

csp-lmc-common/csp_lmc_common/CspSubarray.py

+0 −13
Original line number Diff line number Diff line
@@ -1259,19 +1259,6 @@ class CspSubarray(SKASubarray): 
        doc="List of devices that completed the task",

    )



    cbfOutputLink = attribute(name="cbfOutputLink",

        label="cbfOutputLink",

        forwarded=True

    )

    #pssOutputLink = attribute(name="pssOutputLink",

    #    label="cbfOutputLink",

    #    forwarded=True

    #)

 

    #vlbiOutputLink = attribute(name="vlbiOutputLink",

    #    label="cbfOutputLink",

    #    forwarded=True

    #)

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

    # General methods

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

csp-lmc-common/pogo/CspSubarray.xmi

+0 −9
Original line number Diff line number Diff line
@@ -851,15 +851,6 @@ 
      <status abstract="false" inherited="true" concrete="true"/>

      <properties description="Current logging targets for this device - &#xA;initialises to LoggingTargetsDefault on startup" label="" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>

    </attributes>

    <forwardedAttributes name="cbfOutputLink" label="cbfOutputLink">

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

    </forwardedAttributes>

    <forwardedAttributes name="pssOutputLink" label="cbfOutputLink">

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

    </forwardedAttributes>

    <forwardedAttributes name="vlbiOutputLink" label="cbfOutputLink">

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

    </forwardedAttributes>

    <states name="ON" description="This state could have been called OK or OPERATIONAL. It means that the device is in its operational state. (E.g. the power supply is giving its nominal current, th motor is ON and ready to move, the instrument is operating). This state is modified by the Attribute alarm checking of the DeviceImpl:dev_state method. i.e. if the State is ON and one attribute has its quality factor to ATTR_WARNING or ATTR_ALARM, then the State is modified to ALARM.">

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

    </states>

csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py

+0 −4
Original line number Diff line number Diff line
@@ -343,10 +343,6 @@ class MidCspSubarrayBase(CspSubarray): 
    )





    cbfOutputLink = attribute(name="cbfOutputLink",

                              label="cbfOutputLink",

                              forwarded=True

                              )

    #

    # TODO: implement PSS Subarray and PSTBeams device

    # pssOutputLink = attribute(name="pssOutputLink",

csp-lmc-mid/docker/config/midcbf_dsconfig.json

+710 −498

File changed.

Preview size limit exceeded, changes collapsed.

csp-lmc-mid/docker/config/midcsplmc_dsconfig.json

+2 −12
Original line number Diff line number Diff line
@@ -361,11 +361,6 @@ 
                                "__root_att": [

                                    "mid_csp_cbf/sub_elt/subarray_01/vccState"

                                ]

                            }, 

                            "cbfOutputLink": {

                                "__root_att": [

                                    "mid_csp_cbf/sub_elt/subarray_01/outputLinksDistribution"

                                ]

                            } 

                        }, 

                        "properties": {
@@ -504,11 +499,6 @@ 
                                "__root_att": [

                                    "mid_csp_cbf/sub_elt/subarray_02/vccState"

                                ]

                            }, 

                            "cbfOutputLink": {

                                "__root_att": [

                                    "mid_csp_cbf/sub_elt/subarray_02/outputLinksDistribution"

                                ]

                            } 

                        }, 

                        "properties": {