Commit d3fe83a1 authored 5 years ago by Christian Dreher

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents 87bcec37 a27b3ac0

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/NaturalIKTest/NaturalIKTest.cpp 51 additions, 17 deletions

source/RobotAPI/components/NaturalIKTest/NaturalIKTest.cpp
source/RobotAPI/components/NaturalIKTest/NaturalIKTest.h 20 additions, 7 deletions

source/RobotAPI/components/NaturalIKTest/NaturalIKTest.h
source/RobotAPI/components/units/RobotUnit/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/components/units/RobotUnit/CMakeLists.txt
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp 334 additions, 0 deletions

...tControllers/NJointCartesianNaturalPositionController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.h 128 additions, 0 deletions

...intControllers/NJointCartesianNaturalPositionController.h
source/RobotAPI/interface/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/interface/CMakeLists.txt
source/RobotAPI/interface/core/CartesianNaturalPositionControllerConfig.ice 50 additions, 0 deletions

...terface/core/CartesianNaturalPositionControllerConfig.ice
source/RobotAPI/interface/units/RobotUnit/NJointCartesianNaturalPositionController.ice 61 additions, 0 deletions

...ts/RobotUnit/NJointCartesianNaturalPositionController.ice
source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h 1 addition, 1 deletion

...ries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h
source/RobotAPI/libraries/core/CMakeLists.txt 10 additions, 2 deletions

source/RobotAPI/libraries/core/CMakeLists.txt
source/RobotAPI/libraries/core/CartesianNaturalPositionController.cpp 176 additions, 0 deletions

...API/libraries/core/CartesianNaturalPositionController.cpp
source/RobotAPI/libraries/core/CartesianNaturalPositionController.h 111 additions, 0 deletions

...otAPI/libraries/core/CartesianNaturalPositionController.h
source/RobotAPI/libraries/core/CartesianVelocityController.cpp 29 additions, 0 deletions

...e/RobotAPI/libraries/core/CartesianVelocityController.cpp
source/RobotAPI/libraries/core/CartesianVelocityController.h 1 addition, 0 deletions

source/RobotAPI/libraries/core/CartesianVelocityController.h
source/RobotAPI/libraries/core/diffik/NaturalDiffIK.cpp 127 additions, 0 deletions

source/RobotAPI/libraries/core/diffik/NaturalDiffIK.cpp
source/RobotAPI/libraries/core/diffik/NaturalDiffIK.h 72 additions, 0 deletions

source/RobotAPI/libraries/core/diffik/NaturalDiffIK.h
source/RobotAPI/libraries/core/diffik/SimpleDiffIK.cpp 2 additions, 84 deletions

source/RobotAPI/libraries/core/diffik/SimpleDiffIK.cpp
source/RobotAPI/libraries/core/diffik/SimpleDiffIK.h 0 additions, 0 deletions

source/RobotAPI/libraries/core/diffik/SimpleDiffIK.h
source/RobotAPI/libraries/core/math/MathUtils.h 5 additions, 0 deletions

source/RobotAPI/libraries/core/math/MathUtils.h
source/RobotAPI/libraries/natik/NaturalIK.cpp 45 additions, 3 deletions

source/RobotAPI/libraries/natik/NaturalIK.cpp

with 1227 additions and 114 deletions

Please register or to comment