Skip to content
Snippets Groups Projects

robot state memory update

Merged Fabian Reister requested to merge feature/armem-robot-state-memory-update into armem/dev
4 files
+ 21
29
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -52,8 +52,8 @@
namespace armarx::armem
{
MappingDataReader::MappingDataReader(ManagedIceObject& component)
: armarx::armem::MemoryConnector(component) {}
MappingDataReader::MappingDataReader(armem::ClientReaderComponentPluginUser& memoryClient)
: memoryClient(memoryClient) {}
MappingDataReader::~MappingDataReader() = default;
@@ -61,9 +61,9 @@ namespace armarx::armem
armarx::PropertyDefinitionsPtr& def)
{
ARMARX_DEBUG << "TransformReader: registerPropertyDefinitions";
MemoryConnector::registerPropertyDefinitions(def);
registerPropertyDefinitions(def);
const std::string prefix = getPropertyPrefix();
const std::string prefix = propertyPrefix;
def->optional(properties.mappingMemoryName, prefix + "MappingMemoryName",
"Name of the mapping memory core segment to use.");
@@ -76,7 +76,7 @@ namespace armarx::armem
// Wait for the memory to become available and add it as dependency.
ARMARX_IMPORTANT << "TransformReader: Waiting for memory '"
<< properties.memoryName << "' ...";
auto result = useMemory(properties.memoryName);
auto result = memoryClient.useMemory(properties.memoryName);
if (not result.success)
{
ARMARX_ERROR << result.errorMessage;
Loading