Commit 08655cc8 authored by Marco Bartolini's avatar Marco Bartolini
Browse files

added AntennaBoss Interface parameter

parent cdb025a6

Medicina/Servers/MedicinaMinorServo/include/MSBossTracker.hpp

+4 −1
Original line number Diff line number Diff line
@@ -37,13 +37,15 @@ class TrackerThreadParameters 
                                MedMinorServoControl_sp,

                                MedMinorServoParameters **,

                                MedMinorServoOffset *,

	                            maci::ContainerServices *);

	                            maci::ContainerServices *,

                                std::string);

        virtual ~TrackerThreadParameters();

        MedMinorServoStatus *m_status;

        MedMinorServoControl_sp m_control;

        MedMinorServoParameters **m_parameters;

        MedMinorServoOffset *m_offset;

	    maci::ContainerServices *m_services;

        std::string m_antennaBossInterface;

};



// This class updates the status property of minor servos.
@@ -77,6 +79,7 @@ private: 
    MedMinorServoOffset *m_offset;

    maci::ContainerServices * m_services;

    Antenna::AntennaBoss_proxy m_antennaBoss;

    std::string m_antennaBossInterface;

    bool m_antennaBossError;

};

Medicina/Servers/MedicinaMinorServo/src/MSBossTracker.cpp

+7 −4
Original line number Diff line number Diff line
@@ -11,12 +11,14 @@ TrackerThreadParameters::TrackerThreadParameters(MedMinorServoStatus *status, 
                                                MedMinorServoControl_sp control,

                                                MedMinorServoParameters **params,

                                                MedMinorServoOffset *offset,

                                                maci::ContainerServices *services):

                                                maci::ContainerServices *services,

                                                std::string antennaBossInterface):

                                                m_status(status),

                                                m_control(control),

                                                m_parameters(params),

                                                m_offset(offset),

                                                m_services(services)

                                                m_services(services),

                                                m_antennaBossInterface(antennaBossInterface)

{}



TrackerThreadParameters::~TrackerThreadParameters()
@@ -33,11 +35,12 @@ MSBossTracker::MSBossTracker( 
            m_control(params.m_control),

            m_parameters(params.m_parameters),

            m_offset(params.m_offset),

            m_services(params.m_services)

            m_services(params.m_services),

            m_antennaBossInterface(params.m_antennaBossInterface)

{

    AUTO_TRACE("MSBossTracker::MSBossTracker()");

    m_antennaBoss.setContainerServices(m_services);

    m_antennaBoss.setComponentName("ANTENNA/BOSS");

    m_antennaBoss.setComponentName(m_antennaBossInterface.c_str());

}



MSBossTracker::~MSBossTracker() { AUTO_TRACE("MSBossTracker::~MSBossTracker()"); }

Medicina/Servers/MedicinaMinorServo/src/MinorServoBossImpl.cpp

+7 −4
Original line number Diff line number Diff line
@@ -82,11 +82,13 @@ void MinorServoBossImpl::initialize() throw ( 
                 false);

    CUSTOM_LOG(LM_FULL_INFO, "MinorServo::MinorServoBossImpl::initialize",

              (LM_DEBUG, "server ip: %s", (const char*)m_server_ip));

    /**if(!IRA::CIRATools::getDBValue(m_services, "AntennaBossInterface", 

                                  (const char*)m_antennaBossInterface))

    if(!IRA::CIRATools::getDBValue(m_services, "AntennaBossInterface", m_antennaBossInterface))

        THROW_EX(ComponentErrors,CDBAccessEx, 

                 "cannot read AntennaBossInterface from CDB",

                 false);**/

                 false);

    CUSTOM_LOG(LM_FULL_INFO, "MinorServo::MinorServoBossImpl::initialize",

              (LM_DEBUG, "antenna boss interface: %s", 

              (const char*)m_antennaBossInterface));

    /**

     * INITIALIZE STATUS

     */
@@ -759,7 +761,8 @@ throw (MinorServoErrors::TrackingErrorEx) 
                                        m_control,

                                        &m_actual_config,

                                        &m_offset,

                                        m_services);

                                        m_services,

                                        std::string((const char*)m_antennaBossInterface));



        m_tracking_thread_ptr = getContainerServices()->

                                 getThreadManager()->