Unverified Commit 6ef7fb77 authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #618, generalized the ActiveSurface code (#620) 

These modifications have been tested with the simulators and the SRTActiveSurface still works properly. In my opinion, it is safe to assume it can be merged without further testing.
parent 2868f221

Common/Errors/ActiveSurfaceErrors/idl/ASErrors.idl

0 → 100644
+165 −0
Original line number Diff line number Diff line 
#ifndef  _ASErrors_IDL_

#define  _ASErrors_IDL_

	

/*******************************************************************************

* ALMA - Atacama Large Millimiter Array

* (c) European Southern Observatory, 2003 

*

*This library is free software; you can redistribute it and/or

*modify it under the terms of the GNU Lesser General Public

*License as published by the Free Software Foundation; either

*version 2.1 of the License, or (at your option) any later version.

*

*This library is distributed in the hope that it will be useful,

*but WITHOUT ANY WARRANTY; without even the implied warranty of

*MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

*Lesser General Public License for more details.

*

*You should have received a copy of the GNU Lesser General Public

*License along with this library; if not, write to the Free Software

*Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA

*

* "@(#) $Id: AES2IDL.xslt,v 1.9 2007/05/23 08:55:56 nbarriga Exp $"

*************  THIS FILE IS AUTOMATICALLY GENERATED !!!!!!

*/



#include <acserr.idl>



#pragma prefix "alma"

 	

module ACSErr 

{

	// type

	const ACSErr::ACSErrType ASErrors = 2003;

}; // module ACSErr



module ASErrors

{

	 const ACSErr::ErrorCode NoError = 0;

	 const ACSErr::ErrorCode USDCalibrated = 1;

	 const ACSErr::ErrorCode LibrarySocketError = 2;

	 const ACSErr::ErrorCode SocketReconn = 3;

	 const ACSErr::ErrorCode SocketFail = 4;

	 const ACSErr::ErrorCode SocketTOut = 5;

	 const ACSErr::ErrorCode SocketNotRdy = 6;

	 const ACSErr::ErrorCode MemoryAllocation = 7;

	 const ACSErr::ErrorCode LANConnectionError = 8;

	 const ACSErr::ErrorCode LAN_Unavailable = 9;

	 const ACSErr::ErrorCode sendCmdErr = 10;

	 const ACSErr::ErrorCode Incomplete = 11;

	 const ACSErr::ErrorCode InvalidResponse = 12;

	 const ACSErr::ErrorCode Nak = 13;

	 const ACSErr::ErrorCode CDBAccessError = 14;

	 const ACSErr::ErrorCode USDConnectionError = 15;

	 const ACSErr::ErrorCode USDTimeout = 16;

	 const ACSErr::ErrorCode USDUnavailable = 17;

	 const ACSErr::ErrorCode USDError = 18;

	 const ACSErr::ErrorCode DevIOError = 19;

	 const ACSErr::ErrorCode corbaError = 20;

	 const ACSErr::ErrorCode USDStillRunning = 21;

	 const ACSErr::ErrorCode USDunCalibrated = 22;

	 const ACSErr::ErrorCode CannotGetUSD = 23;

	

	// excption for type:

	exception ASErrorsEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	// excptions for codes:

	exception USDCalibratedEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception LibrarySocketErrorEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception SocketReconnEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception SocketFailEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception SocketTOutEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception SocketNotRdyEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception MemoryAllocationEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception LANConnectionErrorEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception LAN_UnavailableEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception sendCmdErrEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception IncompleteEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception InvalidResponseEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception NakEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception CDBAccessErrorEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception USDConnectionErrorEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception USDTimeoutEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception USDUnavailableEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception USDErrorEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception DevIOErrorEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception corbaErrorEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception USDStillRunningEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception USDunCalibratedEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	exception CannotGetUSDEx {

		ACSErr::ErrorTrace errorTrace;	

	};

	

	

}; // module ASErrors



#endif

SRT/Errors/SRTActiveSurfaceErrors/idl/ASErrors.xml→Common/Errors/ActiveSurfaceErrors/idl/ASErrors.xml

