From 89ba79168db8f592b6528841145e96e53db43f49 Mon Sep 17 00:00:00 2001 From: Sai Kishor Kothakota Date: Fri, 8 Nov 2024 11:18:44 +0100 Subject: [PATCH 1/2] change from thread_priority.hpp to realtime_helpers.hpp (#1829) (cherry picked from commit 8fa60dba374563077d221d2395867ce1906c41fe) # Conflicts: # controller_manager/src/ros2_control_node.cpp --- controller_manager/src/ros2_control_node.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controller_manager/src/ros2_control_node.cpp b/controller_manager/src/ros2_control_node.cpp index 146f2e359c..062cc9a115 100644 --- a/controller_manager/src/ros2_control_node.cpp +++ b/controller_manager/src/ros2_control_node.cpp @@ -20,8 +20,13 @@ #include #include "controller_manager/controller_manager.hpp" +<<<<<<< HEAD #include "rclcpp/rclcpp.hpp" #include "realtime_tools/thread_priority.hpp" +======= +#include "rclcpp/executors.hpp" +#include "realtime_tools/realtime_helpers.hpp" +>>>>>>> 8fa60db (change from thread_priority.hpp to realtime_helpers.hpp (#1829)) using namespace std::chrono_literals; From 7bc094dd2d81a251bce9bdcb224b75b96d04fd67 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Fri, 8 Nov 2024 10:29:37 +0000 Subject: [PATCH 2/2] Apply suggestions from code review --- controller_manager/src/ros2_control_node.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/controller_manager/src/ros2_control_node.cpp b/controller_manager/src/ros2_control_node.cpp index 062cc9a115..2fc5f55ec9 100644 --- a/controller_manager/src/ros2_control_node.cpp +++ b/controller_manager/src/ros2_control_node.cpp @@ -20,13 +20,8 @@ #include #include "controller_manager/controller_manager.hpp" -<<<<<<< HEAD #include "rclcpp/rclcpp.hpp" -#include "realtime_tools/thread_priority.hpp" -======= -#include "rclcpp/executors.hpp" #include "realtime_tools/realtime_helpers.hpp" ->>>>>>> 8fa60db (change from thread_priority.hpp to realtime_helpers.hpp (#1829)) using namespace std::chrono_literals;