Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

a9cf7786

Commit a9cf7786 authored 5 years ago by ArmarX User

Downloads
- Patches
- Plain Diff

fix merge

parent 1df18ff5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 5 additions, 0 deletions

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

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

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.cpp 43 additions, 35 deletions

...NJointControllers/DMPController/NJointTSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h 0 additions, 1 deletion

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

source/RobotAPI/libraries/core/CMakeLists.txt

with 59 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