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

"Migration_Tango7_Part2"

parent d891c766
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
pom.xml
+ 1
− 1
View file @ e3be7a75
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</parent> </parent>
<groupId>fr.soleil.device</groupId> <groupId>fr.soleil.device</groupId>
<artifactId>LoCuM_4-${aol}-${mode}</artifactId> <artifactId>LoCuM_4-${aol}-${mode}</artifactId>
<version>2.1.2</version> <version>2.1.3</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<name>LoCuM_4</name> <name>LoCuM_4</name>
<description>LoCuM_4 device</description> <description>LoCuM_4 device</description>
......
src/LoCuM_4.cpp
+ 17
− 14
View file @ e3be7a75
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/LoCuM_4/src/LoCuM_4.cpp,v 1.19 2008-10-10 09:40:42 buteau Exp $"; static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/LoCuM_4/src/LoCuM_4.cpp,v 1.20 2010-03-26 09:31:17 vince_soleil Exp $";
//+============================================================================= //+=============================================================================
// //
// file : LoCuM_4.cpp // file : LoCuM_4.cpp
...@@ -11,11 +11,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio ...@@ -11,11 +11,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
// //
// project : TANGO Device Server // project : TANGO Device Server
// //
// $Author: buteau $ // $Author: vince_soleil $
// //
// $Revision: 1.19 $ // $Revision: 1.20 $
// //
// $Log: not supported by cvs2svn $ // $Log: not supported by cvs2svn $
// Revision 1.19 2008/10/10 09:40:42 buteau
// tentative de correction pour crash DSErver
//
// Revision 1.18 2008/10/08 12:11:53 buteau // Revision 1.18 2008/10/08 12:11:53 buteau
// - nettoyage code // - nettoyage code
// //
...@@ -116,19 +119,19 @@ namespace LoCuM_4_ns ...@@ -116,19 +119,19 @@ namespace LoCuM_4_ns
// //
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
LoCuM_4::LoCuM_4(Tango::DeviceClass *cl,string &s) LoCuM_4::LoCuM_4(Tango::DeviceClass *cl,string &s)
:Tango::Device_3Impl(cl,s.c_str()) :Tango::Device_4Impl(cl,s.c_str())
{ {
init_device(); init_device();
} }
LoCuM_4::LoCuM_4(Tango::DeviceClass *cl,const char *s) LoCuM_4::LoCuM_4(Tango::DeviceClass *cl,const char *s)
:Tango::Device_3Impl(cl,s) :Tango::Device_4Impl(cl,s)
{ {
init_device(); init_device();
} }
LoCuM_4::LoCuM_4(Tango::DeviceClass *cl,const char *s,const char *d) LoCuM_4::LoCuM_4(Tango::DeviceClass *cl,const char *s,const char *d)
:Tango::Device_3Impl(cl,s,d) :Tango::Device_4Impl(cl,s,d)
{ {
init_device(); init_device();
} }
...@@ -264,7 +267,7 @@ namespace LoCuM_4_ns ...@@ -264,7 +267,7 @@ namespace LoCuM_4_ns
"read range", "read range",
"LoCuM_4::read_gain"); "LoCuM_4::read_gain");
// response string like "S1_100A,S2_Plus,HV_OFF,Ext_OFF,Bias+_ON,Auto_OFF," // response string like "S1_100�A,S2_Plus,HV_OFF,Ext_OFF,Bias+_ON,Auto_OFF,"
_DEV_TRY( _DEV_TRY(
*attr_gain_read = get_range(response), *attr_gain_read = get_range(response),
...@@ -472,7 +475,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin) ...@@ -472,7 +475,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin)
int index_HV; int index_HV;
response = write_read("$01:CONF?",true); response = write_read("$01:CONF?",true);
// response string like "S1_100A,S2_Plus,HV_OFF,Ext_OFF,Bias+_ON,Auto_OFF," // response string like "S1_100�A,S2_Plus,HV_OFF,Ext_OFF,Bias+_ON,Auto_OFF,"
// update status: HV & Range // update status: HV & Range
index_HV = response.find("HV_OFF",0); index_HV = response.find("HV_OFF",0);
...@@ -552,7 +555,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin) ...@@ -552,7 +555,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin)
{ {
Tango::Except::throw_exception( Tango::Except::throw_exception(
(const char*) "TANGO_WRONG_DATA_ERROR", (const char*) "TANGO_WRONG_DATA_ERROR",
(const char*) "possible discret values are: 1000 ; 100 ; 10 ; 1 ; 0.1 ; 0.01; 0.001 ; 0.0001 in A", (const char*) "possible discret values are: 1000 ; 100 ; 10 ; 1 ; 0.1 ; 0.01; 0.001 ; 0.0001 in �A",
(const char*) "LoCuM_4::write_inputCurrentRange()"); (const char*) "LoCuM_4::write_inputCurrentRange()");
} }
} }
...@@ -560,7 +563,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin) ...@@ -560,7 +563,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin)
{ {
Tango::Except::throw_exception( Tango::Except::throw_exception(
(const char*) "TANGO_WRONG_DATA_ERROR", (const char*) "TANGO_WRONG_DATA_ERROR",
(const char*) "be aware [0.0001 < range (in A) < 1000] you can also use RangeUp & RangeDown commands", (const char*) "be aware [0.0001 < range (in �A) < 1000] you can also use RangeUp & RangeDown commands",
(const char*) "LoCuM_4::write_inputCurrentRange()"); (const char*) "LoCuM_4::write_inputCurrentRange()");
} }
} }
...@@ -657,7 +660,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin) ...@@ -657,7 +660,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin)
std::string range; std::string range;
int index_underscore,index_comma; int index_underscore,index_comma;
// config string like "S1_100A,S2_Plus,HV_OFF,Ext_OFF,Bias+_ON,Auto_OFF," // config string like "S1_100�A,S2_Plus,HV_OFF,Ext_OFF,Bias+_ON,Auto_OFF,"
index_underscore = config.find_first_of("_",0); index_underscore = config.find_first_of("_",0);
...@@ -690,13 +693,13 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin) ...@@ -690,13 +693,13 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin)
if(range == "1mA") if(range == "1mA")
return 1000; return 1000;
if(range == "100A") if(range == "100�A")
return 100; return 100;
if(range == "10A") if(range == "10�A")
return 10; return 10;
if(range == "1A") if(range == "1�A")
return 1; return 1;
if(range == "100nA") if(range == "100nA")
......
src/LoCuM_4Class.cpp
+ 13
− 7
View file @ e3be7a75
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/LoCuM_4/src/LoCuM_4Class.cpp,v 1.12 2007-11-21 10:16:51 sebleport Exp $"; static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/LoCuM_4/src/LoCuM_4Class.cpp,v 1.13 2010-03-26 09:31:17 vince_soleil Exp $";
static const char *TagName = "$Name: not supported by cvs2svn $"; static const char *TagName = "$Name: not supported by cvs2svn $";
static const char *HttpServer= "http://www.esrf.fr/computing/cs/tango/tango_doc/ds_doc/"; static const char *HttpServer= "http://www.esrf.fr/computing/cs/tango/tango_doc/ds_doc/";
//+============================================================================= //+=============================================================================
...@@ -12,11 +12,17 @@ static const char *HttpServer= "http://www.esrf.fr/computing/cs/tango/tango_doc/ ...@@ -12,11 +12,17 @@ static const char *HttpServer= "http://www.esrf.fr/computing/cs/tango/tango_doc/
// //
// project : TANGO Device Server // project : TANGO Device Server
// //
// $Author: sebleport $ // $Author: vince_soleil $
// //
// $Revision: 1.12 $ // $Revision: 1.13 $
// //
// $Log: not supported by cvs2svn $ // $Log: not supported by cvs2svn $
// Revision 1.12 2007/11/21 10:16:51 sebleport
// - code cleaning
// - remove XbpmLocum proxy property
// - "reset" command removed
// - dev_status() in comment
//
// Revision 1.11 2007/09/17 08:14:47 sebleport // Revision 1.11 2007/09/17 08:14:47 sebleport
// code cleaned // code cleaned
// //
...@@ -394,9 +400,9 @@ void LoCuM_4Class::attribute_factory(vector<Tango::Attr *> &att_list) ...@@ -394,9 +400,9 @@ void LoCuM_4Class::attribute_factory(vector<Tango::Attr *> &att_list)
gainAttrib *gain = new gainAttrib(); gainAttrib *gain = new gainAttrib();
Tango::UserDefaultAttrProp gain_prop; Tango::UserDefaultAttrProp gain_prop;
gain_prop.set_label("range"); gain_prop.set_label("range");
gain_prop.set_unit("µA"); gain_prop.set_unit("�A");
gain_prop.set_standard_unit("µA"); gain_prop.set_standard_unit("�A");
gain_prop.set_display_unit("µA"); gain_prop.set_display_unit("�A");
gain_prop.set_format("%8.4f"); gain_prop.set_format("%8.4f");
gain_prop.set_description("to select input current range."); gain_prop.set_description("to select input current range.");
gain->set_default_properties(gain_prop); gain->set_default_properties(gain_prop);
...@@ -558,7 +564,7 @@ void LoCuM_4Class::write_class_property() ...@@ -558,7 +564,7 @@ void LoCuM_4Class::write_class_property()
// Put inheritance // Put inheritance
Tango::DbDatum inher_datum("InheritedFrom"); Tango::DbDatum inher_datum("InheritedFrom");
vector<string> inheritance; vector<string> inheritance;
inheritance.push_back("Device_3Impl"); inheritance.push_back("Device_4Impl");
inher_datum << inheritance; inher_datum << inheritance;
data.push_back(inher_datum); data.push_back(inher_datum);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

The place to be for your source code