Removed most of get_sync calls (56d2f4d1) · Commits · INAF / DISCOS

SRT/Interfaces/SRTMinorServoInterface/idl/SRTMinorServo.idl

+8 −1

Original line number	Diff line number	Diff line
		@@ -125,8 +125,9 @@ module MinorServo
		* This method loads from the CDB the positioning coefficients related to the given configuration
		* @param configuration the string representing the name of the table from which the coefficients will be loaded
		* @throw ComponentErrors::ComponentErrorsEx when there is an error while trying to load the table for the given configuration
		* @return true if the servo is in use with the current configuration, false otherwise
		*/
		void setup(in string configuration) raises (ComponentErrors::ComponentErrorsEx);
		boolean setup(in string configuration) raises (ComponentErrors::ComponentErrorsEx);

		/**
		* This method calculates the servo coordinates for a given elevation
		@@ -265,6 +266,12 @@ module MinorServo
		* when there has been a communication error or when the command was not accepted
		*/
		void programTrack(in long trajectory_id, in long point_id, in ACS::Time point_time, in ACS::doubleSeq coordinates);

		/**
		* This method returns a boolean indicating if the servo is tracking or not
		* @return true if the servo is tracking, false otherwise
		*/
		boolean isTracking();
		};
		};

SRT/Servers/SRTMinorServo/include/SRTMinorServoBossCore.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -413,6 +413,16 @@ private:
		*/
		const std::map<std::string, SRTProgramTrackMinorServo_ptr> m_tracking_servos;

		/**
		* Map that will dynamically be updated containing the current configuration's minor servos.
		*/
		std::map<std::string, SRTBaseMinorServo_ptr> m_current_servos;

		/**
		* Map that will dynamically be updated containing the current configuration's tracking minor servos.
		*/
		std::map<std::string, SRTProgramTrackMinorServo_ptr> m_current_tracking_servos;

		/**
		* Current scan parameters.
		*/

SRT/Servers/SRTMinorServo/include/SRTMinorServoBossImpl.h

+20 −0

Original line number	Diff line number	Diff line
		@@ -498,6 +498,11 @@ private:
		*/
		baci::SmartPropertyPointer<ROEnumImpl<ACS_ENUM_T(Management::TBoolean), POA_Management::ROTBoolean>> m_tracking_ptr;

		/**
		* DevIO of the current_configuration property.
		*/
		MSAnswerMapDevIO<SRTMinorServoFocalConfiguration>* m_current_configuration_devio;

		/**
		* Pointer to the current_configuration property.
		*/
		@@ -518,6 +523,11 @@ private:
		*/
		baci::SmartPropertyPointer<baci::ROstring> m_plc_version_ptr;

		/**
		* DevIO of the control property.
		*/
		MSAnswerMapDevIO<SRTMinorServoControlStatus>* m_control_devio;

		/**
		* Pointer to the control property.
		*/
		@@ -528,11 +538,21 @@ private:
		*/
		baci::SmartPropertyPointer<ROEnumImpl<ACS_ENUM_T(Management::TBoolean), POA_Management::ROTBoolean>> m_power_ptr;

		/**
		* DevIO of the emergency property.
		*/
		MSAnswerMapDevIO<Management::TBoolean>* m_emergency_devio;

		/**
		* Pointer to the emergency property.
		*/
		baci::SmartPropertyPointer<ROEnumImpl<ACS_ENUM_T(Management::TBoolean), POA_Management::ROTBoolean>> m_emergency_ptr;

		/**
		* DevIO of the gregorian_cover property.
		*/
		MSAnswerMapDevIO<SRTMinorServoGregorianCoverStatus>* m_gregorian_cover_devio;

		/**
		* Pointer to the gregorian_cover property.
		*/

SRT/Servers/SRTMinorServo/include/SRTMinorServoCommon.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -107,17 +107,6 @@ namespace MinorServo
		(CONFIGURATION_BWG2, 22)
		(CONFIGURATION_BWG3, 23)
		(CONFIGURATION_BWG4, 24);

		/**
		* This is a simple list indicating the order of the minor servo components.
		*/
		const std::vector<std::string> ServoOrder =
		{
		//"PFP",
		"SRP",
		//"GFR",
		//"M3R"
		};
		}

		#endif

