Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

Navigation
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2176dbda

Commit 2176dbda authored 2 years ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'feature/navigator-human-reader' into 'dev'

Feature/navigator human reader

See merge request ArmarX/skills/navigation!46

parents f9001ab0 6f52f981

No related branches found

No related tags found

2 merge requests!46Feature/navigator human reader,!28Draft: Dev -> Main

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/armarx/navigation/components/navigator/Component.cpp 7 additions, 4 deletions

source/armarx/navigation/components/navigator/Component.cpp
source/armarx/navigation/components/navigator/Component.h 6 additions, 4 deletions

source/armarx/navigation/components/navigator/Component.h
source/armarx/navigation/core/DynamicScene.h 3 additions, 6 deletions

source/armarx/navigation/core/DynamicScene.h
source/armarx/navigation/local_planning/TebObstacleManager.cpp 4 additions, 4 deletions

...e/armarx/navigation/local_planning/TebObstacleManager.cpp
source/armarx/navigation/local_planning/TimedElasticBands.cpp 8 additions, 7 deletions

...ce/armarx/navigation/local_planning/TimedElasticBands.cpp
source/armarx/navigation/server/scene_provider/SceneProvider.cpp 13 additions, 7 deletions

...armarx/navigation/server/scene_provider/SceneProvider.cpp
source/armarx/navigation/server/scene_provider/SceneProvider.h 22 additions, 2 deletions

...e/armarx/navigation/server/scene_provider/SceneProvider.h

with 63 additions and 34 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