Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into armem/dev

source/RobotAPI/interface/CMakeLists.txt

@@ -26,6 +26,7 @@ set(SLICE_FILES
     core/CartesianNaturalPositionControllerConfig.ice
     core/TopicTimingTest.ice
     core/FTSensorValue.ice
+    core/NameValueMap.ice
 
     selflocalisation/SelfLocalisationProcess.ice
 

source/RobotAPI/interface/core/NameValueMap.ice

+/**
+* This file is part of ArmarX.
+*
+* ArmarX is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License, or (at your option) any later version.
+*
+* ArmarX is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+* @package    RobotAPI
+* @author     Christoph Pohl
+* @copyright  2020 Humanoids Group, H2T, KIT
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt
+*             GNU General Public License
+*/
+
+#pragma once
+
+module armarx
+{
+    /**
+	* [NameValueMap] defined. This data container is mostly used to assign values to e.g. joints which are identified by name.
+	**/
+    dictionary<string, float> NameValueMap;
+}
\ No newline at end of file

source/RobotAPI/interface/objectpose/object_pose_types.ice

@@ -24,15 +24,12 @@
 #pragma once
 
 #include <RobotAPI/interface/core/PoseBase.ice>
+#include <RobotAPI/interface/core/NameValueMap.ice>
 #include <RobotAPI/interface/ArmarXObjects/ArmarXObjectsTypes.ice>
 
 
 module armarx
 {
-    // Originally defined in <RobotAPI/interface/units/KinematicUnitInterface.ice>
-    dictionary<string, float> NameValueMap;
-
-
     // A struct's name cannot cannot differ only in capitalization from its immediately enclosing module name.
     module objpose
     {

source/RobotAPI/interface/units/KinematicUnitInterface.ice

@@ -29,6 +29,7 @@
 #include <ArmarXCore/interface/core/UserException.ice>
 #include <ArmarXCore/interface/core/BasicTypes.ice>
 
+#include <RobotAPI/interface/core/NameValueMap.ice>
 #include <RobotAPI/interface/skills/SkillObserverInterface.ice>
 
 module armarx
@@ -124,10 +125,7 @@ module armarx
     {
         Ice::StringSeq nodes;
     };
-	/**
-	* [NameValueMap] defined. This data container is mostly used to assign values to e.g. joints which are identified by name.
-	**/
-    dictionary<string, float> NameValueMap;
+
     /**
     * [NameControlModeMap] defined. This data container is mostly used to assign control modes to e.g. joints which are identified by name.
     **/