Commit 0d030cc5 authored by Marco Buttu's avatar Marco Buttu
Browse files

Fix #88: MinorServoInterface: argument time clashes with alma.ACS.Time

parent fb3c4dad

Common/Interfaces/MinorServoInterface/idl/MinorServo.idl

+2 −2
Original line number Diff line number Diff line
@@ -413,11 +413,11 @@ module MinorServo { 
        /** Return the servo position at a given time.

         *  If the time is too old, it returns the older position.

         *  If the time is in advance or 0, it returns the latest position.

         *  @arg time the position time

         *  @arg t the position time

         *  @return the position

         *  @throw ComponentError::UnexpectedEx

         */

         ACS::doubleSeq getPositionFromHistory(in ACS::Time time) raises (ComponentErrors::UnexpectedEx);

         ACS::doubleSeq getPositionFromHistory(in ACS::Time t) raises (ComponentErrors::UnexpectedEx);



        /** Clear the position system offset

         * @arg boolean set_positions if true, it also sets the actual and the future positions

Common/Interfaces/MinorServoInterface/idl/MinorServoBoss.idl

+2 −2
Original line number Diff line number Diff line
@@ -270,11 +270,11 @@ module MinorServo { 
 

        /** Return the positions of the active axes

         *  

         * @param time the time related to the position we want to retrieve

         * @param t the time related to the position we want to retrieve

         * @return a sequence of positions, in the same order of the axes parameter of getAxesInfo()

         * @throw MinorServoErrors::ConfigurationErrorEx if the system is not configured

         */

        ACS::doubleSeq getAxesPosition(in ACS::Time time) 

        ACS::doubleSeq getAxesPosition(in ACS::Time t) 

        raises (MinorServoErrors::MinorServoErrorsEx, 

                ComponentErrors::ComponentErrorsEx);