Commit 85d83609 authored 6 years ago by Armar6

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

parents 6f5a9b77 6d5f6633

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianVelocityControllerWithRamp.cpp 1 addition, 2 deletions

...Controllers/NJointCartesianVelocityControllerWithRamp.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp 3 additions, 3 deletions

...obotUnit/NJointControllers/NJointTrajectoryController.cpp
source/RobotAPI/libraries/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/libraries/CMakeLists.txt
source/RobotAPI/libraries/RobotStatechartHelpers/CMakeLists.txt 41 additions, 0 deletions

.../RobotAPI/libraries/RobotStatechartHelpers/CMakeLists.txt
source/RobotAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.cpp 52 additions, 0 deletions

...PI/libraries/RobotStatechartHelpers/ForceTorqueHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.h 53 additions, 0 deletions

...tAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.h
source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.cpp 113 additions, 0 deletions

...aries/RobotStatechartHelpers/PositionControllerHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h 78 additions, 0 deletions

...braries/RobotStatechartHelpers/PositionControllerHelper.h
source/RobotAPI/libraries/RobotStatechartHelpers/RobotStatechartHelpers.cpp 28 additions, 0 deletions

...braries/RobotStatechartHelpers/RobotStatechartHelpers.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/RobotStatechartHelpers.h 45 additions, 0 deletions

...libraries/RobotStatechartHelpers/RobotStatechartHelpers.h
source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.cpp 77 additions, 0 deletions

...aries/RobotStatechartHelpers/VelocityControllerHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.h 56 additions, 0 deletions

...braries/RobotStatechartHelpers/VelocityControllerHelper.h
source/RobotAPI/libraries/core/CMakeLists.txt 1 addition, 0 deletions

source/RobotAPI/libraries/core/CMakeLists.txt
source/RobotAPI/libraries/core/CartesianPositionController.cpp 5 additions, 5 deletions

...e/RobotAPI/libraries/core/CartesianPositionController.cpp
source/RobotAPI/libraries/core/CartesianPositionController.h 5 additions, 5 deletions

source/RobotAPI/libraries/core/CartesianPositionController.h
source/RobotAPI/libraries/core/CartesianVelocityController.cpp 18 additions, 7 deletions

...e/RobotAPI/libraries/core/CartesianVelocityController.cpp
source/RobotAPI/libraries/core/CartesianVelocityControllerWithRamp.cpp 19 additions, 5 deletions

...PI/libraries/core/CartesianVelocityControllerWithRamp.cpp
source/RobotAPI/libraries/core/CartesianVelocityRamp.cpp 3 additions, 0 deletions

source/RobotAPI/libraries/core/CartesianVelocityRamp.cpp
source/RobotAPI/libraries/core/JointVelocityRamp.cpp 8 additions, 2 deletions

source/RobotAPI/libraries/core/JointVelocityRamp.cpp
source/RobotAPI/libraries/core/MultiDimPIDController.h 238 additions, 0 deletions

source/RobotAPI/libraries/core/MultiDimPIDController.h

with 846 additions and 29 deletions

Please register or to comment