Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

a0c9534c

Commit a0c9534c authored 5 years ago by Fabian Paus

Downloads
- Plain Diff

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

parents a6e5c400 fcff6f97

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.cpp 68 additions, 52 deletions

.../NJointControllers/NJointTaskSpaceImpedanceController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.h 4 additions, 10 deletions

...it/NJointControllers/NJointTaskSpaceImpedanceController.h
source/RobotAPI/interface/units/RobotUnit/TaskSpaceActiveImpedanceControl.ice 6 additions, 8 deletions

...rface/units/RobotUnit/TaskSpaceActiveImpedanceControl.ice

with 78 additions and 70 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