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
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lennard Hofmann
RobotAPI
Commits
85823dba
Commit
85823dba
authored
3 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Remove explicitly adding prov segment (lead to deadlock + is not necessary)
parent
202f2fca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/armem_robot_state/server/proprioception/Segment.cpp
+2
-19
2 additions, 19 deletions
...aries/armem_robot_state/server/proprioception/Segment.cpp
with
2 additions
and
19 deletions
source/RobotAPI/libraries/armem_robot_state/server/proprioception/Segment.cpp
+
2
−
19
View file @
85823dba
...
...
@@ -63,6 +63,7 @@ namespace armarx::armem::server::robot_state::proprioception
const
std
::
string
providerSegmentName
=
kinematicUnit
->
getRobotName
();
this
->
robotUnitProviderID
=
coreSegment
->
id
().
withProviderSegmentName
(
providerSegmentName
);
#if 0
// TODO what is the purpose?
auto encoderEntryType = std::make_shared<aron::typenavigator::ObjectNavigator>("RobotUnitEncoderEntry");
auto encoderNameType = std::make_shared<aron::typenavigator::StringNavigator>();
...
...
@@ -71,25 +72,7 @@ namespace armarx::armem::server::robot_state::proprioception
encoderEntryType->addMemberType("IterationId", encoderIterationIDType);
//auto encoderValueType = std::make_shared<aron::typenavigator::AnyType>();
//encoderEntryType->addMemberType("value", encoderValueType);
ARMARX_INFO
<<
"Adding provider segment "
<<
p
.
coreSegment
<<
"/"
<<
providerSegmentName
;
armem
::
data
::
AddSegmentInput
input
;
input
.
coreSegmentName
=
p
.
coreSegment
;
input
.
providerSegmentName
=
providerSegmentName
;
{
std
::
lock_guard
g
{
mutex
()};
auto
result
=
iceMemory
.
addSegments
({
input
})[
0
];
if
(
!
result
.
success
)
{
ARMARX_ERROR
<<
"Could not add segment "
<<
p
.
coreSegment
<<
"/"
<<
providerSegmentName
<<
". The error message is: "
<<
result
.
errorMessage
;
}
}
robotUnitProviderID
.
memoryName
=
iceMemory
.
workingMemory
->
id
().
memoryName
;
robotUnitProviderID
.
coreSegmentName
=
p
.
coreSegment
;
robotUnitProviderID
.
providerSegmentName
=
providerSegmentName
;
#endif
}
...
...
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