From 65c1790852227f3320af16237514105ad674a17d Mon Sep 17 00:00:00 2001 From: Erik Andresen Date: Thu, 23 Feb 2017 17:36:07 +0100 Subject: [PATCH] added needed includedirs for catkin on kinetic --- CMakeLists.txt | 4 +++- config/wt_node.cfg | 2 +- src/path_following.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb763b5..a46fdd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,9 @@ catkin_package( ## Specify additional locations of header files ## Your package locations should be listed before other locations -# include_directories(include) +include_directories( + ${catkin_INCLUDE_DIRS} +) ## Declare a cpp library # add_library(wild_thumper diff --git a/config/wt_node.cfg b/config/wt_node.cfg index 5983622..3b97339 100755 --- a/config/wt_node.cfg +++ b/config/wt_node.cfg @@ -5,7 +5,7 @@ from dynamic_reconfigure.parameter_generator_catkin import * gen = ParameterGenerator() gen.add("range_sensor_clip", bool_t, 0, "Clip range sensor values to max range", True) -gen.add("range_sensor_max", double_t, 0, "Range sensor max range", 0.5, 0.4, 6) +gen.add("range_sensor_max", double_t, 0, "Range sensor max range", 0.5, 0.4, 4) gen.add("odom_covar_xy", double_t, 0, "Odometry covariance: translation", 1e-2, 1e-6, 1) gen.add("odom_covar_angle", double_t, 0, "Odometry covariance: rotation", 0.25, 1e-6, 6.2832) diff --git a/src/path_following.cpp b/src/path_following.cpp index a183484..c06a084 100644 --- a/src/path_following.cpp +++ b/src/path_following.cpp @@ -78,7 +78,7 @@ class PathFollower int pathfinder(cv::Mat &frame, float &r, float &phi) { - cv::vector lines; + std::vector lines; cv::warpPerspective(frame, frame, transformation_matrix, frame.size(), INTER_LINEAR); Mat roi(frame, Rect(roi_x, roi_y, roi_width, roi_height)); -- 2.39.2