Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

fbd674e3

Commit fbd674e3 authored 6 years ago by Simon Ottenhaus

Downloads
- Plain Diff

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

parents 8365277a fa5c1ff5

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp 2 additions, 0 deletions

...s/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp 33 additions, 11 deletions

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.h 11 additions, 0 deletions

...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h

with 46 additions and 11 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