From 32064d79459cc33d7ccad01107c862ee91244367 Mon Sep 17 00:00:00 2001
From: Fabian PK <fabian.peller-konrad@kit.edu>
Date: Mon, 25 May 2020 10:57:38 +0200
Subject: [PATCH] fixed obstacle avoidance error and added manager to variant
info
---
data/RobotAPI/VariantInfo-RobotAPI.xml | 7 +++++++
.../ObstacleAvoidingPlatformUnit.h | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/data/RobotAPI/VariantInfo-RobotAPI.xml b/data/RobotAPI/VariantInfo-RobotAPI.xml
index be7efb0ae..ef43ecebf 100644
--- a/data/RobotAPI/VariantInfo-RobotAPI.xml
+++ b/data/RobotAPI/VariantInfo-RobotAPI.xml
@@ -279,6 +279,13 @@
getterName="getPlatformObstacleDetection"
propertyName="PlatformObstacleDetectionName"
propertyDefaultValue="PlatformObstacleAvoidance" />
+ <Proxy include="RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.h"
+ humanName="Dynamic obstacle manager interface"
+ typeName="DynamicObstacleManagerInterfacePrx"
+ memberName="dynamicObstacleManager"
+ getterName="getDynamicObstacleManager"
+ propertyName="DynamicObstacleManagerName"
+ propertyDefaultValue="DynamicObstacleManager" />
<Proxy include="RobotAPI/interface/observers/GraspCandidateObserverInterface.h"
humanName="Grasp Candidate Observer"
typeName="grasping::GraspCandidateObserverInterfacePrx"
diff --git a/source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h b/source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h
index 02a1fc0d6..52f6af1c1 100644
--- a/source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h
+++ b/source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h
@@ -46,7 +46,7 @@
// RobotAPI
#include <RobotAPI/components/units/PlatformUnit.h>
-#include <RobotAPI/interface/components/ObstacleAvoidanceInterface.h>
+#include <RobotAPI/interface/components/ObstacleAvoidance/ObstacleAvoidanceInterface.h>
#include <RobotAPI/libraries/core/PIDController.h>
#include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
#include <RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h>
--
GitLab