Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

26e7fe0f

Commit 26e7fe0f authored 5 years ago by Raphael Grimm

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	source/RobotAPI/libraries/core/CartesianVelocityController.cpp

parents db8948f8 a0c9534c

No related branches found

No related tags found

No related merge requests found

Changes 4

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
source/RobotAPI/libraries/core/CartesianVelocityController.cpp 136 additions, 134 deletions

...e/RobotAPI/libraries/core/CartesianVelocityController.cpp

with 214 additions and 204 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