Skip to content

Commit

Permalink
switch nao_lola_conversion to use nao_lola_sensor_msgs
Browse files Browse the repository at this point in the history
Signed-off-by: ijnek <kenjibrameld@gmail.com>
  • Loading branch information
ijnek committed Aug 3, 2023
1 parent 0d5adac commit dfa28ba
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions nao_lola_conversion/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -34,20 +34,20 @@ class NaoLolaConversion : public rclcpp::Node

private:
// Subscriptions
message_filters::Subscriber<nao_sensor_msgs::msg::Accelerometer> accelerometer_sub_;
message_filters::Subscriber<nao_sensor_msgs::msg::Gyroscope> gyroscope_sub_;
message_filters::Subscriber<nao_lola_sensor_msgs::msg::Accelerometer> accelerometer_sub_;
message_filters::Subscriber<nao_lola_sensor_msgs::msg::Gyroscope> gyroscope_sub_;

// Publishers
rclcpp::Publisher<sensor_msgs::msg::Imu>::SharedPtr imu_pub_;

// Synchronizer
std::shared_ptr<message_filters::TimeSynchronizer<nao_sensor_msgs::msg::Accelerometer,
nao_sensor_msgs::msg::Gyroscope>> synchronizer_;
std::shared_ptr<message_filters::TimeSynchronizer<nao_lola_sensor_msgs::msg::Accelerometer,
nao_lola_sensor_msgs::msg::Gyroscope>> 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
Expand Down
2 changes: 1 addition & 1 deletion nao_lola_conversion/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<buildtool_depend>ament_cmake</buildtool_depend>

<depend>message_filters</depend>
<depend>nao_sensor_msgs</depend>
<depend>nao_lola_sensor_msgs</depend>
<depend>rclcpp</depend>
<depend>rclcpp_components</depend>
<depend>sensor_msgs</depend>
Expand Down
4 changes: 2 additions & 2 deletions nao_lola_conversion/src/nao_lola_conversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit dfa28ba

Please sign in to comment.