Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
XPSGroup
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
Motion
XPSGroup
Commits
fef73a9d
Commit
fef73a9d
authored
Jun 19, 2020
by
Xavier ELATTAOUI
Browse files
Options
Downloads
Patches
Plain Diff
No commit message
No commit message
parent
b733b5df
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
src/XPSGroup.cpp
+6
-4
6 additions, 4 deletions
src/XPSGroup.cpp
src/XPSGroup.h
+2
-2
2 additions, 2 deletions
src/XPSGroup.h
with
9 additions
and
7 deletions
pom.xml
+
1
−
1
View file @
fef73a9d
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
src/XPSGroup.cpp
+
6
−
4
View file @
fef73a9d
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
src/XPSGroup.h
+
2
−
2
View file @
fef73a9d
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment