From 9242a9d5f971b62c26229857c11f6092bd5d3e69 Mon Sep 17 00:00:00 2001 From: Markus Grotz <markus.grotz@kit.edu> Date: Wed, 30 Mar 2022 17:59:54 +0200 Subject: [PATCH] update VariantInfo-RobotAPI.xml - fix include paths - move observer to ArmarXCore --- data/RobotAPI/VariantInfo-RobotAPI.xml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/data/RobotAPI/VariantInfo-RobotAPI.xml b/data/RobotAPI/VariantInfo-RobotAPI.xml index e09c9aa52..218aed8cf 100644 --- a/data/RobotAPI/VariantInfo-RobotAPI.xml +++ b/data/RobotAPI/VariantInfo-RobotAPI.xml @@ -20,8 +20,8 @@ <Class typeName="NJointCartesianWaypointControllerConfig" include="RobotAPI/interface/units/RobotUnit/NJointCartesianWaypointController.h" /> <Class typeName="FramedPoseBase" include="RobotAPI/interface/core/FramedPoseBase.h" /> - <Class typeName="Vector3Base" include="RobotAPI/libraries/core/Pose.h" /> - <Class typeName="QuaternionBase" include="RobotAPI/libraries/core/Pose.h" /> + <Class typeName="Vector3Base" include="RobotAPI/interface/core/PoseBase.h" /> + <Class typeName="QuaternionBase" include="RobotAPI/interface/core/PoseBase.h" /> <Class typeName="armarx::viz::data::Element" include="RobotAPI/interface/ArViz/Elements.h" /> <Class typeName="armarx::viz::data::LayerUpdate" include="RobotAPI/interface/ArViz/Component.h" /> <Proxy include="RobotAPI/interface/units/KinematicUnitInterface.h" @@ -162,22 +162,6 @@ getterName="getRobotUnit" propertyName="RobotUnitName" propertyIsOptional="false" /> - <Proxy include="ArmarXCore/interface/observers/ObserverInterface.h" - humanName="Robot Unit Observer" - typeName="ObserverInterfacePrx" - memberName="robotUnitObserver" - getterName="getRobotUnitObserver" - propertyName="RobotUnitObserverName" - propertyIsOptional="true" - propertyDefaultValue="RobotUnitObserver" /> - <Proxy include="ArmarXCore/interface/observers/ObserverInterface.h" - humanName="Speech Observer" - typeName="ObserverInterfacePrx" - memberName="speechObserver" - getterName="getSpeechObserver" - propertyName="SpeechObserverName" - propertyIsOptional="true" - propertyDefaultValue="SpeechObserver" /> <Proxy include="RobotAPI/interface/units/CyberGloveObserverInterface.h" humanName="CyberGlove Observer" typeName="CyberGloveObserverInterfacePrx" -- GitLab