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

TANGODEVIC-1462

release preparation
parent 182c9aa5
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<groupId>fr.soleil.device</groupId> <groupId>fr.soleil.device</groupId>
<artifactId>HexapodFMBO-${aol}-${mode}</artifactId> <artifactId>HexapodFMBO-${aol}-${mode}</artifactId>
<version>1.2.15-SNAPSHOT</version> <version>1.2.15</version>
<packaging>nar</packaging> <packaging>nar</packaging>
......
...@@ -565,7 +565,7 @@ bool FixedPositions::parse() ...@@ -565,7 +565,7 @@ bool FixedPositions::parse()
StringTokenizer tok (";"); StringTokenizer tok (";");
//- parse the property andd fill the PositionsData vect //- parse the property and fill the PositionsData vect
for (size_t i = 0, k=0; i < fixedPositionsProp.size (); i += 6, k++) for (size_t i = 0, k=0; i < fixedPositionsProp.size (); i += 6, k++)
{ {
PositionsData * pos_dat_tmp = new PositionsData; PositionsData * pos_dat_tmp = new PositionsData;
...@@ -703,6 +703,7 @@ void FixedPositions::goto_fixed (PositionsData & fixed_pos) ...@@ -703,6 +703,7 @@ void FixedPositions::goto_fixed (PositionsData & fixed_pos)
hex->set_all_positions (fixed_pos.uc); hex->set_all_positions (fixed_pos.uc);
//- issue Start //- issue Start
hex->start (); hex->start ();
omni_thread::sleep (0, 250000000);
return; return;
} }
...@@ -946,6 +947,11 @@ void FixedPositions::write_callback (yat4tango::DynamicAttributeWriteCallbackDat ...@@ -946,6 +947,11 @@ void FixedPositions::write_callback (yat4tango::DynamicAttributeWriteCallbackDat
if (!b) if (!b)
return; return;
PositionsData * fixed_pos_data_vect;
fixed_pos_data_vect = cbd.dya->get_user_data <PositionsData> ();
this->goto_fixed (*fixed_pos_data_vect);
omni_thread::sleep (0, 250000000);
//- new position requested : set UNKOWN till the (fixed) position is not reached! //- new position requested : set UNKOWN till the (fixed) position is not reached!
if (*attr_selectedAttributeName_read) if (*attr_selectedAttributeName_read)
{ {
...@@ -960,9 +966,6 @@ void FixedPositions::write_callback (yat4tango::DynamicAttributeWriteCallbackDat ...@@ -960,9 +966,6 @@ void FixedPositions::write_callback (yat4tango::DynamicAttributeWriteCallbackDat
} }
} }
PositionsData * fixed_pos_data_vect;
fixed_pos_data_vect = cbd.dya->get_user_data <PositionsData> ();
this->goto_fixed (*fixed_pos_data_vect);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment