Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

27ab04fe

Commit 27ab04fe authored 6 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents c0f1641b c523a536

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/libraries/RobotStatechartHelpers/PositionControllerHelper.cpp 19 additions, 13 deletions

...aries/RobotStatechartHelpers/PositionControllerHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h 4 additions, 3 deletions

...braries/RobotStatechartHelpers/PositionControllerHelper.h
source/RobotAPI/libraries/core/CartesianVelocityController.cpp 9 additions, 9 deletions

...e/RobotAPI/libraries/core/CartesianVelocityController.cpp
source/RobotAPI/libraries/core/CartesianVelocityControllerWithRamp.cpp 6 additions, 15 deletions

...PI/libraries/core/CartesianVelocityControllerWithRamp.cpp

with 38 additions and 40 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