Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
6f836688
Commit
6f836688
authored
4 years ago
by
Fabian Reister
Browse files
Options
Downloads
Patches
Plain Diff
robot state component: using new interface
parent
054eb668
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!124
new types: PoseStamped and VelocityStamped
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/components/RobotState/RobotStateComponent.cpp
+2
-32
2 additions, 32 deletions
...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
source/RobotAPI/components/RobotState/RobotStateComponent.h
+1
-13
1 addition, 13 deletions
source/RobotAPI/components/RobotState/RobotStateComponent.h
with
3 additions
and
45 deletions
source/RobotAPI/components/RobotState/RobotStateComponent.cpp
+
2
−
32
View file @
6f836688
...
...
@@ -344,9 +344,7 @@ namespace armarx
void
RobotStateComponent
::
reportGlobalRobotPose
(
const
std
::
string
&
robotName
,
const
Eigen
::
Matrix4f
&
pose
,
const
long
timestamp
,
const
TransformStamped
&
globalRobotPose
,
const
Ice
::
Current
&
)
{
if
(
_synchronized
)
...
...
@@ -355,7 +353,7 @@ namespace armarx
ARMARX_DEBUG
<<
"Comparing "
<<
localRobotName
<<
" and "
<<
robotName
<<
"."
;
if
(
localRobotName
==
robotName
)
{
const
IceUtil
::
Time
time
=
IceUtil
::
Time
::
microSeconds
(
timestamp
);
const
IceUtil
::
Time
time
=
IceUtil
::
Time
::
microSeconds
(
globalRobotPose
.
header
.
timestampInMicroSeconds
);
insertPose
(
time
,
pose
);
_synchronized
->
setGlobalPose
(
pose
);
...
...
@@ -373,34 +371,6 @@ namespace armarx
}
void
RobotStateComponent
::
reportPlatformPose
(
const
PoseStamped
&
platformPose
,
const
Current
&
)
{
IceUtil
::
Time
time
=
IceUtil
::
Time
::
microSeconds
(
platformPose
.
header
.
timestampInMicroSeconds
);
insertPose
(
time
,
platformPose
.
pose
.
matrix
());
if
(
_sharedRobotServant
)
{
_sharedRobotServant
->
setTimestamp
(
time
);
}
}
void
RobotStateComponent
::
reportNewTargetPose
(
const
PoseStamped
&
,
const
Current
&
)
{
// Unused.
}
void
RobotStateComponent
::
reportPlatformVelocity
(
const
VelocityStamped
&
,
const
Current
&
)
{
// Unused.
}
void
RobotStateComponent
::
reportPlatformOdometryPose
(
const
PoseStamped
&
,
const
Current
&
)
{
// Unused.
}
std
::
vector
<
std
::
string
>
RobotStateComponent
::
getArmarXPackages
(
const
Current
&
)
const
{
std
::
vector
<
std
::
string
>
result
;
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/components/RobotState/RobotStateComponent.h
+
1
−
13
View file @
6f836688
...
...
@@ -122,19 +122,7 @@ namespace armarx
RobotInfoNodePtr
getRobotInfo
(
const
Ice
::
Current
&
)
const
override
;
// GlobalRobotPoseLocalizationListener
void
reportGlobalRobotPose
(
const
std
::
string
&
robotName
,
const
Eigen
::
Matrix4f
&
pose
,
long
timestamp
,
const
Ice
::
Current
&
=
Ice
::
Current
())
override
;
// PlatformUnitListener interface
// TODO: Remove this interface and use GlobalRobotPoseLocalizationListener instead.
/// Stores the platform pose in the pose history.
void
reportPlatformPose
(
const
PoseStamped
&
platformPose
,
const
Ice
::
Current
&
)
override
;
/// Does nothing.
void
reportNewTargetPose
(
const
PoseStamped
&
targetPose
,
const
Ice
::
Current
&
)
override
;
/// Does nothing.
void
reportPlatformVelocity
(
const
VelocityStamped
&
platformPose
,
const
Ice
::
Current
&
)
override
;
/// Does nothing.
void
reportPlatformOdometryPose
(
const
PoseStamped
&
odometryPose
,
const
Ice
::
Current
&
)
override
;
void
reportGlobalRobotPose
(
const
TransformStamped
&
globalRobotPose
,
const
Ice
::
Current
&
=
Ice
::
Current
())
override
;
// Own interface.
void
setRobotStateObserver
(
RobotStateObserverPtr
observer
);
...
...
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