From fea710262a67fa86b08f0522504a9699c9c06fd0 Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Tue, 20 Nov 2012 09:47:41 +0000
Subject: [PATCH] additional renames
git-svn-id: https://svn.sfb588.uni-karlsruhe.de/svn/HumanoidRobotAPI@22 e7ad446d-f7d8-486a-9efb-df2f5bbea5c6
---
.../applications/MotionControlTest/CMakeLists.txt | 2 +-
source/RobotAPI/core/CMakeLists.txt | 4 ++--
source/RobotAPI/motioncontrol/CMakeLists.txt | 4 ++--
source/RobotAPI/motioncontrol/MotionControl.cpp | 12 ++++++------
source/RobotAPI/motioncontrol/MotionControl.h | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt b/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
index 298dda8be..1cbbf8fcf 100755
--- a/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
+++ b/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
@@ -18,7 +18,7 @@ armarx_build_if(ArmarXCoreObservers_ENABLED "ArmarXCoreObservers library disable
if (ARMARX_BUILD)
- set(COMPONENT_LIBS MotionControl HumanoidRobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRobotStateComponent ArmarXCoreStatechart ArmarXCoreOperations)
+ set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRobotStateComponent ArmarXCoreStatechart ArmarXCoreOperations)
set(SOURCES "")
set(HEADERS MotionControlTestApp.h)
diff --git a/source/RobotAPI/core/CMakeLists.txt b/source/RobotAPI/core/CMakeLists.txt
index 716dd4678..46101fd75 100755
--- a/source/RobotAPI/core/CMakeLists.txt
+++ b/source/RobotAPI/core/CMakeLists.txt
@@ -1,4 +1,4 @@
-armarx_set_target("HumanoidRobotAPI Core Library: HumanoidRobotAPICore")
+armarx_set_target("RobotAPI Core Library: RobotAPICore")
find_package(Eigen3 QUIET)
@@ -11,7 +11,7 @@ if (ARMARX_BUILD)
include_directories(${Eigen3_INCLUDE_DIR})
include_directories(${VirtualRobot_INCLUDE_DIRS})
- set(LIB_NAME HumanoidRobotAPICore)
+ set(LIB_NAME RobotAPICore)
set(LIB_VERSION 0.1.0)
set(LIB_SOVERSION 0)
diff --git a/source/RobotAPI/motioncontrol/CMakeLists.txt b/source/RobotAPI/motioncontrol/CMakeLists.txt
index 8a9538c6f..42ac01699 100755
--- a/source/RobotAPI/motioncontrol/CMakeLists.txt
+++ b/source/RobotAPI/motioncontrol/CMakeLists.txt
@@ -1,4 +1,4 @@
-armarx_set_target("HumanoidRobotAPI MotionControl Library: MotionControl")
+armarx_set_target("RobotAPI MotionControl Library: MotionControl")
find_package(Eigen3 QUIET)
@@ -15,7 +15,7 @@ if (ARMARX_BUILD)
set(LIB_VERSION 0.1.0)
set(LIB_SOVERSION 0)
- set(LIBS HumanoidRobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers)
+ set(LIBS RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers)
set(LIB_FILES MotionControl.cpp)
set(LIB_HEADERS MotionControl.h)
diff --git a/source/RobotAPI/motioncontrol/MotionControl.cpp b/source/RobotAPI/motioncontrol/MotionControl.cpp
index 649fe4b0d..a93e72721 100644
--- a/source/RobotAPI/motioncontrol/MotionControl.cpp
+++ b/source/RobotAPI/motioncontrol/MotionControl.cpp
@@ -40,7 +40,7 @@ void MoveJoints::defineParameters()
{
context = getContext<RobotStatechartContext>();
- setConfigFile("HumanoidRobotAPIConfigs/stateconfigs/MotionControl.xml");
+ setConfigFile("RobotAPIConfigs/stateconfigs/MotionControl.xml");
addToInputAsList("jointNames", VariantType::String, false);
addToInputAsList("targetJointValues", VariantType::Float, false);
@@ -135,7 +135,7 @@ void MoveJointsVelocityControl::defineParameters()
{
context = getContext<RobotStatechartContext>();
- setConfigFile("HumanoidRobotAPIConfigs/stateconfigs/MotionControl.xml");
+ setConfigFile("RobotAPIConfigs/stateconfigs/MotionControl.xml");
addToInputAsList("jointNames", VariantType::String, false);
addToInputAsList("targetJointVelocities", VariantType::Float, false);
@@ -225,7 +225,7 @@ void MoveTCPPoseIK::defineParameters()
{
context = getContext<RobotStatechartContext>();
- setConfigFile("HumanoidRobotAPIConfigs/stateconfigs/MotionControl.xml");
+ setConfigFile("RobotAPIConfigs/stateconfigs/MotionControl.xml");
addToInput("kinematicChainName", VariantType::String, false);
addToInput("targetTCPPosition", VariantType::LinkedPosition, false);
@@ -279,7 +279,7 @@ void MoveTCPTrajectory::defineParameters()
{
context = getContext<RobotStatechartContext>();
- setConfigFile("HumanoidRobotAPIConfigs/stateconfigs/MotionControl.xml");
+ setConfigFile("RobotAPIConfigs/stateconfigs/MotionControl.xml");
addToInput("kinematicChainName", VariantType::String, false);
addToInputAsList("targetTCPPositions", VariantType::LinkedPosition, false);
@@ -575,7 +575,7 @@ void ValidateJointAngleConfiguration::onEnter()
void MotionControlTestState::defineParameters()
{
- setConfigFile("HumanoidRobotAPIConfigs/stateconfigs/MotionControl.xml");
+ setConfigFile("RobotAPIConfigs/stateconfigs/MotionControl.xml");
addToInputAsList("jointNames", VariantType::String, false);
addToInputAsList("targetJointValues", VariantType::Float, false);
@@ -607,7 +607,7 @@ void MotionControlTestState::defineSubstates()
void MotionControlTestStateIK::defineParameters()
{
- setConfigFile("HumanoidRobotAPIConfigs/stateconfigs/MotionControl.xml");
+ setConfigFile("RobotAPIConfigs/stateconfigs/MotionControl.xml");
addToInput("kinematicChainName", VariantType::String, false);
//addToInput("targetTCPPosition", VariantType::LinkedPosition, false);
diff --git a/source/RobotAPI/motioncontrol/MotionControl.h b/source/RobotAPI/motioncontrol/MotionControl.h
index fb63e94d8..7cd0d1084 100644
--- a/source/RobotAPI/motioncontrol/MotionControl.h
+++ b/source/RobotAPI/motioncontrol/MotionControl.h
@@ -24,7 +24,7 @@ namespace MotionControl
\section HowTo How to use the states
To use one of the MotionControl states, you have to make it a substate of your own state (see ArmarXCore::Statechart). To set its parameters,
- map them from you own state to it. The standard configuration is set in file ${ArmarX_Home}/data/HumanoidRobotAPIConfigs/stateconfigs/MotionControl.xml.
+ map them from you own state to it. The standard configuration is set in file ${ArmarX_Home}/data/RobotAPIConfigs/stateconfigs/MotionControl.xml.
Two kinds of kinematic entities are controlled using the MotionControl: single joints and kinematic chains. A kinematic chain is a list of joints
that usually belong to a part of the robot, e.g. an arm. The joints and the kinematic chains are all defined in the xml files that describe the
--
GitLab