PR #2558 from Nir-Az: Fix deprecated rolling API

IntelRealSense · Nov 23, 2022 · af65233 · af65233
2 parents ca0e7d8 + 911b220
commit af65233
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 4 deletions.
diff --git a/realsense2_camera/CMakeLists.txt b/realsense2_camera/CMakeLists.txt
@@ -156,7 +156,7 @@ elseif("$ENV{ROS_DISTRO}" STREQUAL "humble")
 elseif("$ENV{ROS_DISTRO}" STREQUAL "rolling")
   message(STATUS "Build for ROS2 Rolling")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DROLLING")
-  set(SOURCES "${SOURCES}" src/ros_param_backend_foxy.cpp)
+  set(SOURCES "${SOURCES}" src/ros_param_backend_rolling.cpp)
 else()
   message(FATAL_ERROR "Unsupported ROS Distribution: " "$ENV{ROS_DISTRO}")
 endif()

diff --git a/realsense2_camera/include/base_realsense_node.h b/realsense2_camera/include/base_realsense_node.h
@@ -6,7 +6,13 @@
 #include <librealsense2/rs.hpp>
 #include <librealsense2/rsutil.h>
 #include "constants.h"
+
+// cv_bridge.h last supported version is humble
+#if defined(ROLLING)
+#include <cv_bridge/cv_bridge.hpp>
+#else
 #include <cv_bridge/cv_bridge.h>
+#endif
 
 #include <diagnostic_updater/diagnostic_updater.hpp>
 #include <diagnostic_updater/publisher.hpp>

diff --git a/realsense2_camera/include/ros_param_backend.h b/realsense2_camera/include/ros_param_backend.h
@@ -15,7 +15,15 @@ namespace realsense2_camera
                 _logger(node.get_logger())
                 {};
             ~ParametersBackend();
-            void add_on_set_parameters_callback(rclcpp::node_interfaces::NodeParametersInterface::OnParametersSetCallbackType callback);
+
+
+            #if defined( ROLLING ) 
+                using ros2_param_callback_type = rclcpp::node_interfaces::NodeParametersInterface::OnSetParametersCallbackType;
+            #else
+                using ros2_param_callback_type = rclcpp::node_interfaces::NodeParametersInterface::OnParametersSetCallbackType;
+            #endif
+
+            void add_on_set_parameters_callback(ros2_param_callback_type callback);
 
 
         private:

diff --git a/realsense2_camera/src/ros_param_backend_dashing.cpp b/realsense2_camera/src/ros_param_backend_dashing.cpp
@@ -5,7 +5,7 @@
 
 namespace realsense2_camera
 {
-    void ParametersBackend::add_on_set_parameters_callback(rclcpp::node_interfaces::NodeParametersInterface::OnParametersSetCallbackType callback)
+    void ParametersBackend::add_on_set_parameters_callback(ros2_param_callback_type callback)
     {
         rclcpp::Node::OnParametersSetCallbackType prev_callback = _node.set_on_parameters_set_callback(callback);
         if (prev_callback)

diff --git a/realsense2_camera/src/ros_param_backend_foxy.cpp b/realsense2_camera/src/ros_param_backend_foxy.cpp
@@ -5,7 +5,7 @@
 
 namespace realsense2_camera
 {
-    void ParametersBackend::add_on_set_parameters_callback(rclcpp::node_interfaces::NodeParametersInterface::OnParametersSetCallbackType callback)
+    void ParametersBackend::add_on_set_parameters_callback(ros2_param_callback_type callback)
     {
         _ros_callback = _node.add_on_set_parameters_callback(callback);
     }

diff --git a/realsense2_camera/src/ros_param_backend_rolling.cpp b/realsense2_camera/src/ros_param_backend_rolling.cpp
@@ -0,0 +1,21 @@
+// License: Apache 2.0. See LICENSE file in root directory.
+// Copyright(c) 2022 Intel Corporation. All Rights Reserved.
+
+#include "ros_param_backend.h"
+
+namespace realsense2_camera
+{
+    void ParametersBackend::add_on_set_parameters_callback(ros2_param_callback_type callback)
+    {
+        _ros_callback = _node.add_on_set_parameters_callback(callback);
+    }
+
+    ParametersBackend::~ParametersBackend()
+    {
+        if (_ros_callback)
+        {
+            _node.remove_on_set_parameters_callback((rclcpp::node_interfaces::OnSetParametersCallbackHandle*)(_ros_callback.get()));
+            _ros_callback.reset();
+        }
+    }
+}