From cc0bd19fc4b089803166a0e93791e8ce4060b885 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 30 Jul 2021 07:51:28 +0200
Subject: [PATCH] Move files to library
---
.../armem/server/RobotStateMemory/CMakeLists.txt | 14 --------------
.../libraries/armem_robot_state/CMakeLists.txt | 14 ++++++++++++++
.../server/proprioception}/RobotStateWriter.cpp | 0
.../server/proprioception}/RobotStateWriter.h | 0
.../server/proprioception}/RobotUnitData.cpp | 0
.../server/proprioception}/RobotUnitData.h | 0
.../server/proprioception}/RobotUnitReader.cpp | 0
.../server/proprioception}/RobotUnitReader.h | 0
.../server/proprioception}/aron_conversions.cpp | 0
.../server/proprioception}/aron_conversions.h | 0
.../converters/Armar6RobotUnitDataConverter.cpp} | 0
.../converters/Armar6RobotUnitDataConverter.h} | 0
.../RobotUnitDataConverterInterface.cpp} | 0
.../converters/RobotUnitDataConverterInterface.h} | 0
14 files changed, 14 insertions(+), 14 deletions(-)
rename source/RobotAPI/{components/armem/server/RobotStateMemory => libraries/armem_robot_state/server/proprioception}/RobotStateWriter.cpp (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory => libraries/armem_robot_state/server/proprioception}/RobotStateWriter.h (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory => libraries/armem_robot_state/server/proprioception}/RobotUnitData.cpp (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory => libraries/armem_robot_state/server/proprioception}/RobotUnitData.h (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory => libraries/armem_robot_state/server/proprioception}/RobotUnitReader.cpp (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory => libraries/armem_robot_state/server/proprioception}/RobotUnitReader.h (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory => libraries/armem_robot_state/server/proprioception}/aron_conversions.cpp (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory => libraries/armem_robot_state/server/proprioception}/aron_conversions.h (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory/Armar6RobotUnitConverter.cpp => libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.cpp} (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory/Armar6RobotUnitConverter.h => libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.h} (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory/RobotUnitConverterInterface.cpp => libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.cpp} (100%)
rename source/RobotAPI/{components/armem/server/RobotStateMemory/RobotUnitConverterInterface.h => libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.h} (100%)
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
index e4cfc53a9..f49cb33c2 100644
--- a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
@@ -15,24 +15,10 @@ set(COMPONENT_LIBS
)
set(SOURCES
- aron_conversions.cpp
RobotStateMemory.cpp
- RobotStateWriter.cpp
- RobotUnitData.cpp
- RobotUnitReader.cpp
-
- RobotUnitConverterInterface.cpp
- Armar6RobotUnitConverter.cpp
)
set(HEADERS
- aron_conversions.h
RobotStateMemory.h
- RobotStateWriter.h
- RobotUnitData.h
- RobotUnitReader.h
-
- RobotUnitConverterInterface.h
- Armar6RobotUnitConverter.h
)
armarx_add_component("${SOURCES}" "${HEADERS}")
diff --git a/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt b/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
index f2f96fdd1..ccdf435e9 100644
--- a/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
@@ -41,6 +41,13 @@ armarx_add_library(
server/localization/Segment.h
server/proprioception/Segment.h
+ server/proprioception/aron_conversions.h
+ server/proprioception/RobotStateWriter.h
+ server/proprioception/RobotUnitData.h
+ server/proprioception/RobotUnitReader.h
+
+ server/proprioception/converters/RobotUnitDataConverterInterface.h
+ server/proprioception/converters/Armar6RobotUnitDataConverter.h
server/description/Segment.h
@@ -61,6 +68,13 @@ armarx_add_library(
server/localization/Segment.cpp
server/proprioception/Segment.cpp
+ server/proprioception/aron_conversions.cpp
+ server/proprioception/RobotStateWriter.cpp
+ server/proprioception/RobotUnitData.cpp
+ server/proprioception/RobotUnitReader.cpp
+
+ server/proprioception/converters/RobotUnitDataConverterInterface.cpp
+ server/proprioception/converters/Armar6RobotUnitDataConverter.cpp
server/description/Segment.cpp
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateWriter.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateWriter.cpp
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateWriter.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateWriter.h
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitData.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.cpp
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitData.cpp
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.cpp
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitData.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.h
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitData.h
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.h
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitReader.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitReader.cpp
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitReader.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitReader.h
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/aron_conversions.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/aron_conversions.cpp
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/aron_conversions.cpp
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/aron_conversions.cpp
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/aron_conversions.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/aron_conversions.h
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/aron_conversions.h
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/aron_conversions.h
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/Armar6RobotUnitConverter.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.cpp
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/Armar6RobotUnitConverter.cpp
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.cpp
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/Armar6RobotUnitConverter.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.h
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/Armar6RobotUnitConverter.h
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.h
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitConverterInterface.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.cpp
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitConverterInterface.cpp
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.cpp
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitConverterInterface.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.h
similarity index 100%
rename from source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitConverterInterface.h
rename to source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.h
--
GitLab