Commit 24b53076 authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Merging latest bugfix onto master. 

Fix #379, increased the SRT AntennaBoss WatchingThread rate. (#380)
parents 389d081b 2542d604

Common/Servers/AntennaBoss/include/BossCore.h

+3 −2
Original line number Diff line number Diff line
@@ -868,8 +868,9 @@ private: 
	 * @throw ComponentErrors::CouldntCallOperationExImpl

	 * @throw ComponentErrors::UnexpectedExImpl

	 * @throw ComponentErrors::CouldntGetComponentExImpl

     * @returns true if the attributes have been updated, false otherwise

	*/ 

	void updateAttributes() throw (ComponentErrors::CORBAProblemExImpl,ComponentErrors::CouldntCallOperationExImpl,

	bool updateAttributes() throw (ComponentErrors::CORBAProblemExImpl,ComponentErrors::CouldntCallOperationExImpl,

			ComponentErrors::UnexpectedExImpl,ComponentErrors::CouldntGetComponentExImpl);

	

	/**

Common/Servers/AntennaBoss/src/BossCore.cpp

+5 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ CBossCore::CBossCore(ContainerServices *service,CConfiguration *conf,acscomponen 
	m_cbUnstow=m_callbackUnstow->_this();

	m_cbStow=m_callbackStow->_this();

	m_cbSetup=m_callbackSetup->_this();

	m_lastEncoderRead = ACS::Time(0);

}



CBossCore::~CBossCore()
@@ -950,7 +951,7 @@ void CBossCore::getAllattributes() 
{	

}



void CBossCore::updateAttributes() throw (ComponentErrors::CORBAProblemExImpl,ComponentErrors::CouldntCallOperationExImpl,

bool CBossCore::updateAttributes() throw (ComponentErrors::CORBAProblemExImpl,ComponentErrors::CouldntCallOperationExImpl,

		ComponentErrors::UnexpectedExImpl,ComponentErrors::CouldntGetComponentExImpl)

{

	ACS::Time time;
@@ -965,6 +966,7 @@ void CBossCore::updateAttributes() throw (ComponentErrors::CORBAProblemExImpl,Co 
	loadMount(m_mount,m_mountError); // throw ComponentErrors::CouldntGetComponentExImpl

	try {

		m_mount->getEncoderCoordinates(time,az,el,azOff,elOff,m_lastAzimuthSection);

		if(time == m_lastEncoderRead) return false;

	}

	catch (CORBA::SystemException& ex) {

		_EXCPT(ComponentErrors::CORBAProblemExImpl,impl,"CBossCore::updateAttributes()");
@@ -1113,6 +1115,8 @@ void CBossCore::updateAttributes() throw (ComponentErrors::CORBAProblemExImpl,Co 
			}

		}

	}



    return true;

}



void CBossCore::publishData() throw (ComponentErrors::NotificationChannelErrorExImpl)

Common/Servers/AntennaBoss/src/WatchingThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ void CWatchingThread::onStart() 
		IRA::CSecAreaResourceWrapper<CBossCore> resource=m_core->Get("WATCHINGTHREAD:runLoop");

		try {

			//printf("updateAttributes\n");

			resource->updateAttributes();

			if(!resource->updateAttributes()) return;

		}

		catch (ACSErr::ACSbaseExImpl& E) {

			_ADD_BACKTRACE(ComponentErrors::WatchDogErrorExImpl,_dummy,E,"CWatchingThread::runLoop()");

SRT/CDB/alma/ANTENNA/Boss/Boss.xml

+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 
             xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

             xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

             WatchingThreadTime="200000"

             WatchingThreadTime="25000"

             WorkingThreadTime="180000"

             RepetitionCacheTime="2000000"

             RepetitionExpireTime="5000000"

             MinPointNumber="25"

             MaxPointNumber="250"

             GapTime="200000"

             GapTime="100000"

	     	 CoordinateIntegration="1000000"

	     	 CutOffElevation="70.0"

	     	 SkydipElevationRange="15.0-90.0"

SRT/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml

+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 
             xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

             xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

             WatchingThreadTime="200000"

             WatchingThreadTime="25000"

             WorkingThreadTime="180000"

             RepetitionCacheTime="2000000"

             RepetitionExpireTime="5000000"

             MinPointNumber="25"

             MaxPointNumber="250"

             GapTime="200000"

             GapTime="100000"

	     	 CoordinateIntegration="1000000"

	     	 CutOffElevation="70.0"

	     	 SkydipElevationRange="15.0-90.0"