Unverified Commit 01aa299b authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

Merge pull request #718 from discos/stable 

Porting hotfix 716 into master
parents 7edda015 9796f3db

Common/Servers/ReceiversBoss/include/RecvBossCore.h

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ private: 
	ACS::Time m_feedsEpoch;

	ACS::Time m_IFsEpoch;

	ACS::Time m_modeEpoch;

	Backends::CalMux_proxy m_xalMux_proxy;

	Backends::CalMux_proxy m_calMux_proxy;



#elif COMPILE_TARGET_NT

Common/Servers/ReceiversBoss/src/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ ifeq ($(STATION),Noto) 
				      bulkDataCallback bulkDataSenderStubs DiscosVersion

else

	ReceiversBossImpl_LIBS      = IRALibrary ComponentErrors CommonReceiverInterfaceStubs ReceiversBossStubs ReceiversDefinitionsStubs AntennaDefinitionsStubs GenericReceiverStubs \

				      DewarPositionerStubs ManagmentDefinitionsStubs DewarPositionerDefinitionsStubs ManagementErrors ParserErrors ReceiversErrors acsnc DiscosVersion

				      DewarPositionerStubs ManagmentDefinitionsStubs DewarPositionerDefinitionsStubs ManagementErrors ParserErrors ReceiversErrors acsnc DiscosVersion \

				      CalDiodeControllerStubs CalMuxStubs



endif



#

Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i

+6 −6
Original line number Diff line number Diff line
@@ -101,15 +101,15 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon 
			throw impl;

		}

	}

	else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")){

/*	else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")){

		char buffer [14] = {'s','e','t',' ','m','a','r','c','a','c',' ','o','n','\n' };

		if (!sendToRecvControl((const void *)buffer,14)) {

			_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOn()");

			m_status=Management::MNG_FAILURE;

			throw impl;

		}

	}

	else if (m_currentRecvCode=="XXP") {

	}*/

	else if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {

		m_calMux_proxy->calOn();

		// turn the marca on through the FS

		/*IRA::CString fsBuffer("calon\n");
@@ -166,15 +166,15 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo 
			throw impl;

		}

	}

	else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {

	/*else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {

		char buffer [15] = {'s','e','t',' ','m','a','r','c','a','c',' ','o','f','f','\n' };

		if (!sendToRecvControl((const void *)buffer,15)) {

			_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOff()");

			m_status=Management::MNG_FAILURE;

			throw impl;

		}

	}

	else if (m_currentRecvCode=="XXP") {

	}*/

	else if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {

		// turn the marca on through thr FS

		/*IRA::CString fsBuffer("caloff\n");

		if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {

Medicina/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
    Container="PyCalmuxContainer"

    ImplLang="py"

    KeepAliveTime="-1"

    Default="false"

    Default="true"

/>

Medicina/Configuration/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
    Container="PyCalmuxContainer"

    ImplLang="py"

    KeepAliveTime="-1"

    Default="false"

    Default="true"

/>