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

3e30086d

Commit 3e30086d authored 1 year ago by armar-user

Downloads
- Plain Diff

Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/skills/navigation

parents 69c44c2c 8b6cbeb6

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/armarx/navigation/platform_controller/PlatformGlobalTrajectoryController.cpp 13 additions, 1 deletion

...latform_controller/PlatformGlobalTrajectoryController.cpp
source/armarx/navigation/platform_controller/PlatformGlobalTrajectoryController.h 9 additions, 0 deletions

.../platform_controller/PlatformGlobalTrajectoryController.h
source/armarx/navigation/skills/NavigateTo.cpp 20 additions, 4 deletions

source/armarx/navigation/skills/NavigateTo.cpp
source/armarx/navigation/skills/NavigateToLocation.cpp 18 additions, 2 deletions

source/armarx/navigation/skills/NavigateToLocation.cpp
source/armarx/navigation/skills/aron/NavigateTo.xml 8 additions, 0 deletions

source/armarx/navigation/skills/aron/NavigateTo.xml
source/armarx/navigation/skills/aron/NavigateToLocation.xml 8 additions, 0 deletions

source/armarx/navigation/skills/aron/NavigateToLocation.xml
source/armarx/navigation/trajectory_control/global/TrajectoryController.h 4 additions, 0 deletions

...vigation/trajectory_control/global/TrajectoryController.h
source/armarx/navigation/trajectory_control/global/TrajectoryFollowingController.cpp 15 additions, 5 deletions

...ajectory_control/global/TrajectoryFollowingController.cpp

with 95 additions and 12 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