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
+ 1
4
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -23,9 +23,9 @@
#include <mutex>
#include "RobotAPI/libraries/armem/client/MemoryConnector.h"
#include "RobotAPI/libraries/armem/client/Reader.h"
#include "RobotAPI/libraries/armem/client/Writer.h"
#include "RobotAPI/libraries/armem/client.h"
#include "interfaces.h"
@@ -34,11 +34,11 @@ namespace armarx::armem::articulated_object
{
class Writer:
virtual public WriterInterface,
virtual public MemoryConnector
virtual public WriterInterface //,
// virtual public MemoryConnector
{
public:
Writer(ManagedIceObject& component);
Writer(armem::ClientComponentPluginUser& component);
virtual ~Writer() = default;
@@ -51,7 +51,7 @@ namespace armarx::armem::articulated_object
bool storeInstance(const ArticulatedObject& obj);
std::optional<armem::MemoryID> storeClass(const ArticulatedObject& obj);
const std::string& getPropertyPrefix() const override;
// const std::string& getPropertyPrefix() const override;
private:
std::optional<armem::MemoryID> storeOrGetClass(const ArticulatedObject& obj);
@@ -77,6 +77,8 @@ namespace armarx::armem::articulated_object
// key: name of object: RobotDescription::name
std::map<std::string, MemoryID> knownObjects;
armem::ClientComponentPluginUser& component;
};
Loading