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

d8f0f780

Commit d8f0f780 authored 2 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into armem/rename-time-created

parents 8fcd167a 0f0475a9

No related branches found

No related tags found

1 merge request!73Rename time created

This commit is part of merge request !73. Comments created here will be created in the context of that merge request.

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

data/armarx_navigation/controller_config/PlatformTrajectory/default.json 2 additions, 2 deletions

...igation/controller_config/PlatformTrajectory/default.json
scenarios/NavigationSimulation/NavigationSimulation.scx 1 addition, 1 deletion

scenarios/NavigationSimulation/NavigationSimulation.scx
scenarios/NavigationSimulation/config/RobotStateMemory.cfg 16 additions, 0 deletions

scenarios/NavigationSimulation/config/RobotStateMemory.cfg
scenarios/NavigationSimulation/config/SimulatorApp.cfg 3 additions, 3 deletions

scenarios/NavigationSimulation/config/SimulatorApp.cfg
scenarios/PlatformNavigation/config/ObjectMemory.cfg 6 additions, 3 deletions

scenarios/PlatformNavigation/config/ObjectMemory.cfg
source/armarx/navigation/core/Trajectory.cpp 6 additions, 4 deletions

source/armarx/navigation/core/Trajectory.cpp
source/armarx/navigation/trajectory_control/global/TrajectoryFollowingController.cpp 12 additions, 0 deletions

...ajectory_control/global/TrajectoryFollowingController.cpp
source/armarx/navigation/trajectory_control/local/TrajectoryFollowingController.cpp 12 additions, 8 deletions

...rajectory_control/local/TrajectoryFollowingController.cpp

with 58 additions and 21 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