diff --git a/pom.xml b/pom.xml index 879e5d0551833f78fe3d7b84f15928354d6904d5..4b3f47c41aa13a2f4d563da58aad143010d31c17 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ <groupId>fr.soleil.device</groupId> <artifactId>RetrigAO-${aol}-${mode}</artifactId> - <version>1.0.5</version> + <version>1.0.6</version> <packaging>nar</packaging> <name>RetrigAO</name> diff --git a/src/ADLinkContinuousAO.h b/src/ADLinkContinuousAO.h index e273b5bb18d61d964ea5ada668d8020304b840f8..95544f5f9a8cd621b7b043ec279c808a3258d112 100644 --- a/src/ADLinkContinuousAO.h +++ b/src/ADLinkContinuousAO.h @@ -3,8 +3,9 @@ //============================================================ //DEPENDENCIES //============================================================ -#include <asl/ContinuousAO.h> #include <Tango.h> +#include <asl/ContinuousAO.h> + class ADLinkContinuousAO: public asl::ContinuousAO, public Tango::LogAdapter { @@ -36,4 +37,4 @@ public: private: ACE_Thread_Mutex data_lock_; }; -#endif // _ADLinkContinuousAO_H \ No newline at end of file +#endif // _ADLinkContinuousAO_H diff --git a/src/RetrigAO.h b/src/RetrigAO.h index 93a26e6bca50db3eb76680e14a22f0511f6b1235..b12f15d82dafad6df908124deab0ad4fb0e7a087 100644 --- a/src/RetrigAO.h +++ b/src/RetrigAO.h @@ -8,9 +8,13 @@ // // $Author: anoureddine $ // -// $Revision: 1.9 $ +// $Revision: 1.10 $ // // $Log: not supported by cvs2svn $ +// Revision 1.9 2009/09/29 07:56:13 anoureddine +// - Add BufferDepth property and use it to memorize bufferDepth attribute in order to keep compatibility wilth previous version +// - call init_board() in stop() command +// // Revision 1.8 2009/09/16 08:10:54 anoureddine // - Transform bufferDepth property into attribute. // - Generate code with pogo 5.2.10 @@ -52,15 +56,15 @@ #ifndef _RETRIGAO_H #define _RETRIGAO_H -#include <ADLinkContinuousAO.h> #include <tango.h> +#include <ADLinkContinuousAO.h> //using namespace Tango; //class ADLinkContinuousAO; /** * @author $Author: anoureddine $ - * @version $Revision: 1.9 $ $ + * @version $Revision: 1.10 $ $ */ // Add your own constants definitions here. diff --git a/src/main.cpp b/src/main.cpp index d329208441588498aaabb1677d75174546a27d5c..abf853cb619eccb9430c974e7a88ce09a2fdf418 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/main.cpp,v 1.1.1.1 2004-12-06 10:23:37 syldup Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/main.cpp,v 1.2 2010-03-11 11:10:25 anoureddine Exp $"; //+============================================================================= // // file : main.cpp @@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD // // project : TANGO Device Server // -// $Author: syldup $ +// $Author: anoureddine $ // -// $Revision: 1.1.1.1 $ $ +// $Revision: 1.2 $ $ // // $Log: not supported by cvs2svn $ +// Revision 1.1.1.1 2004/12/06 10:23:37 syldup +// initial import +// // // copyleft : Synchrotron SOLEIL // L'Orme des Merisiers @@ -27,8 +30,9 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD // // (c) - Software Engineering Group - ESRF //============================================================================= -#include <ace\ACE.h> #include <tango.h> +#include <ace\ACE.h> + int main(int argc,char *argv[])