added needed includedirs for catkin on kinetic
authorErik Andresen <erik@vontaene.de>
Thu, 23 Feb 2017 16:36:07 +0000 (17:36 +0100)
committerErik Andresen <erik@vontaene.de>
Thu, 23 Feb 2017 16:36:07 +0000 (17:36 +0100)
CMakeLists.txt
config/wt_node.cfg
src/path_following.cpp

index eb763b5..a46fdd1 100644 (file)
@@ -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
index 5983622..3b97339 100755 (executable)
@@ -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)
 
index a183484..c06a084 100644 (file)
@@ -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));