SRT/Servers/SRTMinorServo/include/SRTMinorServoImpl.h

+35 −14

Original line number	Diff line number	Diff line
		@@ -105,8 +105,9 @@ public:
		* Asks the servo system to load the commanded configuration table.
		* @param configuration_name the configuration the servo system should assume.
		* @throw ComponentErrors::ComponentErrorsEx when there is an error while trying to load the table for the given configuration.
		* @return true if the servo is in use with the current configuration, false otherwise
		*/
		void setup(const char* configuration_name = "");
		bool setup(const char* configuration_name = "");

		/**
		* Asks the component to calculate the servo system position starting from the given elevation.
		@@ -331,7 +332,6 @@ protected:
		*/
		const size_t m_virtual_axes;
		private:

		/**
		* Number of physical axes of the servo system.
		*/
		@@ -347,6 +347,15 @@ private:
		*/
		const std::vector<std::string> m_virtual_axes_units;
		protected:
		/**
		* Commanded user offsets for each axis of the servo system.
		*/
		std::vector<double> m_user_offsets;

		/**
		* Commanded system offsets for each axis of the servo system.
		*/
		std::vector<double> m_system_offsets;

		/**
		* Queue of positions assumed by the servo system in time.
		@@ -388,16 +397,6 @@ private:
		*/
		std::vector<double> m_c_s;

		/**
		* Commanded user offsets for each axis of the servo system.
		*/
		std::vector<double> m_user_offsets;

		/**
		* Commanded system offsets for each axis of the servo system.
		*/
		std::vector<double> m_system_offsets;

		/**
		* Boolean indicating whether the servo system is used in the current focal configuration.
		*/
		@@ -413,11 +412,21 @@ private:
		*/
		baci::SmartPropertyPointer<ROEnumImpl<ACS_ENUM_T(Management::TBoolean), POA_Management::ROTBoolean>> m_enabled_ptr;

		/**
		* DevIO of the drive_cabinet_status property.
		*/
		MSAnswerMapDevIO<SRTMinorServoCabinetStatus>* m_drive_cabinet_status_devio;

		/**
		* Pointer to the drive_cabinet_status property.
		*/
		baci::SmartPropertyPointer<ROEnumImpl<ACS_ENUM_T(SRTMinorServoCabinetStatus), POA_MinorServo::ROSRTMinorServoCabinetStatus>> m_drive_cabinet_status_ptr;

		/**
		* DevIO of the block property.
		*/
		MSAnswerMapDevIO<Management::TBoolean>* m_block_devio;

		/**
		* Pointer to the block property.
		*/
		@@ -448,11 +457,23 @@ private:
		*/
		baci::SmartPropertyPointer<baci::ROdoubleSeq> m_plain_virtual_positions_ptr;

		/**
		* DevIO of the virtual_positions property.
		*/
		MSVirtualPositionsDevIO* m_virtual_positions_devio;

		/**
		* Pointer to the virtual_positions property.
		*/
		baci::SmartPropertyPointer<baci::ROdoubleSeq> m_virtual_positions_ptr;

		protected:
		/**
		* DevIO of the virtual_offsets property.
		*/
		MSAnswerMapDevIO<ACS::doubleSeq>* m_virtual_offsets_devio;

		private:
		/**
		* Pointer to the virtual_offsets property.
		*/
		@@ -569,7 +590,7 @@ public:
		/**
		* Setup method definition. It simply calls the SRTBaseMinorServoImpl method.
		*/
		void setup(const char* configuration_name = "") { SRTBaseMinorServoImpl::setup(configuration_name); }
		bool setup(const char* configuration_name = "") { return SRTBaseMinorServoImpl::setup(configuration_name); }

		/**
		* Declaration of all the other inherited methods.
		@@ -620,7 +641,7 @@ public:
		* @param configuration_name the configuration the servo system should assume.
		* @throw ComponentErrors::ComponentErrorsEx when there is an error while trying to load the table for the given configuration.
		*/
		void setup(const char* configuration_name = "");
		bool setup(const char* configuration_name = "");

		/**
		* Declaration of all the other inherited methods.