Commit 6ec0c11b authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

fix-problem-integration-ADR8: Fix bug in CSP.LMC subarray events generation.

parent e2efb2fc

csp-lmc-common/HISTORY

+4 −0
Original line number Diff line number Diff line 
0.6.8:

- Removed the CspSubarrayStateModel: no more used. This state model was not correct becuase it

  did not register the callback to push events on obsState attribute 



0.6.7:

- Fixed a bug in re-configuration process.

csp-lmc-common/csp_lmc_common/CspSubarray.py

+4 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ from . import release 
# PROTECTED REGION END #    //  CspSubarray.additionnal_import



__all__ = ["CspSubarray", "main"]

'''

class CspSubarrayStateModel(SKASubarrayStateModel):

    _subarray_transitions = {

            ('READY', 'goto_idle_succeeded'): (
@@ -68,6 +69,7 @@ class CspSubarrayStateModel(SKASubarrayStateModel): 
            dev_state_callback=dev_state_callback,

        )

        self.update_transitions(self._subarray_transitions)

'''



class CspSubarray(SKASubarray):

    """
@@ -1768,7 +1770,7 @@ class CspSubarray(SKASubarray): 
    # ----------------

    # Class private methods

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

        

    '''    

    def _init_state_model(self):

        """

        Sets up the state model for the device
@@ -1776,7 +1778,7 @@ class CspSubarray(SKASubarray): 
        self.state_model = CspSubarrayStateModel(

            dev_state_callback=self._update_state,

        )



    '''

    def init_command_objects(self):

        """

        Sets up the command objects

csp-lmc-common/csp_lmc_common/release.py

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
"""Release information for Python Package"""



name = """csp-lmc-common"""

version = "0.6.7"

version = "0.6.8"

version_info = version.split(".")

description = """SKA CSP.LMC Common Software"""

author = "INAF-OAA"

csp-lmc-common/docker/.release

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
"""Release information for Python Package"""



name = """csplmc-common"""

version = "0.6.7"

version = "0.6.8"

version_info = version.split(".")

description = """SKA CSP.LMC Common Classe"""

author = "E.G"
@@ -18,5 +18,5 @@ license = """BSD-3-Clause""" 
url = """www.tango-controls.org"""

copyright = """"""



release=0.6.7

tag=csp-lmc-common-0.6.7
 
release=0.6.8

tag=csp-lmc-common-0.6.8

csp-lmc-mid/HISTORY

+4 −0
Original line number Diff line number Diff line 
0.6.8:

- use csp-lmc-common version 0.6.8.

- removed import of CspSubarrayStateModel



0.6.7:

- use csp-lmc-common version 0.6.7