Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

8eafea2d

Commit 8eafea2d authored 6 years ago by Raphael Grimm

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into RobotUnit_v3

parents c208c3a1 37424c18

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.cpp 14 additions, 0 deletions

.../NJointControllers/NJointTaskSpaceImpedanceController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.h 1 addition, 1 deletion

...it/NJointControllers/NJointTaskSpaceImpedanceController.h
source/RobotAPI/interface/units/RobotUnit/TaskSpaceActiveImpedanceControl.ice 1 addition, 1 deletion

...rface/units/RobotUnit/TaskSpaceActiveImpedanceControl.ice
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp 4 additions, 3 deletions

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp

with 20 additions and 5 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