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
Merge requests
!157
armem/dev => master
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
armem/dev => master
armem/dev
into
master
Overview
3
Commits
202
Pipelines
0
Changes
1
Merged
Fabian Reister
requested to merge
armem/dev
into
master
3 years ago
Overview
3
Commits
202
Pipelines
0
Changes
1
Expand
0
0
Merge request reports
Viewing commit
2c157a19
Prev
Next
Show latest version
1 file
+
3
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
2c157a19
fix: robot conversions: converting robot state
· 2c157a19
Fabian Reister
authored
3 years ago
source/RobotAPI/libraries/armem_robot/robot_conversions.cpp
+
3
−
3
Options
@@ -43,10 +43,10 @@ namespace armarx::armem::robot
std
::
optional
<
RobotState
>
convertRobotState
(
const
armem
::
wm
::
EntityInstance
&
instance
)
{
arondto
::
Robot
State
aronRobot
State
;
arondto
::
Robot
aronRobot
;
try
{
aronRobot
State
.
fromAron
(
instance
.
data
());
aronRobot
.
fromAron
(
instance
.
data
());
}
catch
(...)
{
@@ -55,7 +55,7 @@ namespace armarx::armem::robot
}
RobotState
robotState
;
fromAron
(
aronRobot
S
tate
,
robotState
);
fromAron
(
aronRobot
.
s
tate
,
robotState
);
return
robotState
;
}
Loading