Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

4c1b1ff7

Commit 4c1b1ff7 authored 6 years ago by Armar6

Downloads
- Plain Diff

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

Conflicts:
	source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp

parents bb2c93f1 5359ace0

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 2 additions, 4 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.cpp 31 additions, 11 deletions

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

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp 51 additions, 20 deletions

...ntrollers/DMPController/NJointBimanualCCDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.h 3 additions, 3 deletions

...Controllers/DMPController/NJointBimanualCCDMPController.h

with 90 additions and 41 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