Skip to content
Snippets Groups Projects
Commit cfe5c372 authored by Vincent Hardion's avatar Vincent Hardion
Browse files

"Migration_Tango7_Part2"

parent 882c43b6
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>SY2527Channel-${aol}-${mode}</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
<packaging>nar</packaging>
<name>SY2527Channel</name>
<description>SY2527Channel device</description>
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/SY2527Channel/src/SY2527Channel.cpp,v 1.8 2007-11-19 09:12:41 sebleport Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/SY2527Channel/src/SY2527Channel.cpp,v 1.9 2010-03-26 09:58:35 vince_soleil Exp $";
//+=============================================================================
//
// file : SY2527Channel.cpp
......@@ -11,11 +11,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
//
// project : TANGO Device Server
//
// $Author: sebleport $
// $Author: vince_soleil $
//
// $Revision: 1.8 $
// $Revision: 1.9 $
//
// $Log: not supported by cvs2svn $
// Revision 1.8 2007/11/19 09:12:41 sebleport
// - fault and alarm state have got now a higher priority
//
// Revision 1.7 2007/10/15 15:40:42 sebleport
// - in get_device_property(), we write properties in database only if they have never been written
// - slotNumber and channelNumber are described in status attribute
......@@ -87,19 +90,19 @@ namespace SY2527Channel_ns
//
//-----------------------------------------------------------------------------
SY2527Channel::SY2527Channel(Tango::DeviceClass *cl,string &s)
:Tango::Device_3Impl(cl,s.c_str())
:Tango::Device_4Impl(cl,s.c_str())
{
init_device();
}
SY2527Channel::SY2527Channel(Tango::DeviceClass *cl,const char *s)
:Tango::Device_3Impl(cl,s)
:Tango::Device_4Impl(cl,s)
{
init_device();
}
SY2527Channel::SY2527Channel(Tango::DeviceClass *cl,const char *s,const char *d)
:Tango::Device_3Impl(cl,s,d)
:Tango::Device_4Impl(cl,s,d)
{
init_device();
}
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/SY2527Channel/src/SY2527ChannelClass.cpp,v 1.3 2007-09-06 09:13:44 sebleport Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/SY2527Channel/src/SY2527ChannelClass.cpp,v 1.4 2010-03-26 09:58:35 vince_soleil Exp $";
static const char *TagName = "$Name: not supported by cvs2svn $";
static const char *HttpServer= "http://www.esrf.fr/computing/cs/tango/tango_doc/ds_doc/";
//+=============================================================================
......@@ -12,11 +12,16 @@ static const char *HttpServer= "http://www.esrf.fr/computing/cs/tango/tango_doc/
//
// project : TANGO Device Server
//
// $Author: sebleport $
// $Author: vince_soleil $
//
// $Revision: 1.3 $
// $Revision: 1.4 $
//
// $Log: not supported by cvs2svn $
// Revision 1.3 2007/09/06 09:13:44 sebleport
// - shiftVoltage changed by deltaVoltage attribute
// - add OFF state
// - RUNNING state priority has changed
//
// Revision 1.2 2007/09/05 09:41:37 sebleport
// the command and attribute code has been implemeted
//
......@@ -500,7 +505,7 @@ void SY2527ChannelClass::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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment