Merge branch 'feature/human-library' into feature/human-tracker
No related branches found
No related tags found
This commit is part of merge request !38. Comments created here will be created in the context of that merge request.
Showing
- data/armarx_navigation/controller_config/PlatformTrajectory/default.json 2 additions, 2 deletions...igation/controller_config/PlatformTrajectory/default.json
- data/armarx_navigation/local_planner_config/TimedElasticBands/default.json 115 additions, 0 deletions...ation/local_planner_config/TimedElasticBands/default.json
- source/armarx/navigation/CMakeLists.txt 1 addition, 0 deletionssource/armarx/navigation/CMakeLists.txt
- source/armarx/navigation/core/Trajectory.cpp 105 additions, 46 deletionssource/armarx/navigation/core/Trajectory.cpp
- source/armarx/navigation/core/Trajectory.h 20 additions, 0 deletionssource/armarx/navigation/core/Trajectory.h
- source/armarx/navigation/human/CMakeLists.txt 13 additions, 0 deletionssource/armarx/navigation/human/CMakeLists.txt
- source/armarx/navigation/human/types.h 42 additions, 0 deletionssource/armarx/navigation/human/types.h
- source/armarx/navigation/local_planning/TimedElasticBands.cpp 45 additions, 61 deletions...ce/armarx/navigation/local_planning/TimedElasticBands.cpp
- source/armarx/navigation/local_planning/TimedElasticBands.h 4 additions, 13 deletionssource/armarx/navigation/local_planning/TimedElasticBands.h
- source/armarx/navigation/local_planning/aron/TimedElasticBands.xml 391 additions, 1 deletion...marx/navigation/local_planning/aron/TimedElasticBands.xml
- source/armarx/navigation/local_planning/aron_conversions.cpp 130 additions, 0 deletionssource/armarx/navigation/local_planning/aron_conversions.cpp
- source/armarx/navigation/local_planning/aron_conversions.h 4 additions, 0 deletionssource/armarx/navigation/local_planning/aron_conversions.h
- source/armarx/navigation/local_planning/ros_conversions.cpp 1 addition, 1 deletionsource/armarx/navigation/local_planning/ros_conversions.cpp
- source/armarx/navigation/server/introspection/ArvizIntrospector.cpp 1 addition, 1 deletion...arx/navigation/server/introspection/ArvizIntrospector.cpp
Loading
Please register or sign in to comment