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

b786b348

Commit b786b348 authored 2 years ago by Fabian Peller

Downloads
- Plain Diff

Merge branch 'aron/dev' into 'master'

Aron/dev

See merge request ArmarX/skills/navigation!26

parents 2a8bdd33 f6dca8dc

No related branches found

No related tags found

1 merge request!26Aron/dev

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/armarx/navigation/core/json_conversions.h 1 addition, 1 deletion

source/armarx/navigation/core/json_conversions.h
source/armarx/navigation/global_planning/aron/AStarParams.xml 1 addition, 4 deletions

...ce/armarx/navigation/global_planning/aron/AStarParams.xml
source/armarx/navigation/global_planning/aron/Point2PointParams.xml 1 addition, 4 deletions

...arx/navigation/global_planning/aron/Point2PointParams.xml
source/armarx/navigation/global_planning/aron/SPFAParams.xml 1 addition, 4 deletions

source/armarx/navigation/global_planning/aron/SPFAParams.xml
source/armarx/navigation/platform_controller/aron/PlatformTrajectoryControllerConfig.xml 4 additions, 4 deletions

...rm_controller/aron/PlatformTrajectoryControllerConfig.xml
source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml 1 addition, 4 deletions

...on/trajectory_control/aron/TrajectoryControllerParams.xml
source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml 3 additions, 8 deletions

...tory_control/aron/TrajectoryFollowingControllerParams.xml
source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml 1 addition, 4 deletions

...tion/trajectory_control/aron/WaypointControllerParams.xml

with 13 additions and 33 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