Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

6d5f6633

Commit 6d5f6633 authored 6 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 6336ce7b 0ea5207b

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianVelocityControllerWithRamp.cpp 1 addition, 2 deletions

...Controllers/NJointCartesianVelocityControllerWithRamp.cpp
source/RobotAPI/libraries/core/CartesianVelocityController.cpp 18 additions, 7 deletions

...e/RobotAPI/libraries/core/CartesianVelocityController.cpp
source/RobotAPI/libraries/core/CartesianVelocityControllerWithRamp.cpp 19 additions, 5 deletions

...PI/libraries/core/CartesianVelocityControllerWithRamp.cpp
source/RobotAPI/libraries/core/CartesianVelocityRamp.cpp 3 additions, 0 deletions

source/RobotAPI/libraries/core/CartesianVelocityRamp.cpp
source/RobotAPI/libraries/core/JointVelocityRamp.cpp 8 additions, 2 deletions

source/RobotAPI/libraries/core/JointVelocityRamp.cpp
source/RobotAPI/libraries/core/test/CartesianVelocityControllerTest.cpp 1 addition, 1 deletion

...I/libraries/core/test/CartesianVelocityControllerTest.cpp
source/RobotAPI/libraries/core/test/CartesianVelocityControllerWithRampTest.cpp 6 additions, 6 deletions

...ies/core/test/CartesianVelocityControllerWithRampTest.cpp

with 56 additions and 23 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