Skip to content

Commit 88e842c

Browse files
authored
Fix deprecated header includes (#216)
1 parent ab49aa4 commit 88e842c

8 files changed

Lines changed: 24 additions & 24 deletions

File tree

imu_complementary_filter/include/imu_complementary_filter/complementary_filter_ros.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636

3737
#include <sensor_msgs/msg/magnetic_field.hpp>
3838
#include <geometry_msgs/msg/vector3_stamped.hpp>
39-
#include <message_filters/subscriber.h>
40-
#include <message_filters/sync_policies/approximate_time.h>
41-
#include <message_filters/synchronizer.h>
39+
#include <message_filters/subscriber.hpp>
40+
#include <message_filters/sync_policies/approximate_time.hpp>
41+
#include <message_filters/synchronizer.hpp>
4242
#include <rclcpp/rclcpp.hpp>
4343
#include <sensor_msgs/msg/imu.hpp>
4444
#include <std_msgs/msg/bool.hpp>
45-
#include <tf2/transform_datatypes.h>
46-
#include <tf2/LinearMath/Quaternion.h>
45+
#include <tf2/transform_datatypes.hpp>
46+
#include <tf2/LinearMath/Quaternion.hpp>
4747
#include <tf2_ros/transform_broadcaster.h>
4848
#include <memory>
4949

imu_complementary_filter/src/complementary_filter_ros.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434
#include "imu_complementary_filter/complementary_filter_ros.h"
3535

36-
#include <geometry_msgs/msg/transform_stamped.h>
37-
#include <tf2/convert.h>
38-
#include <tf2/LinearMath/Matrix3x3.h>
39-
#include <tf2/LinearMath/Transform.h>
40-
#include <tf2/LinearMath/Vector3.h>
36+
#include <geometry_msgs/msg/transform_stamped.hpp>
37+
#include <tf2/convert.hpp>
38+
#include <tf2/LinearMath/Matrix3x3.hpp>
39+
#include <tf2/LinearMath/Transform.hpp>
40+
#include <tf2/LinearMath/Vector3.hpp>
4141

4242
namespace imu_tools {
4343

@@ -78,13 +78,13 @@ ComplementaryFilterROS::ComplementaryFilterROS()
7878
}};
7979

8080
imu_subscriber_.reset(new ImuSubscriber(this, "imu/data_raw",
81-
rmw_qos_profile_default, sub_opts));
81+
rclcpp::QoS(queue_size), sub_opts));
8282

8383
// Register magnetic data subscriber.
8484
if (use_mag_)
8585
{
8686
mag_subscriber_.reset(new MagSubscriber(
87-
this, "imu/mag", rmw_qos_profile_default, sub_opts));
87+
this, "imu/mag", rclcpp::QoS(queue_size), sub_opts));
8888

8989
sync_.reset(new Synchronizer(SyncPolicy(queue_size), *imu_subscriber_,
9090
*mag_subscriber_));

imu_filter_madgwick/include/imu_filter_madgwick/imu_filter_ros.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828

2929
#include "tf2_ros/transform_broadcaster.h"
3030
#include <geometry_msgs/msg/vector3_stamped.hpp>
31-
#include <message_filters/subscriber.h>
32-
#include <message_filters/sync_policies/approximate_time.h>
33-
#include <message_filters/synchronizer.h>
31+
#include <message_filters/subscriber.hpp>
32+
#include <message_filters/sync_policies/approximate_time.hpp>
33+
#include <message_filters/synchronizer.hpp>
3434
#include <sensor_msgs/msg/imu.hpp>
3535
#include <sensor_msgs/msg/magnetic_field.hpp>
36-
#include <tf2/LinearMath/Quaternion.h>
36+
#include <tf2/LinearMath/Quaternion.hpp>
3737

3838
#include "imu_filter_madgwick/imu_filter.h"
3939
#include "imu_filter_madgwick/base_node.hpp"

imu_filter_madgwick/src/imu_filter_ros.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "imu_filter_madgwick/stateless_orientation.h"
2828
#include "rclcpp/rclcpp.hpp"
2929
#include "std_msgs/msg/string.hpp"
30-
#include <tf2/LinearMath/Matrix3x3.h>
31-
#include <tf2/LinearMath/Quaternion.h>
30+
#include <tf2/LinearMath/Matrix3x3.hpp>
31+
#include <tf2/LinearMath/Quaternion.hpp>
3232

3333
using namespace std::chrono_literals;
3434
using namespace rclcpp;
@@ -200,7 +200,7 @@ ImuFilterMadgwickRos::ImuFilterMadgwickRos(const rclcpp::NodeOptions &options)
200200
// Synchronize inputs. Topic subscriptions happen on demand in the
201201
// connection callback.
202202
const int queue_size = 5;
203-
rmw_qos_profile_t qos = rmw_qos_profile_sensor_data;
203+
auto qos = rclcpp::QoS(rclcpp::SensorDataQoS());
204204
imu_subscriber_.reset(new ImuSubscriber(this, "imu/data_raw", qos));
205205

206206
if (use_mag_)

imu_filter_madgwick/src/stateless_orientation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424

2525
#include "imu_filter_madgwick/stateless_orientation.h"
26-
#include <tf2/LinearMath/Matrix3x3.h>
27-
#include <tf2/convert.h>
26+
#include <tf2/LinearMath/Matrix3x3.hpp>
27+
#include <tf2/convert.hpp>
2828
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
2929

3030
template <typename T>

imu_filter_madgwick/test/test_helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#define TEST_TEST_HELPERS_H_
44

55
#include <gtest/gtest.h>
6-
#include <tf2/LinearMath/Quaternion.h>
6+
#include <tf2/LinearMath/Quaternion.hpp>
77

88
#define MAX_DIFF 0.05
99

rviz_imu_plugin/src/imu_display.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef RVIZ_IMU_PLUGIN_IMU_DISPLAY_H
3232
#define RVIZ_IMU_PLUGIN_IMU_DISPLAY_H
3333

34-
#include <message_filters/subscriber.h>
34+
#include <message_filters/subscriber.hpp>
3535
#include <tf2_ros/message_filter.h>
3636
#include <sensor_msgs/msg/imu.hpp>
3737
#include <rviz_common/display.hpp>

rviz_imu_plugin/src/mag_display.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef RVIZ_IMU_PLUGIN_MAG_DISPLAY_H
3232
#define RVIZ_IMU_PLUGIN_MAG_DISPLAY_H
3333

34-
#include <message_filters/subscriber.h>
34+
#include <message_filters/subscriber.hpp>
3535
#include <tf2_ros/message_filter.h>
3636
#include <sensor_msgs/msg/magnetic_field.hpp>
3737
#include <rviz_common/display.hpp>

0 commit comments

Comments
 (0)