Commit d81b3ca1 authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

Fix #355: The standard build for receivers boss component (SRT like) … (#356) 

* Fix #355: The standard build for receivers bocc component (SRT like) also employesd in Noto so taht the NotoAllReceivers component
is exploited.

* fix 355: changed the make according the PR comment
parent 65ebf695

Common/Servers/ReceiversBoss/include/RecvBossCore.h

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public: 
	 * @throw ComponentErrors::IRALibraryResourceExImpl

	 * @throw ComponentErrors::CDBAccessExImpl

	*/

	virtual void execute() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::CDBAccessExImpl);

	virtual void execute() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::CDBAccessExImpl,ComponentErrors::SocketErrorExImpl);

	

	/**

	 * This function initializes the boss core, all preliminary operation are performed here.
@@ -354,8 +354,8 @@ private: 
#elif COMPILE_TARGET_NT



        #warning "Compiling RecvBossCore with Noto target"

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

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

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

	void reinitCal() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::SocketErrorExImpl);



	IRA::CSocket m_fsSocket;

	//bool m_fsOpened;

Common/Servers/ReceiversBoss/src/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
# different code is required until new specific component to control the receivers for Medicina are written

ifeq ($(STATION),Medicina)

	USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_MED'

else ifeq ($(STATION),Noto)

	USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_STANDARD' -D 'COMPILE_TARGET_NT'

else

	USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_STANDARD'

endif

Common/Servers/ReceiversBoss/src/RecvBossCore.cpp

+1 −1
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ void CRecvBossCore::initialize(maci::ContainerServices* services,CConfiguration 
	m_loEpoch=m_starFreqEpoch=m_bandWidthEpoch=m_polEpoch=m_feedsEpoch=m_IFsEpoch=m_modeEpoch=m_recvStatusEpoch=m_dewarStatusEpoch=0;

}



void CRecvBossCore::execute() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::CDBAccessExImpl)

void CRecvBossCore::execute() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::CDBAccessExImpl,ComponentErrors::SocketErrorExImpl)

{

}

Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void CRecvBossCore::initialize(maci::ContainerServices* services,CConfiguration 
	ACS_LOG(LM_FULL_INFO,"CRecvBossCore::initialize()",(LM_INFO,"ReceiversBoss notification channel open"));

}



void CRecvBossCore::execute() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::CDBAccessExImpl)

void CRecvBossCore::execute() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::CDBAccessExImpl,ComponentErrors::SocketErrorExImpl)

{

}

Common/Servers/ReceiversBoss/src/RecvBossCore_nt.i

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void CRecvBossCore::initialize(maci::ContainerServices* services,CConfiguration 
        //m_totalPower_proxy.setContainerServices(m_services);

}



void CRecvBossCore::execute() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::CDBAccessExImpl)

void CRecvBossCore::execute() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::CDBAccessExImpl,ComponentErrors::SocketErrorExImpl)

{

	m_fsCalSocketError=true;

	m_fsSocketError=true;
@@ -547,7 +547,7 @@ void CRecvBossCore::publishData() throw (ComponentErrors::NotificationChannelErr 
	}

}



void CRecvBossCore::reinitCal() throw (ComponentErrors::IRALibraryResourceExImpl)

void CRecvBossCore::reinitCal() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::SocketErrorExImpl)

{

	IRA::CError err;

	IRA::CString fsIpAddr(FSCAL_ADDRESS);
@@ -577,7 +577,7 @@ void CRecvBossCore::reinitCal() throw (ComponentErrors::IRALibraryResourceExImpl 
	m_fsCalSocketError=false;	

}



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

void CRecvBossCore::reinit() throw (ComponentErrors::IRALibraryResourceExImpl,ComponentErrors::SocketErrorExImpl)

{

	IRA::CError err;

	IRA::CString fsIpAddr(FS_ADDRESS);