Commit 57658ae8 authored 4 years ago by ArmarX User

Merge branch 'kitgripper'

# Conflicts:
#	source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
#	source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt

parents e6a52c16 18c1aef0

Hide whitespace changes

Inline Side-by-side

Showing

build/.gitkeep 0 additions, 0 deletions

build/.gitkeep
scenarios/StatechartExecutionExample/StatechartExecutionExample.scx 1 addition, 1 deletion

...StatechartExecutionExample/StatechartExecutionExample.scx
scenarios/StatechartExecutionExample/config/StatechartExecutorApp.cfg 196 additions, 0 deletions

...atechartExecutionExample/config/StatechartExecutorApp.cfg
scenarios/StatechartExecutionExample/config/StatechartExecutorExampleApp.cfg 1 addition, 1 deletion

...tExecutionExample/config/StatechartExecutorExampleApp.cfg
scenarios/StatechartExecutionExample/config/XMLRemoteStateOfferer.StatechartExecutionGroup.cfg 1 addition, 1 deletion

...config/XMLRemoteStateOfferer.StatechartExecutionGroup.cfg
scenarios/StatechartExecutionExample/config/XMLRemoteStateOfferer.StatechartProfilesTestGroup.cfg 227 additions, 0 deletions

...fig/XMLRemoteStateOfferer.StatechartProfilesTestGroup.cfg
source/RobotAPI/components/StatechartExecutorExample/CMakeLists.txt 2 additions, 0 deletions

...otAPI/components/StatechartExecutorExample/CMakeLists.txt
source/RobotAPI/components/StatechartExecutorExample/StatechartExecutorExample.cpp 72 additions, 32 deletions

...s/StatechartExecutorExample/StatechartExecutorExample.cpp
source/RobotAPI/components/StatechartExecutorExample/StatechartExecutorExample.h 0 additions, 1 deletion

...nts/StatechartExecutorExample/StatechartExecutorExample.h
source/RobotAPI/interface/units/RobotUnit/NJointJointSpaceDMPController.ice 3 additions, 0 deletions

...terface/units/RobotUnit/NJointJointSpaceDMPController.ice
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 19 additions, 3 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/CMakeLists.txt 1 addition, 2 deletions

source/RobotAPI/libraries/CMakeLists.txt
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.cpp 10 additions, 0 deletions

...botAPI/libraries/DMPController/TaskSpaceDMPController.cpp
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h 16 additions, 5 deletions

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt 37 additions, 35 deletions

...botAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.cpp 27 additions, 2 deletions

...NJointControllers/DMPController/NJointJSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.h 4 additions, 0 deletions

...PINJointControllers/DMPController/NJointJSDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.cpp 264 additions, 57 deletions

...NJointControllers/DMPController/NJointTSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h 45 additions, 2 deletions

...PINJointControllers/DMPController/NJointTSDMPController.h
source/RobotAPI/libraries/core/CMakeLists.txt 0 additions, 20 deletions

source/RobotAPI/libraries/core/CMakeLists.txt

with 926 additions and 162 deletions

Please register or to comment