diff --git a/pom.xml b/pom.xml index 7203bb48dc0c60f29059ecacbcb32547b150a6c8..bc1f229512a60f4323af51f6709fd1cc102c625c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ <groupId>fr.soleil.device</groupId> <artifactId>RetrigAO-${aol}-${mode}</artifactId> - <version>1.0.7</version> + <version>1.0.8</version> <packaging>nar</packaging> <name>RetrigAO</name> diff --git a/src/RetrigAO.cpp b/src/RetrigAO.cpp index f9aebe6f7c2f5c78bd814a83bff161f846363403..ed2f563c7bbc643ce7018d936dd51d6f9d97593c 100644 --- a/src/RetrigAO.cpp +++ b/src/RetrigAO.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAO.cpp,v 1.14 2009-09-17 06:59:03 anoureddine Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAO.cpp,v 1.15 2010-03-26 09:41:54 vince_soleil Exp $"; //+============================================================================= // // file : RetrigAO.cpp @@ -11,11 +11,15 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD // // project : TANGO Device Server // -// $Author: anoureddine $ +// $Author: vince_soleil $ // -// $Revision: 1.14 $ +// $Revision: 1.15 $ // // $Log: not supported by cvs2svn $ +// Revision 1.14 2009/09/17 06:59:03 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.13 2009/09/16 08:10:54 anoureddine // - Transform bufferDepth property into attribute. // - Generate code with pogo 5.2.10 @@ -104,18 +108,18 @@ namespace RetrigAO_ns // - s : Device name // //----------------------------------------------------------------------------- -RetrigAO::RetrigAO(Tango::DeviceClass *cl,string &s):Tango::Device_3Impl(cl,s.c_str()) +RetrigAO::RetrigAO(Tango::DeviceClass *cl,string &s):Tango::Device_4Impl(cl,s.c_str()) { init_device(); } -RetrigAO::RetrigAO(Tango::DeviceClass *cl,const char *s):Tango::Device_3Impl(cl,s) +RetrigAO::RetrigAO(Tango::DeviceClass *cl,const char *s):Tango::Device_4Impl(cl,s) { init_device(); } RetrigAO::RetrigAO(Tango::DeviceClass *cl,const char *s,const char *d) -:Tango::Device_3Impl(cl,s,d) +:Tango::Device_4Impl(cl,s,d) { init_device(); } diff --git a/src/RetrigAOClass.cpp b/src/RetrigAOClass.cpp index 4aa805f9038285fbb388ee59d95fb6f72a12d53d..345000028b04f305231572dfaa9dda83c8883dc9 100644 --- a/src/RetrigAOClass.cpp +++ b/src/RetrigAOClass.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAOClass.cpp,v 1.3 2009-09-16 08:10:54 anoureddine Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAOClass.cpp,v 1.4 2010-03-26 09:41:54 vince_soleil Exp $"; static const char *TagName = "$Name: not supported by cvs2svn $"; @@ -18,11 +18,15 @@ static const char *RCSfile = "$RCSfile: RetrigAOClass.cpp,v $"; // // project : TANGO Device Server // -// $Author: anoureddine $ +// $Author: vince_soleil $ // -// $Revision: 1.3 $ +// $Revision: 1.4 $ // // $Log: not supported by cvs2svn $ +// Revision 1.3 2009/09/16 08:10:54 anoureddine +// - Transform bufferDepth property into attribute. +// - Generate code with pogo 5.2.10 +// // Revision 1.2 2005/06/15 09:18:01 abeilleg // attributes channelXEnable added. // @@ -934,7 +938,7 @@ void RetrigAOClass::write_class_property() // Put inheritance Tango::DbDatum inher_datum("InheritedFrom"); vector<string> inheritance; - inheritance.push_back("Device_3Impl"); + inheritance.push_back("Device_4Impl"); inher_datum << inheritance; data.push_back(inher_datum);