Skip to content
Snippets Groups Projects
Commit 4c327ae4 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge branch 'master' into armem/dev

# Conflicts:
#	source/RobotAPI/libraries/armem_robot_state/server/localization/Segment.cpp
parents 4397230b 2023881a
No related branches found
No related tags found
1 merge request!188ArMem Updates
...@@ -24,7 +24,9 @@ namespace armarx::armem::client::util ...@@ -24,7 +24,9 @@ namespace armarx::armem::client::util
def->optional(props.memoryName, prefix + "Memory"); def->optional(props.memoryName, prefix + "Memory");
def->optional(props.coreSegmentName, prefix + "CoreSegment"); def->optional(props.coreSegmentName, prefix + "CoreSegment");
def->required(props.providerName, // TODO(fabian.reister): this might also be part of the subclass
// if the provider name has to be derived from e.g. the component name
def->optional(props.providerName,
prefix + "Provider", prefix + "Provider",
"Name of this provider"); "Name of this provider");
} }
......
...@@ -119,7 +119,8 @@ namespace armarx::armem::server::robot_state::localization ...@@ -119,7 +119,8 @@ namespace armarx::armem::server::robot_state::localization
{ {
TransformQuery query TransformQuery query
{ {
.header{ .header =
{
.parentFrame = GlobalFrame, .parentFrame = GlobalFrame,
.frame = "root", // TODO, FIXME .frame = "root", // TODO, FIXME
.agent = robotName, .agent = robotName,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment