Skip to content
Snippets Groups Projects
Commit fef73a9d authored by Xavier ELATTAOUI's avatar Xavier ELATTAOUI
Browse files

No commit message

No commit message
parent b733b5df
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@
<groupId>fr.soleil.device</groupId>
<artifactId>XPSGroup-${aol}-${mode}</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>nar</packaging>
......
......@@ -968,11 +968,11 @@ void XPSGroup::write_trajectory(Tango::WAttribute &attr)
ad->velocity_write = __NAN__;
ad->is_starting = true;
//- attribute position
init_dynamic_attribute (ad->pos_attr_name, ad, false);
init_dynamic_attribute (ad->pos_attr_name, ad);
//- associated attribute offset
init_dynamic_attribute (ad->off_attr_name, ad, true);
init_dynamic_attribute (ad->off_attr_name, ad);
//- associated attribute velocity
init_dynamic_attribute (ad->vel_attr_name, ad, true);
init_dynamic_attribute (ad->vel_attr_name, ad);
//- maintain AttrData for callbacks use
attr_data_vect.push_back (ad);
......@@ -984,13 +984,15 @@ void XPSGroup::write_trajectory(Tango::WAttribute &attr)
//------------------------------------------------------------------
//- void XPSGroup:: init_dynamic_attribute (std::string)
//------------------------------------------------------------------
void XPSGroup::init_dynamic_attribute (std::string & attr_name, AttrData * ad, bool memorized)
void XPSGroup::init_dynamic_attribute (std::string & attr_name, AttrData * ad)
throw (Tango::DevFailed)
{
DEBUG_STREAM << "XPSGroup::init_dynamic_attribute entering for attribute <" << attr_name << ">" << endl;
yat4tango::DynamicAttributeInfo dai;
//- pointer to host device
dai.dev = this;
//- memorize attribut property in db
dai.cdb = true;
dai.tai.name = attr_name;
//- display level fixed to OPERATOR
dai.tai.disp_level = Tango::OPERATOR;
......
......@@ -167,7 +167,7 @@ public :
/**
* The object destructor.
*/
~XPSGroup() {delete_device();};
~XPSGroup() {delete_device();}
/**
* will be called at device destruction or at init command.
*/
......@@ -442,7 +442,7 @@ protected :
void init_dynamic_attributes (void)
throw (Tango::DevFailed);
void init_dynamic_attribute (std::string & attr_name, AttrData * ad, bool memorized)
void init_dynamic_attribute (std::string & attr_name, AttrData * ad)
throw (Tango::DevFailed);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment