Commit 15ef34e7 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Fixed a couple more things

parent 56d2f4d1

SRT/Servers/SRTMinorServo/include/SRTMinorServoImpl.h

+6 −0
Original line number Diff line number Diff line
@@ -660,6 +660,12 @@ public: 
     */

    void programTrack(CORBA::Long trajectory_id, CORBA::Long point_id, ACS::Time point_time, const ACS::doubleSeq& coordinates);



    /**

     * Returns the tracking status of the minor servo.

     * @return true if the minor servo is tracking within the tracking error, false otherwise

     */

    bool isTracking() { return m_tracking.load() == Management::MNG_TRUE; }



    /**

     * Declaration of all the other inherited properties methods.

     */

SRT/Servers/SRTMinorServo/src/SRTMinorServoBossCore.cpp

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ bool SRTMinorServoBossCore::status() 
        if(std::all_of(m_current_tracking_servos.begin(), m_current_tracking_servos.end(), [](const std::pair<std::string, SRTProgramTrackMinorServo_ptr>& servo) -> bool

        {

            ACSErr::Completion_var comp;

            return servo.second->tracking()->get_sync(comp.out()) == Management::MNG_TRUE ? true : false;

            return servo.second->isTracking();

        }))

        {

            m_tracking.store(Management::MNG_TRUE);
@@ -985,7 +985,7 @@ SRTMinorServoScan SRTMinorServoBossCore::checkScanFeasibility(const ACS::Time& s 
            ex.log(LM_DEBUG);

            throw ex.getMinorServoErrorsEx();

        }

        else if(final_position[i] + offsets[i] < min_ranges[i] || final_position[i] + offsets[i] > max_ranges[i])

        else if(final_position[i] + user_offsets[i] + system_offsets[i] < min_ranges[i] || final_position[i] + user_offsets[i] + system_offsets[i] > max_ranges[i])

        {

            ex.setReason("Final position out of range.");

            ex.log(LM_DEBUG);

SRT/Servers/SRTMinorServo/src/SRTMinorServoParkThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void SRTMinorServoParkThread::runLoop() 
        case 0:

        {

            // First we check if the gregorian cover has closed

            ACS::Time comp;

            // ACS::Time comp;

            //bool completed = m_core.m_component.m_gregorian_cover_devio->read(comp) == COVER_STATUS_CLOSED ? true : false;



            // Then we cycle through all the servos and make sure their operative mode is STOP