Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

6443c28f

Commit 6443c28f authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'master' into fix/obstacle_awareness

parents e4a2f516 33e59cb0

No related branches found

No related tags found

2 merge requests!170ArMem Viewer: Resolve Memory IDs,!167updated ice iterface to accept a sequence of lines in addition to a single line.

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 2 additions, 0 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp 65 additions, 34 deletions

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.h 25 additions, 23 deletions

...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h
source/RobotAPI/libraries/armem_robot_state/common/localization/TransformHelper.cpp 6 additions, 3 deletions

...armem_robot_state/common/localization/TransformHelper.cpp
source/RobotAPI/libraries/core/CartesianVelocityController.cpp 10 additions, 0 deletions

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

with 108 additions and 60 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