added needed includedirs for catkin on kinetic

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb763b566da42b747dd2dc5d47fb83fa673a21a1..a46fdd1f358b280d1fb9366988df19902c743fc0 100644 (file)
--- 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 598362246fc1ee0586a544ffd9e44523b4824ef1..3b97339ec3b01acab196210e9f0655c39102c2f2 100755 (executable)
--- 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 a183484a5e5a8dff561a44a2f6023b19ad4f5ba6..c06a084c907cd9ccd957a42b3f00a4aec7bb286d 100644 (file)
--- 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<cv::Vec2f> lines;
+               std::vector<cv::Vec2f> lines;
                cv::warpPerspective(frame, frame, transformation_matrix, frame.size(), INTER_LINEAR);
                Mat roi(frame, Rect(roi_x, roi_y, roi_width, roi_height));