Unverified Commit 9952bc5b authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

Fix issue 602 (#603) 

* fix issue #602: added a lib API to interact with the Medicina Vertex.

* fix issue #602: added entries in K band configuration in order to reference Vertex (IP and port) for the IF switch configuration.
Adjusted component code to send proper configuration command at setup time. Some minor fixes and typos corrected.
parent 2bd1547e

Common/Servers/MFKBandBaseReceiver/include/MFKBandBaseConf.h

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public: 
	/**

	 * Destructor

	 */

	~CConfiguration();

	virtual ~CConfiguration();



	/**

	 * @return the IP address of the board that controls the dewar
@@ -224,13 +224,13 @@ public: 
	 * @throw ComponentErrors::CDBAccess

	 * @param Services pointer to the container services object

	*/

	void init(maci::ContainerServices *Services)  throw (

	virtual void init(maci::ContainerServices *Services)  throw (

            ComponentErrors::CDBAccessExImpl,

            ComponentErrors::MemoryAllocationExImpl,

            ReceiversErrors::ModeErrorExImpl

    );

	

private:

protected:

	IRA::CString m_dewarIPAddress;

	WORD m_dewarPort;

	IRA::CString m_LNAIPAddress;

Common/Servers/MFKBandBaseReceiver/src/MFKBandBaseCore.cpp

+1 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ void CComponentCore::activate() throw ( 
    guard.release();

    

	lnaOn(); // Throw (ReceiversErrors::NoRemoteControlErrorExImpl,ReceiversErrors::ReceiverControlBoardErrorExImpl)

    externalCalOff();

    //externalCalOff();



    bool answer;

    try {
@@ -361,7 +361,6 @@ void CComponentCore::calOff() throw ( 
    }

}





void CComponentCore::vacuumSensorOff() throw (

        ReceiversErrors::NoRemoteControlErrorExImpl,

        ReceiversErrors::ReceiverControlBoardErrorExImpl

Common/Servers/ReceiversBoss/src/RecvBossCore.cpp

+8 −6
Original line number Diff line number Diff line
@@ -385,13 +385,15 @@ double CRecvBossCore::getDerotatorPosition(const ACS::Time& epoch) throw (Compon 
		ReceiversErrors::DewarPositionerCommandErrorExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::UnexpectedExImpl)

{

#ifdef COMPILE_TARGET_MED

	_EXCPT(ReceiversErrors::NoDewarPositioningExImpl,impl,"CRecvBossCore::getDerotatorPosition()");

	m_status=Management::MNG_WARNING;

	throw impl;

	//_EXCPT(ReceiversErrors::NoDewarPositioningExImpl,impl,"CRecvBossCore::getDerotatorPosition()");

	//m_status=Management::MNG_WARNING;

	//throw impl;

	return -9999.99;

#elif COMPILE_TARGET_NT

	_EXCPT(ReceiversErrors::NoDewarPositioningExImpl,impl,"CRecvBossCore::getDerotatorPosition()");

	m_status=Management::MNG_WARNING;

	throw impl;

	//_EXCPT(ReceiversErrors::NoDewarPositioningExImpl,impl,"CRecvBossCore::getDerotatorPosition()");

	//m_status=Management::MNG_WARNING;

	//throw impl;

	return -9999.99;

#else		

	IRA::CString component;

	bool derotator;

Medicina/CDB/alma/RECEIVERS/KBandDualFReceiver/KBandDualFReceiver.xml

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
    DewarPort="10000"

    LNAIPAddress="192.167.189.2"

    LNAPort="10001"   

    VertexIPAddress="192.168.51.2"

    VertexPort="2096"

    VertexCommand="proc kkc\n"    

    WatchDogResponseTime="10000000"

    WatchDogSleepTime="10000000"

    LNASamplingTime="250000"

Medicina/Configuration/CDB/alma/RECEIVERS/KBandDualFReceiver/KBandDualFReceiver.xml

+5 −2
Original line number Diff line number Diff line
@@ -17,9 +17,12 @@ 
    DewarPort="10000"

    LNAIPAddress="192.168.51.2"

    LNAPort="10001"   

    VertexIPAddress="192.168.51.2"

    VertexPort="2096"

    VertexCommand="proc kkc\n"   

    WatchDogResponseTime="10000000"

    WatchDogSleepTime="10000000"

    LNASamplingTime="250000"

    LNASamplingTime="25000000"

    RepetitionCacheTime="7000000"

    RepetitionExpireTime="10000000"

    LocalOscillatorInstance="RECEIVERS/LO"