From dfa28baaa920397aa40376f88c37107158c1793f Mon Sep 17 00:00:00 2001 From: ijnek Date: Thu, 3 Aug 2023 01:13:44 +0000 Subject: [PATCH] switch nao_lola_conversion to use nao_lola_sensor_msgs Signed-off-by: ijnek --- nao_lola_conversion/CMakeLists.txt | 4 ++-- .../nao_lola_conversion/nao_lola_conversion.hpp | 16 ++++++++-------- nao_lola_conversion/package.xml | 2 +- nao_lola_conversion/src/nao_lola_conversion.cpp | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nao_lola_conversion/CMakeLists.txt b/nao_lola_conversion/CMakeLists.txt index 1a22f52..39d4d69 100644 --- a/nao_lola_conversion/CMakeLists.txt +++ b/nao_lola_conversion/CMakeLists.txt @@ -8,7 +8,7 @@ endif() # Find dependencies find_package(ament_cmake REQUIRED) find_package(message_filters REQUIRED) -find_package(nao_sensor_msgs REQUIRED) +find_package(nao_lola_sensor_msgs REQUIRED) find_package(rclcpp REQUIRED) find_package(rclcpp_components REQUIRED) find_package(sensor_msgs REQUIRED) @@ -17,7 +17,7 @@ find_package(tf2_geometry_msgs REQUIRED) set(THIS_PACKAGE_INCLUDE_DEPENDS ament_cmake message_filters - nao_sensor_msgs + nao_lola_sensor_msgs rclcpp rclcpp_components sensor_msgs diff --git a/nao_lola_conversion/include/nao_lola_conversion/nao_lola_conversion.hpp b/nao_lola_conversion/include/nao_lola_conversion/nao_lola_conversion.hpp index ef207f0..dcc86b4 100644 --- a/nao_lola_conversion/include/nao_lola_conversion/nao_lola_conversion.hpp +++ b/nao_lola_conversion/include/nao_lola_conversion/nao_lola_conversion.hpp @@ -19,8 +19,8 @@ #include "message_filters/subscriber.h" #include "message_filters/time_synchronizer.h" -#include "nao_sensor_msgs/msg/accelerometer.hpp" -#include "nao_sensor_msgs/msg/gyroscope.hpp" +#include "nao_lola_sensor_msgs/msg/accelerometer.hpp" +#include "nao_lola_sensor_msgs/msg/gyroscope.hpp" #include "rclcpp/node.hpp" #include "sensor_msgs/msg/imu.hpp" @@ -34,20 +34,20 @@ class NaoLolaConversion : public rclcpp::Node private: // Subscriptions - message_filters::Subscriber accelerometer_sub_; - message_filters::Subscriber gyroscope_sub_; + message_filters::Subscriber accelerometer_sub_; + message_filters::Subscriber gyroscope_sub_; // Publishers rclcpp::Publisher::SharedPtr imu_pub_; // Synchronizer - std::shared_ptr> synchronizer_; + std::shared_ptr> synchronizer_; // Callbacks void synchronizerCallback( - const nao_sensor_msgs::msg::Accelerometer::SharedPtr & accelerometer, - const nao_sensor_msgs::msg::Gyroscope::SharedPtr & gyroscope); + const nao_lola_sensor_msgs::msg::Accelerometer::SharedPtr & accelerometer, + const nao_lola_sensor_msgs::msg::Gyroscope::SharedPtr & gyroscope); }; } // namespace nao_lola_conversion diff --git a/nao_lola_conversion/package.xml b/nao_lola_conversion/package.xml index 04802ad..ce27d4d 100644 --- a/nao_lola_conversion/package.xml +++ b/nao_lola_conversion/package.xml @@ -10,7 +10,7 @@ ament_cmake message_filters - nao_sensor_msgs + nao_lola_sensor_msgs rclcpp rclcpp_components sensor_msgs diff --git a/nao_lola_conversion/src/nao_lola_conversion.cpp b/nao_lola_conversion/src/nao_lola_conversion.cpp index a4ba81d..2b73c21 100644 --- a/nao_lola_conversion/src/nao_lola_conversion.cpp +++ b/nao_lola_conversion/src/nao_lola_conversion.cpp @@ -18,8 +18,8 @@ namespace nao_lola_conversion { -using nao_sensor_msgs::msg::Accelerometer; -using nao_sensor_msgs::msg::Gyroscope; +using nao_lola_sensor_msgs::msg::Accelerometer; +using nao_lola_sensor_msgs::msg::Gyroscope; using sensor_msgs::msg::Imu; NaoLolaConversion::NaoLolaConversion(const rclcpp::NodeOptions & options)