From 6038a45a353c42e1bd76bccf65d7a4aaf033e3e5 Mon Sep 17 00:00:00 2001 From: Olivier Michel Date: Tue, 16 Jan 2024 16:34:40 +0100 Subject: [PATCH] Fix version check (#883) Signed-off-by: Yadunund Co-authored-by: Yadunund --- webots_ros2_control/src/Ros2Control.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webots_ros2_control/src/Ros2Control.cpp b/webots_ros2_control/src/Ros2Control.cpp index fca501e86..fa414b150 100644 --- a/webots_ros2_control/src/Ros2Control.cpp +++ b/webots_ros2_control/src/Ros2Control.cpp @@ -78,7 +78,7 @@ namespace webots_ros2_control { } for (unsigned int i = 0; i < controlHardware.size(); i++) { // Necessary hotfix for renamed variables present in "hardware_interface" package for versions above 3.5 (#590) -#if HARDWARE_INTERFACE_VERSION_MAJOR >= 3 && HARDWARE_INTERFACE_VERSION_MINOR >= 5 +#if HARDWARE_INTERFACE_VERSION_MAJOR >= 4 || HARDWARE_INTERFACE_VERSION_MAJOR >= 3 && HARDWARE_INTERFACE_VERSION_MINOR >= 5 const std::string pluginName = controlHardware[i].hardware_plugin_name; auto webotsSystem = std::unique_ptr(mHardwareLoader->createUnmanagedInstance(pluginName)); @@ -93,7 +93,7 @@ namespace webots_ros2_control { // Configure and activate all components // Necessary hotfix for deprecation of component activation present in "hardware_interface" package for versions above 3.15 // (#793) -#if HARDWARE_INTERFACE_VERSION_MAJOR >= 3 && HARDWARE_INTERFACE_VERSION_MINOR >= 15 +#if HARDWARE_INTERFACE_VERSION_MAJOR >= 4 || HARDWARE_INTERFACE_VERSION_MAJOR >= 3 && HARDWARE_INTERFACE_VERSION_MINOR >= 15 using lifecycle_msgs::msg::State; rclcpp_lifecycle::State active_state(State::PRIMARY_STATE_ACTIVE, hardware_interface::lifecycle_state_names::ACTIVE); resourceManager->set_component_state(controlHardware[i].name, active_state);