From e2fb677b64905a20761133507c1892f597f267f2 Mon Sep 17 00:00:00 2001
From: armar6a-demo <armar6-demo@i61pc043.itec.uni-karlsruhe.de>
Date: Fri, 5 Jan 2018 21:30:19 +0100
Subject: [PATCH] renamed trajectorycontroller
---
data/RobotAPI/VariantInfo-RobotAPI.xml | 22 +++++++++++++------
.../RobotUnit/NJointTrajectoryController.ice | 5 +++++
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/data/RobotAPI/VariantInfo-RobotAPI.xml b/data/RobotAPI/VariantInfo-RobotAPI.xml
index 0537f558b..329b04e37 100644
--- a/data/RobotAPI/VariantInfo-RobotAPI.xml
+++ b/data/RobotAPI/VariantInfo-RobotAPI.xml
@@ -122,14 +122,22 @@
getterName="getRobotUnit"
propertyName="RobotUnitName"
propertyIsOptional="false" />
- <Proxy include="RobotAPI/interface/units/RobotUnit/LVL1TrajectoryController.h"
- humanName="LVL1 Trajectory Controller"
- typeName="LVL1TrajectoryControllerInterfacePrx"
- memberName="LVL1TrajectoryController"
- getterName="getLVL1TrajectoryController"
- propertyName="LVL1TrajectoryControllerName"
+ <Proxy include="RobotComponents/interface/components/TrajectoryPlayerInterface.h"
+ humanName="TrajectoryPlayer Component"
+ typeName="TrajectoryPlayerInterfacePrx"
+ memberName="trajectoryPlayer"
+ getterName="getTrajectoryPlayer"
+ propertyName="TrajectoryPlayerName"
+ propertyIsOptional="true"
+ propertyDefaultValue="TrajectoryPlayer" />
+ <Proxy include="RobotAPI/interface/units/RobotUnit/NJointTrajectoryController.h"
+ humanName="NJoint Trajectory Controller"
+ typeName="NJointTrajectoryControllerInterfacePrx"
+ memberName="NJointTrajectoryController"
+ getterName="getNJointTrajectoryController"
+ propertyName="NJointTrajectoryControllerName"
propertyIsOptional="true"
- propertyDefaultValue="LVL1TrajectoryController" />
+ propertyDefaultValue="NJointTrajectoryController" />
<Proxy include="RobotAPI/interface/core/RobotState.h"
humanName="Robot State Component"
typeName="RobotStateComponentInterfacePrx"
diff --git a/source/RobotAPI/interface/units/RobotUnit/NJointTrajectoryController.ice b/source/RobotAPI/interface/units/RobotUnit/NJointTrajectoryController.ice
index 8d9f7f0b3..3a58fb616 100644
--- a/source/RobotAPI/interface/units/RobotUnit/NJointTrajectoryController.ice
+++ b/source/RobotAPI/interface/units/RobotUnit/NJointTrajectoryController.ice
@@ -42,6 +42,11 @@ module armarx
bool isPreview = false;
};
+ module RobotUnitControllerNames
+ {
+ const string NJointTrajectoryController = "NJointTrajectoryController";
+ };
+
interface NJointTrajectoryControllerInterface extends NJointControllerInterface
{
void setTrajectory(TrajectoryBase traj);
--
GitLab