Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

f35eab4e

Commit f35eab4e authored 4 years ago by armar-user

Downloads
- Plain Diff

Merge branch 'fix/obstacle_avoiding_controller_behavior' into demo/integration

parents 7a1e2cb8 23a87309

No related branches found

No related tags found

1 merge request!117Demo/integration

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json 3 additions, 3 deletions

data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp 77 additions, 11 deletions

...acleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h 8 additions, 0 deletions

...stacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h
source/RobotAPI/libraries/RobotStatechartHelpers/ObstacleAvoidingPlatformUnitHelper.cpp 131 additions, 25 deletions

...tStatechartHelpers/ObstacleAvoidingPlatformUnitHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/ObstacleAvoidingPlatformUnitHelper.h 64 additions, 11 deletions

...botStatechartHelpers/ObstacleAvoidingPlatformUnitHelper.h

with 283 additions and 50 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