Commit a71887f3 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Minor improvement on the MS motion status DevIO

parent 03a424b1

SRT/Servers/SRTMinorServo/include/MSDevIOs.h

+28 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include "SRTMinorServoCommon.h"

#include "SRTMinorServoContainers.h"

#include <type_traits>

#include <baciDevIO.h>

#include <ComponentErrors.h>
@@ -64,9 +65,16 @@ namespace MinorServo 
        /**

         * Constructor.

         * @param motion_status the atomic status of the motion of the minor servo system.

         * @param answer_map the SRTMinorServoAnswerMap containing the status of the system. It is used to read the position of the gregorian cover.

         * @param answer_map a reference to the SRTMinorServoAnswerMap object containing the status of the system. It is used to read the position of the gregorian cover.

         * @param scanning a reference to the TBoolean indicating whether the system is scanning or not.

         * @param current_scan a reference to the SRTMinorServoScan object containing the parameters for the current scan. It is used to read the servo name and axis involved in the scan.

         */

        MSMotionInfoDevIO(const std::atomic<SRTMinorServoMotionStatus>& motion_status, const SRTMinorServoAnswerMap& answer_map) : m_motion_status(motion_status), m_answer_map(answer_map) {}

        MSMotionInfoDevIO(const std::atomic<SRTMinorServoMotionStatus>& motion_status, const SRTMinorServoAnswerMap& answer_map, const std::atomic<Management::TBoolean>& scanning, const SRTMinorServoScan& current_scan) :

            m_motion_status(motion_status),

            m_answer_map(answer_map),

            m_scanning(scanning),

            m_current_scan(current_scan)

        {}



        /**

         * Returns the property value.
@@ -96,8 +104,15 @@ namespace MinorServo 
                    break;

                }

                case MOTION_STATUS_TRACKING:

                {

                    if(m_scanning.load() == Management::MNG_FALSE)

                    {

                        motion_status = "Elevation Track Mode";

                    }

                    else

                    {

                        motion_status = "Scanning along " + m_current_scan.servo_name + " " + m_current_scan.axis_name + " axis";

                    }

                    break;

                }

                case MOTION_STATUS_PARKING:
@@ -149,6 +164,16 @@ namespace MinorServo 
         * Reference to the SRTMinorServoAnswerMap object of the Boss.

         */

        const SRTMinorServoAnswerMap& m_answer_map;



        /**

         * Reference to the boolean telling if the system is scanning.

         */

        const std::atomic<Management::TBoolean>& m_scanning;



        /**

         * Reference to the SRTMinorServoScan object of the Boss.

         */

        const SRTMinorServoScan& m_current_scan;

    };



    /**

SRT/Servers/SRTMinorServo/src/SRTMinorServoBossImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void SRTMinorServoBossImpl::initialize() 
        m_actual_setup_ptr = new baci::ROstring((m_component_name + ":actualSetup").c_str(), getComponent(),

                new MSGenericDevIO<ACE_CString, std::string>(m_core.m_actual_setup), true);

        m_motion_info_ptr = new baci::ROstring((m_component_name + ":motionInfo").c_str(), getComponent(),

                new MSMotionInfoDevIO(m_core.m_motion_status, m_core.m_status), true);

                new MSMotionInfoDevIO(m_core.m_motion_status, m_core.m_status, m_core.m_scanning, m_core.m_current_scan), true);

        m_starting_ptr = new ROEnumImpl<ACS_ENUM_T(Management::TBoolean), POA_Management::ROTBoolean>((m_component_name + ":starting").c_str(), getComponent(),

                new MSGenericDevIO<Management::TBoolean, std::atomic<Management::TBoolean>>(m_core.m_starting), true);

        m_as_configuration_ptr = new ROEnumImpl<ACS_ENUM_T(Management::TBoolean), POA_Management::ROTBoolean>((m_component_name + ":asConfiguration").c_str(), getComponent(),