+50 −0
Original line number Diff line number Diff line
@@ -22,29 +22,29 @@ 
 <ErrorCode name="LibrarySocketError" shortDescription="Socket error. Critical" description="Error encountered while creating or accessing socket resource" />

 <ErrorCode name="SocketReconn" shortDescription="Socket reconnected. Warning" description="Socket was broken. Reconnected successfully"/>

 <ErrorCode name="SocketFail" shortDescription="Unrecoverable socket problems. Critical" description="The socket connection could not be re established"/>

 <ErrorCode name="SocketTOut" shortDescription="Time out writing to socket. Critical" description="Time out writing to socket. Critical"/>

 <ErrorCode name="SocketNotRdy" shortDescription="Unable to allocate socket resource. Error" description="Unable to allocate socket resource. Error"/>

 <ErrorCode name="MemoryAllocation" shortDescription="Buffer can't be allocated. Error" description="Buffer can't be allocated. Error"/>

 <ErrorCode name="LANConnectionError" shortDescription="LAN/485 converter is not reachable or disconnected" description="LAN/485 converter is not reachable or disconnected"/>

 <ErrorCode name="LAN_Unavailable" shortDescription="The LAN component is unavailable" description="The LAN component is unavailable"/>

 <ErrorCode name="sendCmdErr" shortDescription="sendCmd() returned a wrong code. Error" description="sendCmd() returned a wrong code. Error"/>

 <ErrorCode name="Incomplete" shortDescription="Incomplete reply from USD. Warning" description="Incomplete reply from USD. Warning"/>

 <ErrorCode name="InvalidResponse" shortDescription="USD returned an invalid acknowledge code. Error" description="USD returned an invalid acknowledge code. Error"/>

 <ErrorCode name="Nak" shortDescription="USD does not acknowledge last command.Warning" description="USD does not acknowledge last command.Warning"/>

 <ErrorCode name="CDBAccessError" shortDescription="Error while accessing the Configuration Database.Error" description="Error while accessing the Configuration Database.Error">

 <ErrorCode name="SocketTOut" shortDescription=" " description="Time out writing to socket. Critical"/>

 <ErrorCode name="SocketNotRdy" shortDescription=" " description="Unable to allocate socket resource. Error"/>

 <ErrorCode name="MemoryAllocation" shortDescription=" " description="Buffer can't be allocated. Error"/>

 <ErrorCode name="LANConnectionError" shortDescription=" " description="LAN/485 converter is not reachable or disconnected"/>

 <ErrorCode name="LAN_Unavailable" shortDescription=" " description="The LAN component is unavailable"/>

 <ErrorCode name="sendCmdErr" shortDescription=" " description="sendCmd() returned a wrong code. Error"/>

 <ErrorCode name="Incomplete" shortDescription=" " description="Incomplete reply from USD. Warning"/>

 <ErrorCode name="InvalidResponse" shortDescription=" " description="USD returned an invalid acknowledge code. Error"/>

 <ErrorCode name="Nak" shortDescription=" " description="USD does not acknowledge last command.Warning"/>

 <ErrorCode name="CDBAccessError" shortDescription=" " description="Error while accessing the Configuration Database.Error">

 	<Member name="FieldName" type="string" description="FiledName"/>

 </ErrorCode>

 <ErrorCode name="USDConnectionError" shortDescription="USD is not reachable or disconnected.Critical" description="USD is not reachable or disconnected.Critical"/>

 <ErrorCode name="USDConnectionError" shortDescription=" " description="USD is not reachable or disconnected.Critical"/>

 <ErrorCode name="USDTimeout" shortDescription=" " description="Timeout on receive data from USD.Critical">

	<Member name="which" type="string" description="the usd location"/>

 </ErrorCode>

 <ErrorCode name="USDUnavailable" shortDescription="USD no more available.Warning" description="USD no more available.Warning"/>

 <ErrorCode name="USDError" shortDescription="generic USD error executing an action.Error" description="generic USD error executing an action.Error"/>

 <ErrorCode name="DevIOError" shortDescription="USD error reading or writing a property.Error" description="USD error reading or writing a property.Error">

 <ErrorCode name="USDUnavailable" shortDescription=" " description="USD no more available.Warning"/>

 <ErrorCode name="USDError" shortDescription=" " description="generic USD error executing an action.Error"/>

 <ErrorCode name="DevIOError" shortDescription=" " description="USD error reading or writing a property.Error">

 	<Member name="property" type="string" description="Name of the property"/>

</ErrorCode>

 <ErrorCode name="corbaError" shortDescription="CORBA system exception executing an action.Error" description="CORBA system exception executing an action.Error"/>

 <ErrorCode name="USDStillRunning" shortDescription="USD still running while shouldn't be!.Error" description="USD still running while shouldn't be!.Error"/>

 <ErrorCode name="USDunCalibrated" shortDescription="USD not calibrated.Warning" description="USD not calibrated.Warning"/>

 <ErrorCode name="CannotGetUSD" shortDescription="USD not activated.Warning" description="USD not activated.Warning"/>

 <ErrorCode name="corbaError" shortDescription=" " description="CORBA system exception executing an action.Error"/>

 <ErrorCode name="USDStillRunning" shortDescription=" " description="USD still running while shouldn't be!.Error"/>

 <ErrorCode name="USDunCalibrated" shortDescription=" " description="USD not calibrated.Warning"/>

 <ErrorCode name="CannotGetUSD" shortDescription=" " description="USD not activated.Warning"/>

 </Type>

SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceCommon.midl→Common/Interfaces/ActiveSurfaceInterface/idl/ActiveSurfaceCommon.midl

+3 −3
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ 
/* This code is under GNU General Public Licence (GPL).              */

/*                                                                   */

/* Who                                          when        what     */

/* Giuseppe Carboni (giuseppe.carboni@inaf.it)  04/12/2019  Creation */

/* Giuseppe Carboni (giuseppe.carboni@inaf.it)  20/10/2021  Creation */

/*********************************************************************/



#ifndef _SRTACTIVESURFACECOMMON_IDL_

#ifndef _ACTIVESURFACECOMMON_IDL_



#define _SRTACTIVESURFACECOMMON_IDL_

#define _ACTIVESURFACECOMMON_IDL_



#include <baci.idl>

#include <enumpropMACRO.idl>