Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

a379bcf4

Commit a379bcf4 authored 3 years ago by Fabian Tërnava

Downloads
- Plain Diff

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

parents 4acd46e1 c1ddbde6

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

scenarios/dasd/config/DynamicObstacleManager.cfg 327 additions, 0 deletions

scenarios/dasd/config/DynamicObstacleManager.cfg
scenarios/dasd/config/ObstacleAwarePlatformUnit.cfg 332 additions, 0 deletions

scenarios/dasd/config/ObstacleAwarePlatformUnit.cfg
scenarios/dasd/config/global.cfg 4 additions, 0 deletions

scenarios/dasd/config/global.cfg
scenarios/dasd/dasd.scx 6 additions, 0 deletions

scenarios/dasd/dasd.scx
source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp 18 additions, 1 deletion

...ponents/DynamicObstacleManager/DynamicObstacleManager.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp 4 additions, 3 deletions

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp

with 691 additions and 4 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