Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

1ebf8238

Commit 1ebf8238 authored 6 years ago by Armar6Demo

Downloads
- Plain Diff

Merge branch 'armar6demo' of https://gitlab.com/ArmarX/RobotAPI into armar6demo

parents 70f64368 8bf4fd8d

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

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

...botAPI/libraries/DMPController/TaskSpaceDMPController.cpp
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h 4 additions, 1 deletion

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointPeriodicTSDMPCompliantController.cpp 140 additions, 56 deletions

.../DMPController/NJointPeriodicTSDMPCompliantController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointPeriodicTSDMPCompliantController.h 5 additions, 2 deletions

...rs/DMPController/NJointPeriodicTSDMPCompliantController.h

with 194 additions and 61 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