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

data/RobotAPI/VariantInfo-RobotAPI.xml

@@ -264,14 +264,21 @@
             propertyName="TextToSpeechTopicName"
             propertyIsOptional="true"
             propertyDefaultValue="TextToSpeech" />
-        <Proxy include="RobotAPI/interface/components/DSObstacleAvoidanceInterface.h"
-            humanName="Platform obstacle avoidance"
+        <Proxy include="RobotAPI/interface/components/ObstacleAvoidance/ObstacleAvoidanceInterface.h"
+            humanName="Platform obstacle avoidance interface"
             typeName="ObstacleAvoidanceInterfacePrx"
             memberName="platformObstacleAvoidance"
             getterName="getPlatformObstacleAvoidance"
             propertyName="PlatformObstacleAvoidanceName"
             propertyIsOptional="true"
             propertyDefaultValue="PlatformObstacleAvoidance" />
+	<Proxy include="RobotAPI/interface/components/ObstacleAvoidance/ObstacleDetectorInterface.h"
+            humanName="Platform obstacle detection interface"
+            typeName="ObstacleDetectionInterfacePrx"
+            memberName="platformObstacleDetection"
+            getterName="getPlatformObstacleDetection"
+            propertyName="PlatformObstacleDetectionName"
+            propertyDefaultValue="PlatformObstacleAvoidance" />
         <Proxy include="RobotAPI/interface/observers/GraspCandidateObserverInterface.h"
             humanName="Grasp Candidate Observer"
             typeName="grasping::GraspCandidateObserverInterfacePrx"