diff --git a/planner_cspace/CMakeLists.txt b/planner_cspace/CMakeLists.txt index 50af3512..5ef773b6 100644 --- a/planner_cspace/CMakeLists.txt +++ b/planner_cspace/CMakeLists.txt @@ -22,6 +22,7 @@ set(CATKIN_DEPENDS neonavigation_common neonavigation_metrics_msgs planner_cspace_msgs + trajectory_tracker trajectory_tracker_msgs ) @@ -55,6 +56,7 @@ add_executable(planner_3d src/planner_3d.cpp src/distance_map.cpp src/rotation_cache.cpp + src/start_pose_predictor.cpp ) target_link_libraries(planner_3d ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${OpenMP_CXX_FLAGS}) add_dependencies(planner_3d ${catkin_EXPORTED_TARGETS} ${PROJECT_NAME}_gencfg) diff --git a/planner_cspace/cfg/Planner3D.cfg b/planner_cspace/cfg/Planner3D.cfg index 5c90e9d5..47b7727f 100755 --- a/planner_cspace/cfg/Planner3D.cfg +++ b/planner_cspace/cfg/Planner3D.cfg @@ -46,5 +46,7 @@ gen.add("force_goal_orientation", bool_t, 0, "", True) gen.add("temporary_escape", bool_t, 0, "", True) gen.add("fast_map_update", bool_t, 0, "", False) gen.add("max_retry_num", int_t, 0, "", -1, -1, 100) +gen.add("keep_a_part_of_previous_path", bool_t, 0, "If true, a part of the previous path is preserved to avoid radical path changes.", False) +gen.add("dist_stop_to_previous_path", double_t, 0, "Valid only when keep_a_part_of_previous_path is true. This should be the same as dist_stop parameter of trajectory_tracker.", 0.1, 0.0, 1.0) exit(gen.generate(PACKAGE, "planner_cspace", "Planner3D")) diff --git a/planner_cspace/include/planner_cspace/planner_3d/grid_metric_converter.h b/planner_cspace/include/planner_cspace/planner_3d/grid_metric_converter.h index 76a2ab1f..659a3f94 100644 --- a/planner_cspace/include/planner_cspace/planner_3d/grid_metric_converter.h +++ b/planner_cspace/include/planner_cspace/planner_3d/grid_metric_converter.h @@ -79,7 +79,7 @@ inline void metric2Grid( } template