Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

c1678a1b

Commit c1678a1b authored 4 years ago by Stefan Reither

Downloads
- Plain Diff

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

parents 25a59455 d7eeb9c5

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json 90 additions, 0 deletions

data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/CMakeLists.txt 1 addition, 0 deletions

...ponents/units/ObstacleAvoidingPlatformUnit/CMakeLists.txt
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp 25 additions, 4 deletions

...acleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h 5 additions, 1 deletion

...stacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h
source/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp 5 additions, 0 deletions

source/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp
source/RobotAPI/libraries/DSControllers/DSRTBimanualController.cpp 1 addition, 1 deletion

...botAPI/libraries/DSControllers/DSRTBimanualController.cpp
source/RobotAPI/libraries/diffik/CompositeDiffIK.h 15 additions, 0 deletions

source/RobotAPI/libraries/diffik/CompositeDiffIK.h

with 142 additions and 6 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