Make compatable with Melodic

ual-arm-ros-pkg · Oct 18, 2018 · 7ad84b9 · 7ad84b9
1 parent a048f59
commit 7ad84b9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,5 @@ catkin_ws/src/10-lane-control/line_detector2/include/line_detector2_tests/frame0
 roster.html
 *.egg-info
 what_the_duck-*
+catkin_ws/.catkin_tools/
+catkin_ws/logs/
diff --git a/catkin_ws/src/10-lane-control/ground_projection/CMakeLists.txt b/catkin_ws/src/10-lane-control/ground_projection/CMakeLists.txt
@@ -24,8 +24,11 @@ elseif ("$ENV{ROS_DISTRO}" STREQUAL "kinetic")
 elseif ("$ENV{ROS_DISTRO}" STREQUAL "lunar")
   message(WARNING "ROS distribution Lunar Loggerhead is not supported. Use at your own risk!")
   find_package(OpenCV 3 REQUIRED)
+elseif ("$ENV{ROS_DISTRO}" STREQUAL "melodic")
+  message(WARNING "ROS distribution Melodic Morendia is not supported. Use at your own risk!")
+  find_package(OpenCV 3 REQUIRED)
 else()
-  message(FATAL_ERROR "ROS distribution  not supported $ENV{ROS_DISTRO}")
+  message(FATAL_ERROR "ROS distribution not compatable $ENV{ROS_DISTRO}")
 endif()
 find_package(Boost REQUIRED COMPONENTS filesystem)
 find_package(PkgConfig)

diff --git a/catkin_ws/src/20-indefinite-navigation/apriltags2_ros/apriltags2/src/image_f32.c b/catkin_ws/src/20-indefinite-navigation/apriltags2_ros/apriltags2/src/image_f32.c
@@ -152,7 +152,7 @@ void image_f32_gaussian_blur(image_f32_t *im, double sigma, int ksz)
 // remap all values to [0, 1]
 void image_f32_normalize(image_f32_t *im)
 {
-    float min = HUGE, max = -HUGE;
+    float min = HUGE_VALF, max = -HUGE_VALF;
 
     for (int y = 0; y < im->height; y++) {
         for (int x = 0; x < im->width; x++) {

diff --git a/catkin_ws/src/20-indefinite-navigation/apriltags2_ros/apriltags2_ros/CMakeLists.txt b/catkin_ws/src/20-indefinite-navigation/apriltags2_ros/apriltags2_ros/CMakeLists.txt
@@ -12,6 +12,7 @@ find_package(catkin REQUIRED COMPONENTS
   cv_bridge
   tf
   cmake_modules
+  duckietown_msgs
 )
 
 find_package(Eigen REQUIRED)

diff --git a/...rc/20-indefinite-navigation/apriltags_ros/apriltags_ros/src/apriltag_detector_nodelet.cpp b/...rc/20-indefinite-navigation/apriltags_ros/apriltags_ros/src/apriltag_detector_nodelet.cpp
@@ -1,7 +1,7 @@
 #include <apriltags_ros/apriltag_detector.h>
 #include <ros/ros.h>
 #include <nodelet/nodelet.h>
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 
 
@@ -23,4 +23,4 @@ class AprilTagDetectorNodelet : public nodelet::Nodelet
 
 }
 
-PLUGINLIB_DECLARE_CLASS(apriltags_ros, AprilTagDetectorNodelet, apriltags_ros::AprilTagDetectorNodelet, nodelet::Nodelet);
+PLUGINLIB_EXPORT_CLASS(apriltags_ros::AprilTagDetectorNodelet, nodelet::Nodelet);