From 9d054850275c5a5f6879c70279626ff949e232c8 Mon Sep 17 00:00:00 2001 From: Markus <Markus.Przybylski@kit.edu> Date: Fri, 7 Mar 2014 16:23:27 +0100 Subject: [PATCH] Added new subdirectory "statecharts" and moved GraspingWithTorques and OpenHand there. --- source/RobotAPI/CMakeLists.txt | 3 +-- source/RobotAPI/statecharts/CMakeLists.txt | 2 ++ .../{ => statecharts}/GraspingWithTorques/CMakeLists.txt | 0 .../GraspingWithTorques/GraspingWithTorques.cpp | 2 +- .../GraspingWithTorques/GraspingWithTorques.h | 0 source/RobotAPI/{ => statecharts}/OpenHand/CMakeLists.txt | 0 source/RobotAPI/{ => statecharts}/OpenHand/OpenHand.cpp | 2 +- source/RobotAPI/{ => statecharts}/OpenHand/OpenHand.h | 0 8 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 source/RobotAPI/statecharts/CMakeLists.txt rename source/RobotAPI/{ => statecharts}/GraspingWithTorques/CMakeLists.txt (100%) rename source/RobotAPI/{ => statecharts}/GraspingWithTorques/GraspingWithTorques.cpp (99%) rename source/RobotAPI/{ => statecharts}/GraspingWithTorques/GraspingWithTorques.h (100%) rename source/RobotAPI/{ => statecharts}/OpenHand/CMakeLists.txt (100%) rename source/RobotAPI/{ => statecharts}/OpenHand/OpenHand.cpp (99%) rename source/RobotAPI/{ => statecharts}/OpenHand/OpenHand.h (100%) diff --git a/source/RobotAPI/CMakeLists.txt b/source/RobotAPI/CMakeLists.txt index 8da782e87..6014d839f 100644 --- a/source/RobotAPI/CMakeLists.txt +++ b/source/RobotAPI/CMakeLists.txt @@ -2,5 +2,4 @@ add_subdirectory(core) add_subdirectory(motioncontrol) add_subdirectory(applications) add_subdirectory(units) -add_subdirectory(GraspingWithTorques) -add_subdirectory(OpenHand) +add_subdirectory(statecharts) diff --git a/source/RobotAPI/statecharts/CMakeLists.txt b/source/RobotAPI/statecharts/CMakeLists.txt new file mode 100644 index 000000000..d49eaefad --- /dev/null +++ b/source/RobotAPI/statecharts/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(GraspingWithTorques) +add_subdirectory(OpenHand) diff --git a/source/RobotAPI/GraspingWithTorques/CMakeLists.txt b/source/RobotAPI/statecharts/GraspingWithTorques/CMakeLists.txt similarity index 100% rename from source/RobotAPI/GraspingWithTorques/CMakeLists.txt rename to source/RobotAPI/statecharts/GraspingWithTorques/CMakeLists.txt diff --git a/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp b/source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.cpp similarity index 99% rename from source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp rename to source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.cpp index c10bcd492..02ffd83b6 100644 --- a/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp +++ b/source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.cpp @@ -24,7 +24,7 @@ #include "GraspingWithTorques.h" //#include "Armar3GraspContext.h" //MP: Maybe necessary again later? -#include "../core/RobotStatechartContext.h" +#include "../../core/RobotStatechartContext.h" #include <Core/observers/variant/ChannelRef.h> #include <Core/observers/variant/SingleTypeVariantList.h> diff --git a/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.h b/source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.h similarity index 100% rename from source/RobotAPI/GraspingWithTorques/GraspingWithTorques.h rename to source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.h diff --git a/source/RobotAPI/OpenHand/CMakeLists.txt b/source/RobotAPI/statecharts/OpenHand/CMakeLists.txt similarity index 100% rename from source/RobotAPI/OpenHand/CMakeLists.txt rename to source/RobotAPI/statecharts/OpenHand/CMakeLists.txt diff --git a/source/RobotAPI/OpenHand/OpenHand.cpp b/source/RobotAPI/statecharts/OpenHand/OpenHand.cpp similarity index 99% rename from source/RobotAPI/OpenHand/OpenHand.cpp rename to source/RobotAPI/statecharts/OpenHand/OpenHand.cpp index a78a7cb41..1baf286ef 100644 --- a/source/RobotAPI/OpenHand/OpenHand.cpp +++ b/source/RobotAPI/statecharts/OpenHand/OpenHand.cpp @@ -24,7 +24,7 @@ #include "OpenHand.h" //#include "Armar3GraspContext.h" //MP: Maybe necessary again later? -#include "../core/RobotStatechartContext.h" +#include "../../core/RobotStatechartContext.h" #include <Core/observers/variant/ChannelRef.h> #include <Core/observers/variant/SingleTypeVariantList.h> diff --git a/source/RobotAPI/OpenHand/OpenHand.h b/source/RobotAPI/statecharts/OpenHand/OpenHand.h similarity index 100% rename from source/RobotAPI/OpenHand/OpenHand.h rename to source/RobotAPI/statecharts/OpenHand/OpenHand.h -- GitLab