Commit f85da2b1 authored by Marco Bartolini's avatar Marco Bartolini
Browse files

Added calOn and calOff methods to TotalPower and modified RecvBossCore for... 

Added calOn and calOff methods to TotalPower and modified RecvBossCore for Noto station in order to control calibration mark via TotalPower backend
parent 86955309

Common/Interfaces/BackendsInterface/idl/TotalPower.idl

+10 −0
Original line number Diff line number Diff line
@@ -123,6 +123,16 @@ module Backends { 
		*/

		void activateNoiseCalibrationSwitching(in string argument) raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);

				

                /**

                 * These methods are used to command the noise diode on or off exploiting the 

                 * TotalPower backend connection to the calibration mark control. This method is

                 * available only if the TotalPower backend is properly configured to support

                 * noise mark activation.

                 */

                void calOn() raises (ComponentErrors::ComponentErrorsEx,

                                     BackendsErrors::BackendsErrorsEx);

                void calOff() raises (ComponentErrors::ComponentErrorsEx,

                                     BackendsErrors::BackendsErrorsEx);

		/**

		 * This method can be used to initialize the backend. Since this hardware can be connected to various receiver some parameter must be set before

		 * any further use. This parameter will stay fixed until a new initialization is issued. At start up a default initialization is commanded but can be

Common/Libraries/ComponentProxy/src/compilation_test.cpp

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ int main() 
    Receivers::LocalOscillator_proxy m_local_OscillatorProxy;

    Weather::GenericWeatherStation_proxy m_genericWeatherStationProxy;

    Antenna::Mount_proxy m_mount;



    m_totalPowerProxy.setComponentName("Backends/TotalPower");

    m_totalPowerProxy->calOn();

    return 0;

}

Common/Servers/ReceiversBoss/include/ReceiversBossImpl.h

+2 −1
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ public: 
	virtual ACS::ROdouble_ptr derotatorPosition() throw (CORBA::SystemException);



private:

        maci::ContainerServices *m_services;

        baci::SmartPropertyPointer<baci::ROdoubleSeq> m_plocalOscillator;

	baci::SmartPropertyPointer<baci::ROstring> m_pactualSetup;

	baci::SmartPropertyPointer<baci::ROlong> m_pfeeds;

Common/Servers/ReceiversBoss/include/RecvBossCore.h

+8 −3
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
#include <ReceiversBossS.h>

#include <ReceiversDefinitionsS.h>

#include <IRA>

//only noto implementation needs a reference to the TotalPower backend component

//that is used for calibration mark control

#include <BackendsProxy.h>

#include <acsncSimpleSupplier.h>

#include "Configuration.h"

#define _RECVBOSSCORE_MAX_IFS 4
@@ -291,7 +294,6 @@ public: 
	void publishData() throw (ComponentErrors::NotificationChannelErrorExImpl);

private:





	Management::TSystemStatus m_status;

        maci::ContainerServices *m_services;

	CConfiguration *m_config;
@@ -301,6 +303,7 @@ private: 
	IRA::CString m_currentOperativeMode;



#ifdef COMPILE_TARGET_MED

        #warning "Compiling RecvBossCore with Medicina target"

	/**

	 * Socket to the KBand Recevier

	 */
@@ -323,6 +326,7 @@ private: 


#elif COMPILE_TARGET_NT



        #warning "Compiling RecvBossCore with Noto target"

	void reinit() throw (ComponentErrors::IRALibraryResourceExImpl);

	void reinitCal() throw (ComponentErrors::IRALibraryResourceExImpl);
@@ -338,9 +342,10 @@ private: 
	double m_bandWidth[_RECVBOSSCORE_MAX_IFS];

	IRA::CString m_currentReceiver;

	long m_totalOutputs;



        Backends::TotalPower_proxy m_totalPower_proxy;

	

#else

        #warning "Compiling RecvBossCore with default target"

	Receivers::Receiver_var m_currentRecv;

	bool m_currentRecvError;

	IRA::CString m_currentRecvInstance;

Common/Servers/ReceiversBoss/src/Makefile

+9 −2
Original line number Diff line number Diff line
@@ -50,8 +50,15 @@ EXECUTABLES_L = 
# <brief description of xxxxx program>

ReceiversBossImpl_OBJECTS   = ReceiversBossImpl	RecvBossCore Configuration WatchingThread

ReceiversBossImpl_LDFLAGS   =

ifeq ($(TARGETSYS),NT)

	ReceiversBossImpl_LIBS      = IRALibrary ComponentErrors CommonReceiverInterfaceStubs ReceiversBossStubs ReceiversDefinitionsStubs AntennaDefinitionsStubs GenericReceiverStubs \

				      DewarPositionerStubs ManagmentDefinitionsStubs DewarPositionerDefinitionsStubs ManagementErrors ParserErrors ReceiversErrors acsnc \

				      BackendsDefinitionsStubs TotalPowerStubs GenericBackendStubs BackendsErrors bulkDataStubs bulkDataReceiverStubs \

				      bulkDataCallback bulkDataSenderStubs 

else

	ReceiversBossImpl_LIBS      = IRALibrary ComponentErrors CommonReceiverInterfaceStubs ReceiversBossStubs ReceiversDefinitionsStubs AntennaDefinitionsStubs GenericReceiverStubs \

				      DewarPositionerStubs ManagmentDefinitionsStubs DewarPositionerDefinitionsStubs ManagementErrors ParserErrors ReceiversErrors acsnc

endif



#

# special compilation flags for single c sources