Commit d25df91c authored by Marco Buttu's avatar Marco Buttu
Browse files

FAILURE and tracking with unreleated meaning

parent 648a1d6e

SRT/Servers/SRTMinorServo/include/MSBossConfiguration.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ public: 


    inline bool isConfigured() { return m_isConfigured; }



    bool isTracking();



    inline bool isStarting() { return m_isStarting; }



    inline bool isParking() { return m_isParking; }

SRT/Servers/SRTMinorServo/src/ParkThread.cpp

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ void ParkThread::run() 
    // Put the servos in the position elevation independent and disable the axes 

    unsigned long counter = 0;

    vector<string> toMove(m_configuration->m_servosToMove);

    m_configuration->m_actualSetup = "unknown";



    // Positioning

    counter = 0;

SRT/Servers/SRTMinorServo/src/TrackingThread.cpp

+2 −2
Original line number Diff line number Diff line
@@ -77,13 +77,13 @@ TrackingThread::TrackingThread( 
                                    m_configuration->m_status = Management::MNG_OK;

                                }

                                else {

                                    m_configuration->m_status = Management::MNG_FAILURE;

                                    ACS::ROdoubleSeq_var refActPos = component_ref->actPos();

                                    ACSErr::Completion_var completion;

                                    ACS::doubleSeq * act_pos = refActPos->get_sync(completion.out());

                                    for(size_t i=0; i<act_pos->length(); i++) { 

                                        // TODO: pay attention, this code is incorrect in case of many dynamic components

                                        if(fabs((*act_pos)[i] - position[i]) > component_ref->getTrackingDelta()) {

                                            m_configuration->m_status = Management::MNG_FAILURE;

                                        if(fabs((*act_pos)[i] - positions[i]) > component_ref->getTrackingDelta()) {

                                            m_configuration->m_trackingError=true;

                                            m_configuration->m_isElevationTracking = false;

                                            break;