Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

bba8bce3

Commit bba8bce3 authored 5 years ago by Fabian Paus

Downloads
- Plain Diff

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

parents 4ef7ef4a 504759d0

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/interface/units/RobotUnit/NJointJointSpaceDMPController.ice 3 additions, 1 deletion

...terface/units/RobotUnit/NJointJointSpaceDMPController.ice
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 77 additions, 0 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt 2 additions, 0 deletions

...botAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointAnomalyDetectionAdaptiveWipingController.cpp 201 additions, 88 deletions

...roller/NJointAnomalyDetectionAdaptiveWipingController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointAnomalyDetectionAdaptiveWipingController.h 23 additions, 1 deletion

...ntroller/NJointAnomalyDetectionAdaptiveWipingController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPVelocityController.cpp 853 additions, 0 deletions

...s/DMPController/NJointBimanualCCDMPVelocityController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPVelocityController.h 269 additions, 0 deletions

...ers/DMPController/NJointBimanualCCDMPVelocityController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.cpp 23 additions, 0 deletions

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

...PINJointControllers/DMPController/NJointJSDMPController.h

with 1455 additions and 90 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment