changed commands nomenclature, see issue #153 (ac235968) · Commits · INAF / DISCOS

Common/Interfaces/ReceiversInterface/idl/ReceiversBoss.idl

+31 −2

Original line number	Diff line number	Diff line
		@@ -119,6 +119,16 @@ module Receivers {

		\***************************************************/

		/**
		* This method prepares the system for the derotation but it does not start it.
		* if the no derotator is supported, or no receiver has been configured or the current receiver does not have a derotator
		* an error is raised.
		* @param mode specifies how to manage the derotation, if <i>RCV_UNDEF_DEROTCONF</i> the current value is kept
		* @throw ReceiversErrors::ReceiversErrorsEx
		* @throw ComponentErrors::ComponentErrorsEx
		*/
		void derotatorSetConfiguration(in TDerotatorConfigurations conf) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

		/**
		* This method prepares the system for derotation but not starting it. If the no derotator is supported, or no receiver has been configured or the current receiver
		* does not have a derotator an error is raised.
		@@ -128,7 +138,7 @@ module Receivers {
		* @throw ReceiversErrors::ReceiversErrorsEx
		* @throw ComponentErrors::ComponentErrorsEx
		*/
		void derotatorMode(in TDerotatorConfigurations mode,in TRewindModes rewind,in long feeds) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);
		//void derotatorMode(in TDerotatorConfigurations mode,in TRewindModes rewind,in long feeds) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

		/**
		* This method parks the current derotator. In order to start the derotator again, another <i>derotatorSetup</i> must be called.
		@@ -141,8 +151,27 @@ module Receivers {
		/**
		* This method allows to set the starting position of the derotator. Allowed only if FIXED or CUSTOM modes are setup.
		* @param position the initial position (degrees)
		* @throw ReceiversErrors::ReceiversErrorsEx
		* @throw ComponentErrors::ComponentErrorEx
		*/
		void derotatorSetPosition(in double position) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

		/**
		* It allows to configure how the dewar positioner behaves in case the derotator hits a final limit and need to rewind.
		* @param rewind specifies how to manage the rewind, when it is needed. If <i>RCV_UNDEF_REWIND</i> the current value is kept
		* @throw ReceiversErrors::ReceiversErrorsEx
		* @throw ComponentErrors::ComponentErrorEx
		*/
		void derotatorSetRewindingMode(in TRewindModes rewind) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

		/**
		* It sets the number of fixed length steps (it depends on the particular derotator) the dewar positioner moves when an auto
		* rewind have to be taken
		* @param steps number of configured auto rewinding steps.
		* @throw ReceiversErrors::ReceiversErrorsEx
		* @throw ComponentErrors::ComponentErrorEx
		*/
		void setDerotatorPosition(in double position) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);
		void derotatorSetAutoRewindingSteps(in long steps) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

		/**
		* Allows to perform a manual rewind of the derotator.

Common/Servers/ReceiversBoss/include/ReceiversBossImpl.h

+36 −3

Original line number	Diff line number	Diff line
		@@ -283,9 +283,42 @@ public:
		* @throw ComponentErrors::ComponentErrorsEx
		* @throw ReceiversErrors::ReceiversErrorsEx
		*/
		virtual void derotatorMode(Receivers::TDerotatorConfigurations mode,Receivers::TRewindModes rewind,CORBA::Long feeds) throw (CORBA::SystemException,
		//virtual void derotatorMode(Receivers::TDerotatorConfigurations mode,Receivers::TRewindModes rewind,CORBA::Long feeds) throw (CORBA::SystemException,
		// ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

		/**
		* This method prepares the system for the derotation but it does not start it.
		* if the no derotator is supported, or no receiver has been configured or the current receiver does not have a derotator
		* an error is raised.
		* @param conf specifies how to manage the derotation, if <i>RCV_UNDEF_DEROTCONF</i> the current value is kept
		* @throw CORBA::SystemException
		* @throw ReceiversErrors::ReceiversErrorsEx
		* @throw ComponentErrors::ComponentErrorsEx
		*/
		virtual void derotatorSetConfiguration(Receivers::TDerotatorConfigurations conf) throw (CORBA::SystemException,
		ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

		/**
		* It allows to configure how the dewar positioner behaves in case the derotator hits a final limit and need to rewind.
		* @param rewind specifies how to manage the rewind, when it is needed. If <i>RCV_UNDEF_REWIND</i> the current value is kept
		* @throw CORBA::SystemException
		* @throw ReceiversErrors::ReceiversErrorsEx
		* @throw ComponentErrors::ComponentErrorEx
		*/
		void derotatorSetRewindingMode(Receivers::TRewindModes rewind) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,
		ReceiversErrors::ReceiversErrorsEx);

		/**
		* It sets the number of fixed length steps (it depends on the particular derotator) the dewar positioner moves when an auto
		* rewind have to be taken
		* @param steps number of configured auto rewinding steps.
		* @throw CORBA::SystemException
		* @throw ReceiversErrors::ReceiversErrorsEx
		* @throw ComponentErrors::ComponentErrorEx
		*/
		void derotatorSetAutoRewindingSteps(CORBA::Long steps) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,
		ReceiversErrors::ReceiversErrorsEx);

		/**
		* It disable the derotator. It is implicitly called also by the <i>park()</i> method.
		* @throw CORBA::SystemException
		@@ -311,7 +344,7 @@ public:
		* @throw ComponentErrors::ComponentErrorsEx
		* @throw ReceiversErrors::ReceiversErrorsEx
		*/
		virtual void setDerotatorPosition(CORBA::Double position) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,
		virtual void derotatorSetPosition(CORBA::Double position) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,
		ReceiversErrors::ReceiversErrorsEx);

		/**

Common/Servers/ReceiversBoss/include/RecvBossCore.h

+57 −5

Original line number	Diff line number	Diff line
		@@ -118,8 +118,9 @@ public:
		ReceiversErrors::DewarPositionerCommandErrorExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::UnexpectedExImpl);

		/**
		* This method is a wrap a call to the derotator setup, allowing to activate the derotation. If the derotator is not supported by the current receiver an error is risen.
		* @param mode specified the tracking mode of the derotator, if <i>RCV_UNDEF_DERATOCONF</i> is given the present value is kept
		* This method is a wrap a call to the derotator setup, allowing to activate the derotation.
		* If the derotator is not supported by the current receiver an error is risen.
		* @param confe specified the tracking mode of the derotator, if <i>RCV_UNDEF_DERATOCONF</i> is given the present value is kept
		* @param rewinding specifies the rewind mode in case the derotator reaches its final limit, if i<i>RCV_UNDEF_REWIND</i> is given, the present value is kept
		* @param feeds number of feeds to be rewind in case the automatic rewind is set, if -1 current value is kept, default value is 1;
		* @throw ReceiversErrors::NoDewarPositioningExImpl
		@@ -130,13 +131,64 @@ public:
		* @throw ComponentErrors::UnexpectedExImpl
		* @throw ReceiversErrors::DewarPositionerSetupErrorExImpl
		*/
		void derotatorMode(const Receivers::TDerotatorConfigurations& mode,const Receivers::TRewindModes& rewinding,const long& feeds) throw (
		/*void derotatorMode(const Receivers::TDerotatorConfigurations& mode,const Receivers::TRewindModes& rewinding,const long& feeds) throw (
		ReceiversErrors::NoDewarPositioningExImpl,ReceiversErrors::NoDerotatorAvailableExImpl,ComponentErrors::ValidationErrorExImpl,
		ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::UnexpectedExImpl,
		ReceiversErrors::DewarPositionerSetupErrorExImpl);
		ReceiversErrors::DewarPositionerSetupErrorExImpl);*/

		/**
		* It disable the derotator. It is implicitly called also by the <i>park()</i> method.
		* This method is a wrap a call to the derotator setup, allowing to prepare the derotation. If the derotator is not supported by
		* the current receiver an error is risen.
		* @param conf specified the tracking mode of the derotator, if <i>RCV_UNDEF_DERATOCONF</i> is given the present value is kept
		* @throw ComponentErrors::ValidationErrorExImpl
		* @throw ReceiversErrors::NoDewarPositioningExImpl
		* @throw ReceiversErrors::NoDerotatorAvailableExImpl
		* @throw ComponentErrors::CouldntGetComponentExImpl
		* @throw ReceiversErrors::DewarPositionerSetupErrorExImpl
		* @throw ComponentErrors::CORBAProblemExImpl
		* @throw ComponentErrors::UnexpectedExImpl
		*/
		void derotatorSetConfiguration(const Receivers::TDerotatorConfigurations& conf) throw (
		ComponentErrors::ValidationErrorExImpl,ReceiversErrors::NoDewarPositioningExImpl,ReceiversErrors::NoDerotatorAvailableExImpl,
		ComponentErrors::CouldntGetComponentExImpl,ReceiversErrors::DewarPositionerSetupErrorExImpl,ComponentErrors::CORBAProblemExImpl,
		ComponentErrors::UnexpectedExImpl);

		/**
		* This method allows to change the configuration of the dewar positioner when a rewinding is needed.
		* @param rewind new rewinding mode
		* @throw ComponentErrors::ValidationErrorExImpl
		* @throw ReceiversErrors::NoDewarPositioningExImpl
		* @throw ReceiversErrors::NoDerotatorAvailableExImpl
		* @throw ComponentErrors::CouldntGetComponentExImpl
		* @throw ReceiversErrors::DewarPositionerSetupErrorExImpl
		* @throw ComponentErrors::CORBAProblemExImpl
		* @throw ComponentErrors::UnexpectedExImpl
		* @throw ReceiversErrors::DewarPositionerNotConfiguredExImpl
		*/
		void derotatorSetRewindingMode(const Receivers::TRewindModes& rewind) throw (
		ComponentErrors::ValidationErrorExImpl,ReceiversErrors::NoDewarPositioningExImpl,ReceiversErrors::NoDerotatorAvailableExImpl,
		ComponentErrors::CouldntGetComponentExImpl,ReceiversErrors::DewarPositionerSetupErrorExImpl,ComponentErrors::CORBAProblemExImpl,
		ComponentErrors::UnexpectedExImpl,ReceiversErrors::DewarPositionerNotConfiguredExImpl);

		/**
		* This method specifies how many steps to rewind when the auto rewinding mode is configured (@sa <i>derotatorSetRewindingMode</i>).
		* @param steps number of steps
		* @throw ComponentErrors::ValidationErrorExImpl
		* @throw ReceiversErrors::NoDewarPositioningExImpl
		* @throw ReceiversErrors::NoDerotatorAvailableExImpl
		* @throw ComponentErrors::CouldntGetComponentExImpl
		* @throw ReceiversErrors::DewarPositionerSetupErrorExImpl
		* @throw ComponentErrors::CORBAProblemExImpl
		* @throw ComponentErrors::UnexpectedExImpl
		* @throw ReceiversErrors::DewarPositionerNotConfiguredExImpl
		*/
		void derotatorSetAutoRewindingSteps(const long& steps) throw (
		ComponentErrors::ValidationErrorExImpl,ReceiversErrors::NoDewarPositioningExImpl,ReceiversErrors::NoDerotatorAvailableExImpl,
		ComponentErrors::CouldntGetComponentExImpl,ReceiversErrors::DewarPositionerSetupErrorExImpl,ComponentErrors::CORBAProblemExImpl,
		ComponentErrors::UnexpectedExImpl,ReceiversErrors::DewarPositionerNotConfiguredExImpl);

		/**
		* It disables the derotator. It is implicitly called also by the <i>park()</i> method.
		* @throw ReceiversErrors::NoDewarPositioningExImpl
		* @throw ReceiversErrors::NoDerotatorAvailableExImpl
		* @throw ComponentErrors::ValidationErrorExImpl

Common/Servers/ReceiversBoss/src/ReceiversBossImpl.cpp

+79 −7

Original line number	Diff line number	Diff line
		@@ -124,11 +124,20 @@ void ReceiversBossImpl::initialize() throw (ACSErr::ACSbaseExImpl)
		m_parser->add("setLO",new function1<CRecvBossCore,non_constant,void_type,I<doubleSeq_type> >(m_core,&CRecvBossCore::setLO),1);
		m_parser->add("antennaUnitOn",new function0<CRecvBossCore,non_constant,void_type >(m_core,&CRecvBossCore::AUOn),0);
		m_parser->add("antennaUnitOff",new function0<CRecvBossCore,non_constant,void_type >(m_core,&CRecvBossCore::AUOff),0);
		m_parser->add("derotatorMode",new function3<CRecvBossCore,non_constant,void_type,
		/*m_parser->add("derotatorMode",new function3<CRecvBossCore,non_constant,void_type,
		I<enum_type<DerotatorConfigurations_converter,Receivers::TDerotatorConfigurations,DerotatorConfigurations_WildCard> >,
		I<enum_type<RewindModes_converter,Receivers::TRewindModes,RewindModes_WildCard> >,I<long_type> >(m_core,&CRecvBossCore::derotatorMode),3);
		I<enum_type<RewindModes_converter,Receivers::TRewindModes,RewindModes_WildCard> >,I<long_type> >(m_core,&CRecvBossCore::derotatorMode),3);*/
		m_parser->add("derotatorSetConfiguration",new function1<CRecvBossCore,non_constant,void_type,
		I<enum_type<DerotatorConfigurations_converter,Receivers::TDerotatorConfigurations,DerotatorConfigurations_WildCard> > >(
		m_core,&CRecvBossCore::derotatorSetConfiguration),1);
		m_parser->add("derotatorSetRewindingMode",new function1<CRecvBossCore,non_constant,void_type,
		I<enum_type<RewindModes_converter,Receivers::TRewindModes,RewindModes_WildCard> > >(
		m_core,&CRecvBossCore::derotatorSetRewindingMode),1);
		m_parser->add("derotatorSetAutoRewindingSteps",new function1<CRecvBossCore,non_constant,void_type,I<long_type> >(
		m_core,&CRecvBossCore::derotatorSetAutoRewindingSteps),1);

		m_parser->add("derotatorPark",new function0<CRecvBossCore,non_constant,void_type >(m_core,&CRecvBossCore::derotatorPark),0);
		m_parser->add("derotatorPosition",new function1<CRecvBossCore,non_constant,void_type, I<angle_type<SimpleParser::deg> > >(m_core,&CRecvBossCore::setDerotatorPosition),1);
		m_parser->add("derotatorSetPosition",new function1<CRecvBossCore,non_constant,void_type, I<angle_type<SimpleParser::deg> > >(m_core,&CRecvBossCore::setDerotatorPosition),1);
		m_parser->add("derotatorRewind",new function1<CRecvBossCore,non_constant,void_type,I<long_type> >(m_core,&CRecvBossCore::derotatorRewind),1);


		@@ -533,7 +542,7 @@ CORBA::Boolean ReceiversBossImpl::checkScan(ACS::Time startUt,const Receivers::T
		return true;
		}

		void ReceiversBossImpl::setDerotatorPosition(CORBA::Double position) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,
		void ReceiversBossImpl::derotatorSetPosition(CORBA::Double position) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,
		ReceiversErrors::ReceiversErrorsEx)
		{
		try {
		@@ -596,8 +605,71 @@ void ReceiversBossImpl::derotatorRewind(CORBA::Long steps) throw (
		}
		}

		void ReceiversBossImpl::derotatorSetRewindingMode(Receivers::TRewindModes rewind) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,
		ReceiversErrors::ReceiversErrorsEx)
		{
		try {
		m_core->derotatorSetRewindingMode(rewind);
		}
		catch (ComponentErrors::ComponentErrorsExImpl& ex) {
		ex.log(LM_DEBUG);
		throw ex.getComponentErrorsEx();
		}
		catch (ReceiversErrors::ReceiversErrorsExImpl& ex) {
		ex.log(LM_DEBUG);
		throw ex.getReceiversErrorsEx();
		}
		catch (...) {
		_EXCPT(ComponentErrors::UnexpectedExImpl,impl,"ReceiversBossImpl::derotatorSetRewindingMode()");
		impl.log(LM_DEBUG);
		throw impl.getComponentErrorsEx();
		}
		}

		void ReceiversBossImpl::derotatorSetAutoRewindingSteps(CORBA::Long steps) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,
		ReceiversErrors::ReceiversErrorsEx)
		{
		try {
		m_core->derotatorSetAutoRewindingSteps(steps);
		}
		catch (ComponentErrors::ComponentErrorsExImpl& ex) {
		ex.log(LM_DEBUG);
		throw ex.getComponentErrorsEx();
		}
		catch (ReceiversErrors::ReceiversErrorsExImpl& ex) {
		ex.log(LM_DEBUG);
		throw ex.getReceiversErrorsEx();
		}
		catch (...) {
		_EXCPT(ComponentErrors::UnexpectedExImpl,impl,"ReceiversBossImpl::derotatorSetAutoRewindingSteps()");
		impl.log(LM_DEBUG);
		throw impl.getComponentErrorsEx();
		}

		}

		void ReceiversBossImpl::derotatorSetConfiguration(Receivers::TDerotatorConfigurations conf) throw (CORBA::SystemException,
		ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx)
		{
		try {
		m_core->derotatorSetConfiguration(conf);
		}
		catch (ComponentErrors::ComponentErrorsExImpl& ex) {
		ex.log(LM_DEBUG);
		throw ex.getComponentErrorsEx();
		}
		catch (ReceiversErrors::ReceiversErrorsExImpl& ex) {
		ex.log(LM_DEBUG);
		throw ex.getReceiversErrorsEx();
		}
		catch (...) {
		_EXCPT(ComponentErrors::UnexpectedExImpl,impl,"ReceiversBossImpl::derotatorSetConfiguration()");
		impl.log(LM_DEBUG);
		throw impl.getComponentErrorsEx();
		}
		}

		void ReceiversBossImpl::derotatorMode(Receivers::TDerotatorConfigurations mode,Receivers::TRewindModes rewind,CORBA::Long feeds) throw (CORBA::SystemException,
		/*void ReceiversBossImpl::derotatorMode(Receivers::TDerotatorConfigurations mode,Receivers::TRewindModes rewind,CORBA::Long feeds) throw (CORBA::SystemException,
		ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx)
		{
		try {
		@@ -612,11 +684,11 @@ void ReceiversBossImpl::derotatorMode(Receivers::TDerotatorConfigurations mode,R
		throw ex.getReceiversErrorsEx();
		}
		catch (...) {
		_EXCPT(ComponentErrors::UnexpectedExImpl,impl,"ReceiversBossImpl::derotatorSetup()");
		_EXCPT(ComponentErrors::UnexpectedExImpl,impl,"ReceiversBossImpl::derotatorMode()");
		impl.log(LM_DEBUG);
		throw impl.getComponentErrorsEx();
		}
		}
		}*/

		void ReceiversBossImpl::derotatorPark() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx)
		{

Common/Servers/ReceiversBoss/src/RecvBossCore.cpp

+220 −4

File changed.

Preview size limit exceeded, changes collapsed.