diff --git a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
index 45bca3e24aaedd466ceed5814e745ac17d600499..10b507a10b3ca6e19ecff2ad7ff4c281d0f3f7fe 100644
--- a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
+++ b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
@@ -31,8 +31,8 @@
#include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
// RobotAPI
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
#include <RobotAPI/libraries/armem/client/ComponentPlugin.h>
#include <RobotAPI/libraries/armem/core/Memory.h>
diff --git a/source/RobotAPI/components/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.h b/source/RobotAPI/components/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.h
index 1cca41267f44be2bc48ba31d9a1640ea18217da0..5147135bce50689bfeccde89464039cf0db10440 100644
--- a/source/RobotAPI/components/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.h
+++ b/source/RobotAPI/components/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.h
@@ -29,7 +29,7 @@
#include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
// #include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
#include <RobotAPI/libraries/armem/mns/ComponentPlugin.h>
@@ -73,7 +73,7 @@ namespace armarx
std::string getDefaultName() const override;
- // MemoryNameSystemInterface interface
+ // mns::MemoryNameSystemInterface interface
public:
armem::data::RegisterMemoryResult registerMemory(const armem::data::RegisterMemoryInput& input, const Ice::Current&) override;
armem::data::RemoveMemoryResult removeMemory(const armem::data::RemoveMemoryInput& input, const Ice::Current&) override;
diff --git a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
index 8684810898251ff5792c54e95738ee8d37bfb2c5..48f0c0b6bf8ff00a99ca0e9adfadddea7ccbd9ef 100644
--- a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
+++ b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
@@ -32,7 +32,7 @@
#include <ArmarXCore/core/system/ImportExportComponent.h>
-#include <RobotAPI/interface/armem/MemoryInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
#include <RobotAPI/libraries/armem/client/Reader.h>
#include <RobotAPI/libraries/armem_gui/InstanceTreeWidget.h>
#include <RobotAPI/libraries/armem_gui/MemoryTreeWidget.h>
diff --git a/source/RobotAPI/interface/CMakeLists.txt b/source/RobotAPI/interface/CMakeLists.txt
index 54c9b933cd54137036eeb70209881e4f379ad7ab..06b9d9b21090a3149c26862033f87d2192775045 100644
--- a/source/RobotAPI/interface/CMakeLists.txt
+++ b/source/RobotAPI/interface/CMakeLists.txt
@@ -102,16 +102,23 @@ set(SLICE_FILES
aron.ice
aron/Aron.ice
- armem.ice
- armem/ReadingMemoryInterface.ice
- armem/WritingMemoryInterface.ice
- armem/MemoryInterface.ice
- armem/MemoryListenerInterface.ice
- armem/MemoryNameSystemInterface.ice
- armem/query.ice
- armem/memory.ice
+ armem.ice
armem/commit.ice
+ armem/memory.ice
+ armem/query.ice
+
+ armem/client.ice
+ armem/client/MemoryListenerInterface.ice
+
+ armem/server.ice
+ armem/server/MemoryInterface.ice
+ armem/server/ReadingMemoryInterface.ice
+ armem/server/WritingMemoryInterface.ice
+
+ armem/mns.ice
+ armem/mns/MemoryNameSystemInterface.ice
+
components/ObstacleAvoidance/ObstacleAvoidanceInterface.ice
components/ObstacleAvoidance/ObstacleDetectionInterface.ice
diff --git a/source/RobotAPI/interface/armem.ice b/source/RobotAPI/interface/armem.ice
index c86d4d5fb6588a716a5b1f4cfe0cdbab29066bb8..3f9a59b960036fd0a41897a0edf6b365e9d24c99 100644
--- a/source/RobotAPI/interface/armem.ice
+++ b/source/RobotAPI/interface/armem.ice
@@ -1,9 +1,11 @@
#pragma once
-#include <RobotAPI/interface/armem/ReadingMemoryInterface.ice>
-#include <RobotAPI/interface/armem/WritingMemoryInterface.ice>
-#include <RobotAPI/interface/armem/MemoryInterface.ice>
-#include <RobotAPI/interface/armem/MemoryListenerInterface.ice>
+#include <RobotAPI/interface/armem/client.ice>
+#include <RobotAPI/interface/armem/commit.ice>
+#include <RobotAPI/interface/armem/memory.ice>
+#include <RobotAPI/interface/armem/query.ice>
+#include <RobotAPI/interface/armem/server.ice>
+#include <RobotAPI/interface/armem/MemoryNameSystemInterface.ice>
module armarx
diff --git a/source/RobotAPI/interface/armem/client.ice b/source/RobotAPI/interface/armem/client.ice
new file mode 100644
index 0000000000000000000000000000000000000000..5adde371e29906286b1bf7d72b2b261e0530a659
--- /dev/null
+++ b/source/RobotAPI/interface/armem/client.ice
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <RobotAPI/interface/armem/client/MemoryListenerInterface.ice>
diff --git a/source/RobotAPI/interface/armem/MemoryListenerInterface.ice b/source/RobotAPI/interface/armem/client/MemoryListenerInterface.ice
similarity index 100%
rename from source/RobotAPI/interface/armem/MemoryListenerInterface.ice
rename to source/RobotAPI/interface/armem/client/MemoryListenerInterface.ice
diff --git a/source/RobotAPI/interface/armem/mns.ice b/source/RobotAPI/interface/armem/mns.ice
new file mode 100644
index 0000000000000000000000000000000000000000..308d64bc9872875cd9955fb06184f90e237a23c3
--- /dev/null
+++ b/source/RobotAPI/interface/armem/mns.ice
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.ice>
diff --git a/source/RobotAPI/interface/armem/MemoryNameSystemInterface.ice b/source/RobotAPI/interface/armem/mns/MemoryNameSystemInterface.ice
similarity index 72%
rename from source/RobotAPI/interface/armem/MemoryNameSystemInterface.ice
rename to source/RobotAPI/interface/armem/mns/MemoryNameSystemInterface.ice
index e95f2d61cddfbd7cf8509cb449d3a63c03e97c5c..e102426c44a33acb156a10203e77193689a97f92 100644
--- a/source/RobotAPI/interface/armem/MemoryNameSystemInterface.ice
+++ b/source/RobotAPI/interface/armem/mns/MemoryNameSystemInterface.ice
@@ -1,6 +1,6 @@
#pragma once
-#include <RobotAPI/interface/armem/MemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/MemoryInterface.ice>
module armarx
@@ -59,17 +59,20 @@ module armarx
server::MemoryInterface* proxy;
};
- }
+ };
- interface MemoryNameSystemInterface
+ module mns
{
- data::RegisterMemoryResult registerMemory(data::RegisterMemoryInput input);
- data::RemoveMemoryResult removeMemory(data::RemoveMemoryInput input);
+ interface MemoryNameSystemInterface
+ {
+ data::RegisterMemoryResult registerMemory(data::RegisterMemoryInput input);
+ data::RemoveMemoryResult removeMemory(data::RemoveMemoryInput input);
- data::ResolveMemoryNameResult resolveMemoryName(data::ResolveMemoryNameInput input);
- data::WaitForMemoryResult waitForMemory(data::WaitForMemoryInput input);
- };
+ data::ResolveMemoryNameResult resolveMemoryName(data::ResolveMemoryNameInput input);
+ data::WaitForMemoryResult waitForMemory(data::WaitForMemoryInput input);
+ };
+ }
};
};
diff --git a/source/RobotAPI/interface/armem/server.ice b/source/RobotAPI/interface/armem/server.ice
new file mode 100644
index 0000000000000000000000000000000000000000..4d9b0bce81301a18163bbe831c814577d8ab4f3b
--- /dev/null
+++ b/source/RobotAPI/interface/armem/server.ice
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <RobotAPI/interface/armem/server/MemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/WritingMemoryInterface.ice>
diff --git a/source/RobotAPI/interface/armem/MemoryInterface.ice b/source/RobotAPI/interface/armem/server/MemoryInterface.ice
similarity index 62%
rename from source/RobotAPI/interface/armem/MemoryInterface.ice
rename to source/RobotAPI/interface/armem/server/MemoryInterface.ice
index 2a0e3b8f96c4e35057fe19f83b32c1a604d77ad9..2764998e2bf3d1226d8d34abb76772806b6bfd25 100644
--- a/source/RobotAPI/interface/armem/MemoryInterface.ice
+++ b/source/RobotAPI/interface/armem/server/MemoryInterface.ice
@@ -1,7 +1,7 @@
#pragma once
-#include <RobotAPI/interface/armem/ReadingMemoryInterface.ice>
-#include <RobotAPI/interface/armem/WritingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/WritingMemoryInterface.ice>
module armarx
diff --git a/source/RobotAPI/interface/armem/ReadingMemoryInterface.ice b/source/RobotAPI/interface/armem/server/ReadingMemoryInterface.ice
similarity index 100%
rename from source/RobotAPI/interface/armem/ReadingMemoryInterface.ice
rename to source/RobotAPI/interface/armem/server/ReadingMemoryInterface.ice
diff --git a/source/RobotAPI/interface/armem/WritingMemoryInterface.ice b/source/RobotAPI/interface/armem/server/WritingMemoryInterface.ice
similarity index 100%
rename from source/RobotAPI/interface/armem/WritingMemoryInterface.ice
rename to source/RobotAPI/interface/armem/server/WritingMemoryInterface.ice
diff --git a/source/RobotAPI/libraries/armem/client/ComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
index 82bb7fe09b7e12a8d868c3ee300d6a9ae73291cf..313e148f4fa815204f3602e6534bfbd663910a59 100644
--- a/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
@@ -5,7 +5,7 @@
#include <ArmarXCore/core/Component.h>
// RobotAPI
-#include <RobotAPI/interface/armem/MemoryInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
#include <RobotAPI/libraries/armem/client/ReaderComponentPlugin.h>
#include <RobotAPI/libraries/armem/client/WriterComponentPlugin.h>
diff --git a/source/RobotAPI/libraries/armem/client/Reader.h b/source/RobotAPI/libraries/armem/client/Reader.h
index d1655954cd45098ab2e07568a6f6400842ac7378..9d61aeb305ef8a976cd6ab4fa541fb0c4d6a225d 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.h
+++ b/source/RobotAPI/libraries/armem/client/Reader.h
@@ -7,8 +7,8 @@
#include <vector>
// RobotAPI
-#include <RobotAPI/interface/armem/ReadingMemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryListenerInterface.h>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
+#include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
#include <RobotAPI/libraries/armem/core/ice_conversions.h>
#include <RobotAPI/libraries/armem/core/Memory.h>
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
index c212fa01a2919611e4b7c7a6c81203b4483a7344..0f083894c4ed8398e977d1217328cf6341b2f95e 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
@@ -8,9 +8,10 @@
#include <ArmarXCore/core/Component.h>
// RobotAPI
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryListenerInterface.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
+#include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
+
#include <RobotAPI/libraries/armem/client/Reader.h>
#include <RobotAPI/libraries/armem/mns/ClientPlugin.h>
diff --git a/source/RobotAPI/libraries/armem/client/Writer.h b/source/RobotAPI/libraries/armem/client/Writer.h
index 9b88fa26694e4603c3521c69d66c3873c25d34fd..dab048f83d6bc30f43b6b0a124b654e4d3485eaf 100644
--- a/source/RobotAPI/libraries/armem/client/Writer.h
+++ b/source/RobotAPI/libraries/armem/client/Writer.h
@@ -1,6 +1,6 @@
#pragma once
-#include <RobotAPI/interface/armem/WritingMemoryInterface.h>
+#include <RobotAPI/interface/armem/server/WritingMemoryInterface.h>
#include <RobotAPI/libraries/armem/core/ice_conversions.h>
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
index 33375402769d79e68f206a9440f7f1341c1161d9..a5af384c0e2a0c2022c5f3dd903658724ad1cf27 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
@@ -5,8 +5,9 @@
#include <ArmarXCore/core/Component.h>
// RobotAPI
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/WritingMemoryInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
+
#include <RobotAPI/libraries/armem/client/Writer.h>
#include <RobotAPI/libraries/armem/mns/ClientPlugin.h>
diff --git a/source/RobotAPI/libraries/armem/core/ice_conversions.h b/source/RobotAPI/libraries/armem/core/ice_conversions.h
index 7116673bb43cbe36e63674669bd2082dd53642a3..67420e8bfab208dc871d122a877b72a0c7c9d32d 100644
--- a/source/RobotAPI/libraries/armem/core/ice_conversions.h
+++ b/source/RobotAPI/libraries/armem/core/ice_conversions.h
@@ -2,9 +2,8 @@
#include <memory>
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/memory.h>
#include <RobotAPI/interface/armem/commit.h>
+#include <RobotAPI/interface/armem/memory.h>
#include "ice_conversions_templates.h"
diff --git a/source/RobotAPI/libraries/armem/core/ice_conversions_templates.h b/source/RobotAPI/libraries/armem/core/ice_conversions_templates.h
index 28ba1d2e7b13c98d3953c6907d3fefc68c454a7b..2f729f2026aa2fc20ce616b18ed408bf3d1f3206 100644
--- a/source/RobotAPI/libraries/armem/core/ice_conversions_templates.h
+++ b/source/RobotAPI/libraries/armem/core/ice_conversions_templates.h
@@ -2,8 +2,6 @@
#include <memory>
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-
#include "Commit.h"
diff --git a/source/RobotAPI/libraries/armem/mns/ClientPlugin.cpp b/source/RobotAPI/libraries/armem/mns/ClientPlugin.cpp
index a28fab864e9a1be12998060599241429c6e11a97..4d3eda68b6989a2c33c1fbb091eb3b96bcb2f536 100644
--- a/source/RobotAPI/libraries/armem/mns/ClientPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/mns/ClientPlugin.cpp
@@ -64,7 +64,7 @@ namespace armarx::armem::mns::plugins
std::string{PROPERTY_MNS_NAME_DEFAULT};
}
- MemoryNameSystemInterfacePrx ClientPlugin::getMemoryNameSystem()
+ mns::MemoryNameSystemInterfacePrx ClientPlugin::getMemoryNameSystem()
{
return isMemoryNameSystemEnabled() && parentDerives<Component>()
? parent<Component>().getProxy<MemoryNameSystemInterfacePrx>(getMemoryNameSystemName())
diff --git a/source/RobotAPI/libraries/armem/mns/ClientPlugin.h b/source/RobotAPI/libraries/armem/mns/ClientPlugin.h
index 2ccfa8f1f424c0675ce9384d605d2e56032a7290..ce2ab822f749ac6e7f8d349235f3b2f8f06e7ab9 100644
--- a/source/RobotAPI/libraries/armem/mns/ClientPlugin.h
+++ b/source/RobotAPI/libraries/armem/mns/ClientPlugin.h
@@ -2,7 +2,7 @@
#include <ArmarXCore/core/Component.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
namespace armarx::armem::mns
@@ -45,7 +45,7 @@ namespace armarx::armem::mns::plugins
* @brief Get the MNS proxy.
* @return The MNS proxy when MNS is enabled, nullptr when MNS is disabled.
*/
- MemoryNameSystemInterfacePrx getMemoryNameSystem();
+ mns::MemoryNameSystemInterfacePrx getMemoryNameSystem();
private:
@@ -68,7 +68,7 @@ namespace armarx::armem::mns::plugins
public:
/// Only set when enabled.
- MemoryNameSystemInterfacePrx memoryNameSystem = nullptr;
+ mns::MemoryNameSystemInterfacePrx memoryNameSystem = nullptr;
};
}
diff --git a/source/RobotAPI/libraries/armem/mns/ComponentPlugin.h b/source/RobotAPI/libraries/armem/mns/ComponentPlugin.h
index eafb5ba6f39703aaf5b0a3e3bb5629af6111e6ef..ade1351d7f24c5315b55056d822fb7b26ef4eec8 100644
--- a/source/RobotAPI/libraries/armem/mns/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/mns/ComponentPlugin.h
@@ -4,8 +4,8 @@
#include <ArmarXCore/core/Component.h>
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
#include "MemoryNameSystem.h"
@@ -16,9 +16,7 @@ namespace armarx::armem::mns::plugins
class ComponentPlugin : public armarx::ComponentPlugin
{
public:
-
using armarx::ComponentPlugin::ComponentPlugin;
-
};
}
@@ -32,13 +30,13 @@ namespace armarx::armem::mns
*/
class ComponentPluginUser :
virtual public ManagedIceObject
- , virtual public MemoryNameSystemInterface
+ , virtual public mns::MemoryNameSystemInterface
{
public:
ComponentPluginUser();
- // MemoryNameSystemInterface interface
+ // mns::MemoryNameSystemInterface interface
public:
armem::data::RegisterMemoryResult registerMemory(const armem::data::RegisterMemoryInput& input, const Ice::Current& = Ice::emptyCurrent) override;
armem::data::RemoveMemoryResult removeMemory(const armem::data::RemoveMemoryInput& input, const Ice::Current& = Ice::emptyCurrent) override;
diff --git a/source/RobotAPI/libraries/armem/mns/MemoryNameSystem.h b/source/RobotAPI/libraries/armem/mns/MemoryNameSystem.h
index 0ebbc4b43094f6bd764039c234a0064735a03b6c..891e78f4acf072e49670336b3d95afb4b766695a 100644
--- a/source/RobotAPI/libraries/armem/mns/MemoryNameSystem.h
+++ b/source/RobotAPI/libraries/armem/mns/MemoryNameSystem.h
@@ -5,8 +5,8 @@
#include <ArmarXCore/core/logging/Logging.h>
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
#include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
index 641c9e2afcd73ccfc091daf83907f17345ae9fce..4ad1d462251a488316d0e4153a26bc5b246d58bb 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
@@ -4,9 +4,9 @@
#include <ArmarXCore/core/Component.h>
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryListenerInterface.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
+#include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
#include "../core/Memory.h"
#include "../mns/ClientPlugin.h"
diff --git a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h
index e16c139dea90d67cdee6622eda7c3325348df3a5..48bd2ebdf03a8275f0ad3732bcdbc425f4ea1c1a 100644
--- a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h
+++ b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h
@@ -1,7 +1,7 @@
#pragma once
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryListenerInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
+#include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
#include "../core/Memory.h"