Skip to content
Snippets Groups Projects
Commit 29575e79 authored by Jade PHAM's avatar Jade PHAM
Browse files

fix CORBA::string_dup

parent d39bdba0
Branches
Tags
1 merge request!1fix CORBA::string_dup
Show whitespace changes
Inline Side-by-side
src/MCCE2Electrometers.cpp
+ 37
− 63
View file @ 29575e79
...@@ -42,7 +42,7 @@ static const char *RcsId = "$Id: $"; ...@@ -42,7 +42,7 @@ static const char *RcsId = "$Id: $";
#include <tango.h> #include <tango.h>
#include <PogoHelper.h> #include <PogoHelper.h>
#include <Xstring.h> #include <yat/utils/XString.h>
#include <yat4tango/InnerAppender.h> #include <yat4tango/InnerAppender.h>
#include <yat4tango/YatLogAdapter.h> #include <yat4tango/YatLogAdapter.h>
#include <MCCE2Electrometers.h> #include <MCCE2Electrometers.h>
...@@ -179,9 +179,6 @@ void MCCE2Electrometers::delete_device() ...@@ -179,9 +179,6 @@ void MCCE2Electrometers::delete_device()
INFO_STREAM << "Remove the inner-appender." << endl; INFO_STREAM << "Remove the inner-appender." << endl;
yat4tango::InnerAppender::release(this); yat4tango::InnerAppender::release(this);
INFO_STREAM << "Remove the log-adapter." << endl;
yat4tango::YatLogAdapter::release();
/*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::delete_device /*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::delete_device
} }
...@@ -197,7 +194,6 @@ void MCCE2Electrometers::init_device() ...@@ -197,7 +194,6 @@ void MCCE2Electrometers::init_device()
/*----- PROTECTED REGION ID(MCCE2Electrometers::init_device_before) ENABLED START -----*/ /*----- PROTECTED REGION ID(MCCE2Electrometers::init_device_before) ENABLED START -----*/
// Initialization before get_device_property() call // Initialization before get_device_property() call
yat4tango::YatLogAdapter::initialize(this);
// Initialize the inner appender. // Initialize the inner appender.
yat4tango::InnerAppender::initialize(this); yat4tango::InnerAppender::initialize(this);
...@@ -211,6 +207,7 @@ void MCCE2Electrometers::init_device() ...@@ -211,6 +207,7 @@ void MCCE2Electrometers::init_device()
this->_updateRange2FromHW = true; //- force update after init. this->_updateRange2FromHW = true; //- force update after init.
this->_electroCH1StrType = "Not connected"; this->_electroCH1StrType = "Not connected";
this->_electroCH2StrType = "Not connected"; this->_electroCH2StrType = "Not connected";
_notConnectedStr = "Not connected";
...@@ -413,11 +410,10 @@ void MCCE2Electrometers::always_executed_hook() ...@@ -413,11 +410,10 @@ void MCCE2Electrometers::always_executed_hook()
//-------------------------------------------------------- //--------------------------------------------------------
void MCCE2Electrometers::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list)) void MCCE2Electrometers::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
{ {
DEBUG_STREAM << "MCCE2Electrometers::read_attr_hardware(vector<long> &attr_list) entering... " << endl; //DEBUG_STREAM << "MCCE2Electrometers::read_attr_hardware(vector<long> &attr_list) entering... " << endl;
/*----- PROTECTED REGION ID(MCCE2Electrometers::read_attr_hardware) ENABLED START -----*/ /*----- PROTECTED REGION ID(MCCE2Electrometers::read_attr_hardware) ENABLED START -----*/
// Add your own code // Add your own code
// Add your own code here
/*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::read_attr_hardware /*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::read_attr_hardware
} }
...@@ -439,10 +435,10 @@ void MCCE2Electrometers::read_electrometerChannel(Tango::Attribute &attr) ...@@ -439,10 +435,10 @@ void MCCE2Electrometers::read_electrometerChannel(Tango::Attribute &attr)
if ( !this->_electrometer ) if ( !this->_electrometer )
{ {
ERROR_STREAM << "Not enough memory to create the electrometer obj!" << std::endl; ERROR_STREAM << "Failed to build the electrometer obj : error on connection or check_electrotype at init_device step?" << std::endl;
Tango::Except::throw_exception( Tango::Except::throw_exception(
"MEMORY_ERROR", "MEMORY_ERROR",
"Failed to build the electrometer obj : not enough memory!?", "Failed to build the electrometer obj : error on connection or check_electrotype at init_device step",
"MCCE2Electrometers::read_electrometerChannel()" "MCCE2Electrometers::read_electrometerChannel()"
); );
} }
...@@ -516,12 +512,15 @@ void MCCE2Electrometers::write_electrometerChannel(Tango::WAttribute &attr) ...@@ -516,12 +512,15 @@ void MCCE2Electrometers::write_electrometerChannel(Tango::WAttribute &attr)
this->_electrometer = this->_electrometerCH1; this->_electrometer = this->_electrometerCH1;
//- now force update from HW //- now force update from HW
this->_updateRange1FromHW = true; this->_updateRange1FromHW = true;
*attr_range1_read = get_range();
} }
else else
{ {
WARN_STREAM << "Cannot control electrometer on this channel : seems that nothing is connected on!" << std::endl; WARN_STREAM << "Cannot control electrometer on this channel : seems that nothing is connected on!" << std::endl;
//- warn nothing is connected on this channel // nothing is connected on this channel
*attr_range1_read = CORBA::string_dup("Not connected"); *attr_range1_read = &_notConnectedStr[0];
} }
} }
else if ( w_val == ELETRO_CHANNEL_TWO ) else if ( w_val == ELETRO_CHANNEL_TWO )
...@@ -531,12 +530,15 @@ void MCCE2Electrometers::write_electrometerChannel(Tango::WAttribute &attr) ...@@ -531,12 +530,15 @@ void MCCE2Electrometers::write_electrometerChannel(Tango::WAttribute &attr)
this->_electrometer = this->_electrometerCH2; this->_electrometer = this->_electrometerCH2;
//- now force update from HW //- now force update from HW
this->_updateRange2FromHW = true; this->_updateRange2FromHW = true;
*attr_range2_read = get_range();
} }
else else
{ {
WARN_STREAM << "Cannot control electrometer on this channel : seems that nothing is connected on!" << std::endl; WARN_STREAM << "Cannot control electrometer on this channel : seems that nothing is connected on!" << std::endl;
//- warn nothing is connected on this channel //- warn nothing is connected on this channel
*attr_range2_read = CORBA::string_dup("Not connected"); *attr_range2_read = &_notConnectedStr[0];
} }
} }
attr_electrometerChannel_write = w_val; attr_electrometerChannel_write = w_val;
...@@ -549,8 +551,7 @@ void MCCE2Electrometers::write_electrometerChannel(Tango::WAttribute &attr) ...@@ -549,8 +551,7 @@ void MCCE2Electrometers::write_electrometerChannel(Tango::WAttribute &attr)
* Description: The channel one MCCE2 range. * Description: The channel one MCCE2 range.
* *
* Data type: Tango::DevString * Data type: Tango::DevString
* Attr type: Scalar * Attr type: Scalar */
*/
//-------------------------------------------------------- //--------------------------------------------------------
void MCCE2Electrometers::read_range1(Tango::Attribute &attr) void MCCE2Electrometers::read_range1(Tango::Attribute &attr)
{ {
...@@ -558,17 +559,17 @@ void MCCE2Electrometers::read_range1(Tango::Attribute &attr) ...@@ -558,17 +559,17 @@ void MCCE2Electrometers::read_range1(Tango::Attribute &attr)
/*----- PROTECTED REGION ID(MCCE2Electrometers::read_range1) ENABLED START -----*/ /*----- PROTECTED REGION ID(MCCE2Electrometers::read_range1) ENABLED START -----*/
if ( !this->_electrometerCH1 ) if ( !this->_electrometerCH1 )
{ {
*attr_range1_read = CORBA::string_dup("Not connected"); *attr_range1_read = &_notConnectedStr[0];
} }
else else
{ {
if ( this->_updateRange1FromHW && *attr_electrometerChannel_read == ELETRO_CHANNEL_ONE ) if ( this->_updateRange1FromHW && *attr_electrometerChannel_read == ELETRO_CHANNEL_ONE )
{ {
*attr_range1_read = this->get_range(); *attr_range1_read = this->get_range();
this->_updateRange1FromHW = false; this->_updateRange1FromHW = false;
} }
} }
attr.set_value(attr_range1_read); attr.set_value(attr_range1_read);
/*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::read_range1 /*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::read_range1
...@@ -588,17 +589,17 @@ void MCCE2Electrometers::read_range2(Tango::Attribute &attr) ...@@ -588,17 +589,17 @@ void MCCE2Electrometers::read_range2(Tango::Attribute &attr)
/*----- PROTECTED REGION ID(MCCE2Electrometers::read_range2) ENABLED START -----*/ /*----- PROTECTED REGION ID(MCCE2Electrometers::read_range2) ENABLED START -----*/
if ( !this->_electrometerCH2 ) if ( !this->_electrometerCH2 )
{ {
*attr_range2_read = CORBA::string_dup("Not connected"); *attr_range2_read = &_notConnectedStr[0];
} }
else else
{ {
if ( this->_updateRange2FromHW && *attr_electrometerChannel_read == ELETRO_CHANNEL_TWO ) if ( this->_updateRange2FromHW && *attr_electrometerChannel_read == ELETRO_CHANNEL_TWO )
{ {
*attr_range2_read = this->get_range(); *attr_range2_read = get_range();
this->_updateRange2FromHW = false; this->_updateRange2FromHW = false;
} }
} }
attr.set_value(attr_range2_read); attr.set_value(attr_range2_read);
/*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::read_range2 /*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::read_range2
...@@ -635,9 +636,7 @@ Tango::DevState MCCE2Electrometers::dev_state() ...@@ -635,9 +636,7 @@ Tango::DevState MCCE2Electrometers::dev_state()
Tango::DevState argout = Tango::UNKNOWN; // replace by your own algorithm Tango::DevState argout = Tango::UNKNOWN; // replace by your own algorithm
// Add your own code // Add your own code
DEBUG_STREAM << "MCCE2Electrometers::dev_state(): entering... !" << endl;
// Add your own code to control device here
try try
{ {
//- check properties //- check properties
...@@ -667,11 +666,9 @@ Tango::DevState MCCE2Electrometers::dev_state() ...@@ -667,11 +666,9 @@ Tango::DevState MCCE2Electrometers::dev_state()
else else
{ {
//- update state //- update state
this->_electrometer->electrometer_status(); _electrometer->electrometer_status();
//- get electrometer state
short tmpState = _electrometer->electrometer_state();
switch(tmpState) switch(_electrometer->electrometer_state())
{ {
case Tango::ON : case Tango::ON :
argout = Tango::ON; argout = Tango::ON;
...@@ -725,8 +722,6 @@ Tango::DevState MCCE2Electrometers::dev_state() ...@@ -725,8 +722,6 @@ Tango::DevState MCCE2Electrometers::dev_state()
throw; throw;
} }
set_state(argout);
/*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::dev_state /*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::dev_state
set_state(argout); // Give the state to Tango. set_state(argout); // Give the state to Tango.
if (argout!=Tango::ALARM) if (argout!=Tango::ALARM)
...@@ -749,7 +744,7 @@ Tango::ConstDevString MCCE2Electrometers::dev_status() ...@@ -749,7 +744,7 @@ Tango::ConstDevString MCCE2Electrometers::dev_status()
string status = "Device is OK"; string status = "Device is OK";
// Add your own code // Add your own code
//- clear previous status //- clear previous status
this->_statusStr.clear(); _statusStr.clear();
// Add your own code to control device here // Add your own code to control device here
try try
...@@ -758,6 +753,11 @@ Tango::ConstDevString MCCE2Electrometers::dev_status() ...@@ -758,6 +753,11 @@ Tango::ConstDevString MCCE2Electrometers::dev_status()
{ {
_statusStr = "Device cannot be up while its properties are not set!"; _statusStr = "Device cannot be up while its properties are not set!";
} }
else if ( !this->_electrometer )
{
_statusStr = " Init device failed: communication error or something wrong on check_electrotype";
}
//- check device initialization //- check device initialization
else if ( !this->_electrometerCH1 && !_electrometerCH2 ) else if ( !this->_electrometerCH1 && !_electrometerCH2 )
{ {
...@@ -818,8 +818,7 @@ Tango::ConstDevString MCCE2Electrometers::dev_status() ...@@ -818,8 +818,7 @@ Tango::ConstDevString MCCE2Electrometers::dev_status()
set_status("Cannot perform electrometer_status() command : caugth [...] exception."); set_status("Cannot perform electrometer_status() command : caugth [...] exception.");
throw; throw;
} }
set_status( _statusStr.c_str() ); status = _statusStr;
return _statusStr.c_str();
/*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::dev_status /*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::dev_status
set_status(status); // Give the status to Tango. set_status(status); // Give the status to Tango.
...@@ -1707,16 +1706,6 @@ Tango::DevString MCCE2Electrometers::get_range() ...@@ -1707,16 +1706,6 @@ Tango::DevString MCCE2Electrometers::get_range()
DEBUG_STREAM << "MCCE2Electrometers::GetRange() - " << device_name << endl; DEBUG_STREAM << "MCCE2Electrometers::GetRange() - " << device_name << endl;
/*----- PROTECTED REGION ID(MCCE2Electrometers::get_range) ENABLED START -----*/ /*----- PROTECTED REGION ID(MCCE2Electrometers::get_range) ENABLED START -----*/
// Add your own code
// POGO has generated a method core with argout allocation.
// If you would like to use a static reference without copying,
// See "TANGO Device Server Programmer's Manual"
// (chapter : Writing a TANGO DS / Exchanging data)
//------------------------------------------------------------
// Add your own code to control device here
DEBUG_STREAM << "MCCE2Electrometers::get_range(): entering... !" << endl;
// Add your own code to control device here // Add your own code to control device here
if ( !this->_electrometer ) if ( !this->_electrometer )
{ {
...@@ -1743,7 +1732,7 @@ Tango::DevString MCCE2Electrometers::get_range() ...@@ -1743,7 +1732,7 @@ Tango::DevString MCCE2Electrometers::get_range()
set_state(Tango::ALARM); set_state(Tango::ALARM);
set_status("Failed to read the range!"); set_status("Failed to read the range!");
ERROR_STREAM << "Failed to set read the range : ElectrometerException EXCEPTION -> " << df << std::endl; ERROR_STREAM << "Failed to read the range : ElectrometerException EXCEPTION -> " << df << std::endl;
Tango::Except::re_throw_exception(df, Tango::Except::re_throw_exception(df,
"UNKNOWN_ERROR", "UNKNOWN_ERROR",
"Failed to read the range.", "Failed to read the range.",
...@@ -2100,10 +2089,6 @@ Tango::DevShort MCCE2Electrometers::get_hz_filter() ...@@ -2100,10 +2089,6 @@ Tango::DevShort MCCE2Electrometers::get_hz_filter()
/*----- PROTECTED REGION ID(MCCE2Electrometers::get_hz_filter) ENABLED START -----*/ /*----- PROTECTED REGION ID(MCCE2Electrometers::get_hz_filter) ENABLED START -----*/
// Add your own code // Add your own code
DEBUG_STREAM << "MCCE2Electrometers::get_hz_filter(): entering... !" << endl;
// Add your own code to control device here
std::string dataStr(""); std::string dataStr("");
if ( !this->_electrometer ) if ( !this->_electrometer )
...@@ -2119,7 +2104,7 @@ Tango::DevShort MCCE2Electrometers::get_hz_filter() ...@@ -2119,7 +2104,7 @@ Tango::DevShort MCCE2Electrometers::get_hz_filter()
try try
{ {
dataStr = this->_electrometer->get_ElectroMeterFrequency(); dataStr = this->_electrometer->get_ElectroMeterFrequency();
argout = XString<short>::convertFromString(dataStr); argout = yat::XString<short>::to_num(dataStr);
} }
catch(const electrometer::ElectrometerException& ke) catch(const electrometer::ElectrometerException& ke)
{ {
...@@ -2189,7 +2174,7 @@ void MCCE2Electrometers::set_hz_filter(Tango::DevShort argin) ...@@ -2189,7 +2174,7 @@ void MCCE2Electrometers::set_hz_filter(Tango::DevShort argin)
try try
{ {
dataStr = XString<short>::convertToString(argin); dataStr = yat::XString<short>::to_string(argin);
this->_electrometer->set_ElectroMeterFrequency(dataStr); this->_electrometer->set_ElectroMeterFrequency(dataStr);
} }
catch(const electrometer::ElectrometerException& ke) catch(const electrometer::ElectrometerException& ke)
...@@ -2246,9 +2231,6 @@ Tango::DevShort MCCE2Electrometers::get_gain() ...@@ -2246,9 +2231,6 @@ Tango::DevShort MCCE2Electrometers::get_gain()
// Add your own code // Add your own code
DEBUG_STREAM << "MCCE2Electrometers::get_gain(): entering... !" << endl;
// Add your own code to control device here
if ( !this->_electrometer ) if ( !this->_electrometer )
{ {
ERROR_STREAM << "Not enough memory to create the electrometer obj!" << std::endl; ERROR_STREAM << "Not enough memory to create the electrometer obj!" << std::endl;
...@@ -2263,7 +2245,7 @@ Tango::DevShort MCCE2Electrometers::get_gain() ...@@ -2263,7 +2245,7 @@ Tango::DevShort MCCE2Electrometers::get_gain()
{ {
std::string dataStr(""); std::string dataStr("");
dataStr = this->_electrometer->get_ElectroMeterGain(); dataStr = this->_electrometer->get_ElectroMeterGain();
argout = XString<short>::convertFromString(dataStr); argout = yat::XString<short>::to_num(dataStr);
} }
catch(const electrometer::ElectrometerException& ke) catch(const electrometer::ElectrometerException& ke)
{ {
...@@ -2331,7 +2313,7 @@ void MCCE2Electrometers::set_gain(Tango::DevUShort argin) ...@@ -2331,7 +2313,7 @@ void MCCE2Electrometers::set_gain(Tango::DevUShort argin)
try try
{ {
std::string dataStr(""); std::string dataStr("");
dataStr = XString<short>::convertToString(argin); dataStr = yat::XString<short>::to_string(argin);
this->_electrometer->set_ElectroMeterGain(dataStr); this->_electrometer->set_ElectroMeterGain(dataStr);
} }
catch(const electrometer::ElectrometerException& ke) catch(const electrometer::ElectrometerException& ke)
...@@ -2387,16 +2369,7 @@ Tango::DevString MCCE2Electrometers::get_electrometer_type_str(Tango::DevUShort ...@@ -2387,16 +2369,7 @@ Tango::DevString MCCE2Electrometers::get_electrometer_type_str(Tango::DevUShort
DEBUG_STREAM << "MCCE2Electrometers::GetElectrometerTypeStr() - " << device_name << endl; DEBUG_STREAM << "MCCE2Electrometers::GetElectrometerTypeStr() - " << device_name << endl;
/*----- PROTECTED REGION ID(MCCE2Electrometers::get_electrometer_type_str) ENABLED START -----*/ /*----- PROTECTED REGION ID(MCCE2Electrometers::get_electrometer_type_str) ENABLED START -----*/
// Add your own code
// POGO has generated a method core with argout allocation.
// If you would like to use a static reference without copying,
// See "TANGO Device Server Programmer's Manual"
// (chapter : Writing a TANGO DS / Exchanging data)
//------------------------------------------------------------
DEBUG_STREAM << "MCCE2Electrometers::get_electrometer_type_str(): entering... !" << endl;
// Add your own code to control device here
if ( !this->_electrometerCH1 && !_electrometerCH2 ) if ( !this->_electrometerCH1 && !_electrometerCH2 )
{ {
ERROR_STREAM << "No electrometer connected on both channels!" << std::endl; ERROR_STREAM << "No electrometer connected on both channels!" << std::endl;
...@@ -2495,7 +2468,6 @@ void MCCE2Electrometers::create_electrometers_obj() ...@@ -2495,7 +2468,6 @@ void MCCE2Electrometers::create_electrometers_obj()
{ {
if(nMCCE1) if(nMCCE1)
{ {
DEBUG_STREAM<<"get_electrometer_type: " <<std::endl;
//- get type as num //- get type as num
type1 = nMCCE1->get_electrometer_type(); type1 = nMCCE1->get_electrometer_type();
DEBUG_STREAM<<"get_electrometer_type type1= "<<type1 <<std::endl; DEBUG_STREAM<<"get_electrometer_type type1= "<<type1 <<std::endl;
...@@ -2646,6 +2618,7 @@ void MCCE2Electrometers::create_electrometers_obj() ...@@ -2646,6 +2618,7 @@ void MCCE2Electrometers::create_electrometers_obj()
//- read channel range //- read channel range
this->_electrometer = this->_electrometerCH1; this->_electrometer = this->_electrometerCH1;
*attr_range1_read = this->get_range(); *attr_range1_read = this->get_range();
INFO_STREAM << "this->_electrometer = this->_electrometerCH1!" << std::endl; INFO_STREAM << "this->_electrometer = this->_electrometerCH1!" << std::endl;
...@@ -2661,6 +2634,7 @@ void MCCE2Electrometers::create_electrometers_obj() ...@@ -2661,6 +2634,7 @@ void MCCE2Electrometers::create_electrometers_obj()
//- read channel range //- read channel range
this->_electrometer = this->_electrometerCH2; this->_electrometer = this->_electrometerCH2;
*attr_range2_read = this->get_range(); *attr_range2_read = this->get_range();
INFO_STREAM << "this->_electrometer = this->_electrometerCH2!" << std::endl; INFO_STREAM << "this->_electrometer = this->_electrometerCH2!" << std::endl;
......
src/MCCE2Electrometers.h
+ 29
− 25
View file @ 29575e79
...@@ -78,7 +78,7 @@ public: ...@@ -78,7 +78,7 @@ public:
// Device property data members // Device property data members
public: public:
// ProxyName: The name of the device which manage the communication. // ProxyName: The name of the device which manages the communication.
string proxyName; string proxyName;
// Electrometer1Address: The first electrometer address configured. <br /> // Electrometer1Address: The first electrometer address configured. <br />
// Note : if not connected, push 0 or let empty the property. // Note : if not connected, push 0 or let empty the property.
...@@ -393,6 +393,8 @@ protected : ...@@ -393,6 +393,8 @@ protected :
std::string _statusStr; std::string _statusStr;
std::string _notConnectedStr;
bool _init_done; //- used to allow device to start !! bool _init_done; //- used to allow device to start !!
bool _missing_property; bool _missing_property;
bool _updateRange1FromHW; bool _updateRange1FromHW;
...@@ -410,9 +412,11 @@ private : ...@@ -410,9 +412,11 @@ private :
AbstractElectrometerClass* _electrometerCH1; //- electrometer on channel 1 AbstractElectrometerClass* _electrometerCH1; //- electrometer on channel 1
AbstractElectrometerClass* _electrometerCH2; //- electrometer on channel 2 AbstractElectrometerClass* _electrometerCH2; //- electrometer on channel 2
Tango::DevUShort attr_electrometerChannel_write; Tango::DevUShort attr_electrometerChannel_write;
//- instanciate electrometer(s) obj //- instanciate electrometer(s) obj
void create_electrometers_obj(); void create_electrometers_obj();
/*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::Additional Method prototypes /*----- PROTECTED REGION END -----*/ // MCCE2Electrometers::Additional Method prototypes
}; };
......
src/MCCE2Electrometers.xmi
+ 2
− 2
View file @ 29575e79
<?xml version="1.0" encoding="ASCII"?> <?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl"> <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="MCCE2Electrometers" pogoRevision="8.2"> <classes name="MCCE2Electrometers" pogoRevision="8.2">
<description description="This class allows you to control all MCCE-2 Novelec electrometers&#xA;through a Serial bus.&#xA;&lt;br> Supported types :&#xA;&lt;br> Novelec Electrometers : MCCE2" title="Novelec MCCE-2 Electrometers" sourcePath="/home/informatique/ica/phamj/DEV/Serial/novelecelectrometer/src" language="Cpp" filestogenerate="XMI file,Code files,html Pages" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="true"> <description description="This class allows you to control all MCCE-2 Novelec electrometers&#xA;through a Serial bus.&#xA;&lt;br> Supported types :&#xA;&lt;br> Novelec Electrometers : MCCE2" title="Novelec MCCE-2 Electrometers" sourcePath="/home/informatique/ica/phamj/DEV/Serial/mcce2electrometers/src" language="Cpp" filestogenerate="XMI file,Code files,html Pages" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="true">
<inheritances classname="Device_4Impl" sourcePath=""/> <inheritances classname="Device_4Impl" sourcePath=""/>
<identification contact="at synchrotron-soleil.fr - xavier.elattaoui" author="xavier.elattaoui" emailDomain="synchrotron-soleil.fr" classFamily="Acquisition" siteSpecific="" platform="All Platforms" bus="Serial Line" manufacturer="SAPHYMO" reference="MCCE-2"/> <identification contact="at synchrotron-soleil.fr - xavier.elattaoui" author="xavier.elattaoui" emailDomain="synchrotron-soleil.fr" classFamily="Acquisition" siteSpecific="" platform="All Platforms" bus="Serial Line" manufacturer="SAPHYMO" reference="MCCE-2"/>
</description> </description>
<deviceProperties name="ProxyName" description="The name of the device which manage the communication."> <deviceProperties name="ProxyName" description="The name of the device which manages the communication.">
<type xsi:type="pogoDsl:StringType"/> <type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties> </deviceProperties>
......
src/MCCE2ElectrometersClass.cpp
+ 1
− 1
View file @ 29575e79
...@@ -648,7 +648,7 @@ void MCCE2ElectrometersClass::set_default_property() ...@@ -648,7 +648,7 @@ void MCCE2ElectrometersClass::set_default_property()
// Set Default device Properties // Set Default device Properties
prop_name = "ProxyName"; prop_name = "ProxyName";
prop_desc = "The name of the device which manage the communication."; prop_desc = "The name of the device which manages the communication.";
prop_def = ""; prop_def = "";
vect_data.clear(); vect_data.clear();
if (prop_def.length()>0) if (prop_def.length()>0)
......
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