Skip to content

Commit

Permalink
Update ros-humble-webots-ros2-control.patch
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias-Fischer committed Feb 3, 2024
1 parent d25a6b3 commit 931d5ad
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions patch/ros-humble-webots-ros2-control.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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<webots_ros2_control::Ros2ControlSystemInterface>(mHardwareLoader->createUnmanagedInstance(pluginName));
Expand All @@ -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);

0 comments on commit 931d5ad

Please sign in to comment.