Merge pull request #219 from bit-bots/use_upstream_events_executor_build

Use rclcpp events executor
bit-bots · May 4, 2023 · 1ebb955 · 1ebb955
2 parents de1f0a5 + 89c067e
commit 1ebb955
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/bitbots_extrinsic_calibration/CMakeLists.txt b/bitbots_extrinsic_calibration/CMakeLists.txt
@@ -16,7 +16,6 @@ find_package(bitbots_docs REQUIRED)
 find_package(tf2 REQUIRED)
 find_package(rot_conv REQUIRED)
 find_package(backward_ros REQUIRED)
-find_package(irobot_events_executor REQUIRED)
 
 include_directories(include)
 
@@ -33,7 +32,6 @@ ament_target_dependencies(extrinsic_calibration
   tf2_geometry_msgs
   tf2_ros
   rot_conv
-  irobot_events_executor
 )
 
 enable_bitbots_docs()

diff --git a/bitbots_extrinsic_calibration/include/extrinsic_calibration/extrinsic_calibration.h b/bitbots_extrinsic_calibration/include/extrinsic_calibration/extrinsic_calibration.h
@@ -5,7 +5,7 @@
 #include <tf2_ros/buffer.h>
 #include <tf2/utils.h>
 #include <rot_conv/rot_conv.h>
-#include <rclcpp/executors/events_executor/events_executor.hpp>
+#include <rclcpp/experimental/executors/events_executor/events_executor.hpp>
 
 #include <utility>
 using std::placeholders::_1;

diff --git a/bitbots_extrinsic_calibration/package.xml b/bitbots_extrinsic_calibration/package.xml
@@ -19,7 +19,6 @@
     <depend>tf2_ros</depend>
     <depend>rot_conv</depend>
     <depend>backward_ros</depend>
-    <depend>irobot_events_executor</depend>
 
     <export>
         <bitbots_documentation>

diff --git a/bitbots_extrinsic_calibration/src/extrinsic_calibration.cpp b/bitbots_extrinsic_calibration/src/extrinsic_calibration.cpp
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
   rclcpp::TimerBase::SharedPtr timer = rclcpp::create_timer(
     node, node->get_clock(), rclcpp::Duration(0, 1e7), [node]() -> void {node->step();});
 
-  rclcpp::executors::EventsExecutor exec;
+  rclcpp::experimental::executors::EventsExecutor exec;
   exec.add_node(node);
   exec.spin();
   rclcpp::shutdown();