Commit 0071f92b authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #245, fixed some bugs of Sardara backend. (#246) 

Also integrated the backend with the new SRT LP band IFDistributor.
parent 12e6981b

Common/Servers/Sardara/include/CommandLine.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <BackendsErrors.h>

#include <BackendsErrors.h>

#include <SardaraS.h>

#include <SardaraS.h>

#include <TotalPowerS.h>

#include <TotalPowerS.h>

#include <SRTIFDistributorS.h>

#include <string>

#include <string>

#include <sstream>

#include <sstream>

#include <DiscosBackendProtocol>

#include <DiscosBackendProtocol>
@@ -123,6 +124,7 @@ public: 
	 * Call this function in order to know which section an input is attached to.

	 * Call this function in order to know which section an input is attached to.

	 */

	 */

	void getInputSection(ACS::longSeq& inpSection) const;

	void getInputSection(ACS::longSeq& inpSection) const;

	void getInputSectionAttr(ACS::longSeq& inpSection) const;

	

	

	/**

	/**

	 * Call this function in order to get the last measure of the system temperature.

	 * Call this function in order to get the last measure of the system temperature.
@@ -151,6 +153,8 @@ public: 
	void getAttenuation(ACS::doubleSeq& att) throw (ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl,

	void getAttenuation(ACS::doubleSeq& att) throw (ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl,

			BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ConnectionExImpl);

			BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ConnectionExImpl);

	

	

	void getAttenuationAttr(ACS::doubleSeq& att) throw (ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl,

			BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ConnectionExImpl);

	/**

	/**

	 * Call this function in order to get the current band width of each input.

	 * Call this function in order to get the current band width of each input.

	 * @param bw this is a sequence of double values that correspond to the bandwidth of each analog input.

	 * @param bw this is a sequence of double values that correspond to the bandwidth of each analog input.
@@ -481,6 +485,7 @@ private: 




    ContainerServices* m_services;

    ContainerServices* m_services;

    Backends::TotalPower_var m_totalPower;

    Backends::TotalPower_var m_totalPower;

    Receivers::GenericIFDistributor_var m_ifDistributor;





	/**

	/**

	 * List the fields of the backend status 

	 * List the fields of the backend status
@@ -760,6 +765,8 @@ private: 
    bool m_SL00S;

    bool m_SL00S;

    bool m_SP00S;

    bool m_SP00S;





    bool m_stationSRT;

	

};

};





#endif /*_COMMANDLINE_H_*/
 
#endif /*_COMMANDLINE_H_*/

Common/Servers/Sardara/include/DevIOAttenuation.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ public: 
		// get the CommandLine .......

		// get the CommandLine .......

		CSecAreaResourceWrapper<CCommandLine> line=m_pLink->Get();

		CSecAreaResourceWrapper<CCommandLine> line=m_pLink->Get();

		try {

		try {

			line->getAttenuation(m_val);

			line->getAttenuationAttr(m_val);

		}

		}

		catch (ACSErr::ACSbaseExImpl& E) {

		catch (ACSErr::ACSbaseExImpl& E) {

			_ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOAttenuation::read()");

			_ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOAttenuation::read()");

Common/Servers/Sardara/include/DevIOInputSection.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ public: 
		// get the CommandLine .......

		// get the CommandLine .......

		CSecAreaResourceWrapper<CCommandLine> line=m_pLink->Get();

		CSecAreaResourceWrapper<CCommandLine> line=m_pLink->Get();

		try {

		try {

			line->getInputSection(m_val);

			line->getInputSectionAttr(m_val);

		}

		}

		catch (ACSErr::ACSbaseExImpl& E) {

		catch (ACSErr::ACSbaseExImpl& E) {

			_ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOInputSection::read()");

			_ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOInputSection::read()");

Common/Servers/Sardara/include/DevIOStatus.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ public: 
		try {

		try {

			DWORD ptrn;

			DWORD ptrn;

			line->getBackendStatus(ptrn);

			line->getBackendStatus(ptrn);

			m_val=(ACS::pattern)ptrn;

			//m_val=(ACS::pattern)ptrn;

		}

		}

		catch (ACSErr::ACSbaseExImpl& E) {

		catch (ACSErr::ACSbaseExImpl& E) {

			_ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOStatus::read()");

			_ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOStatus::read()");

Common/Servers/Sardara/src/CommandLine.cpp

+178 −208

File changed.

Preview size limit exceeded, changes collapsed.