diff --git a/patch/ros-humble-webots-ros2-control.patch b/patch/ros-humble-webots-ros2-control.patch index c974a1db..3a658601 100644 --- a/patch/ros-humble-webots-ros2-control.patch +++ b/patch/ros-humble-webots-ros2-control.patch @@ -7,7 +7,7 @@ index fca501e86..fa414b150 100644 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 TRUE ++#if 1 const std::string pluginName = controlHardware[i].hardware_plugin_name; auto webotsSystem = std::unique_ptr(mHardwareLoader->createUnmanagedInstance(pluginName)); @@ -16,7 +16,7 @@ index fca501e86..fa414b150 100644 // 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 TRUE ++#if 1 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);