From 05a75b393bfc717e3561f9194158b5cf8b793e59 Mon Sep 17 00:00:00 2001 From: Ryohsuke Mitsudome Date: Fri, 24 Jan 2025 14:29:31 +0900 Subject: [PATCH 1/3] feat: add autoware_ prefix to topic_state_monitor package Signed-off-by: Ryohsuke Mitsudome --- aip_x1_launch/package.xml | 2 +- .../launch/topic_state_monitor.launch.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aip_x1_launch/package.xml b/aip_x1_launch/package.xml index 83d15cbe..fd4803a0 100644 --- a/aip_x1_launch/package.xml +++ b/aip_x1_launch/package.xml @@ -17,13 +17,13 @@ autoware_imu_corrector autoware_occupancy_grid_map_outlier_filter autoware_pointcloud_preprocessor + autoware_topic_state_monitor autoware_vehicle_velocity_converter common_sensor_launch individual_params rclcpp_components ros2_socketcan tamagawa_imu_driver - topic_state_monitor ament_lint_auto autoware_lint_common diff --git a/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py b/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py index 0eafa9e0..276068d1 100644 --- a/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py +++ b/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py @@ -20,7 +20,7 @@ def generate_launch_description(): # GNSS topic monitor gnss_topic_monitor = ComposableNode( - package="topic_state_monitor", + package="autoware_topic_state_monitor", plugin="topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_gnss_pose", parameters=[ @@ -40,7 +40,7 @@ def generate_launch_description(): # IMU topic monitor imu_topic_monitor = ComposableNode( - package="topic_state_monitor", + package="autoware_topic_state_monitor", plugin="topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_imu_data", parameters=[ @@ -60,7 +60,7 @@ def generate_launch_description(): # Radar topic monitors radar_front_center_monitor = ComposableNode( - package="topic_state_monitor", + package="autoware_topic_state_monitor", plugin="topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_front_center", parameters=[ @@ -79,7 +79,7 @@ def generate_launch_description(): ) radar_front_left_monitor = ComposableNode( - package="topic_state_monitor", + package="autoware_topic_state_monitor", plugin="topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_front_left", parameters=[ @@ -98,7 +98,7 @@ def generate_launch_description(): ) radar_front_right_monitor = ComposableNode( - package="topic_state_monitor", + package="autoware_topic_state_monitor", plugin="topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_front_right", parameters=[ @@ -117,7 +117,7 @@ def generate_launch_description(): ) radar_rear_center_monitor = ComposableNode( - package="topic_state_monitor", + package="autoware_topic_state_monitor", plugin="topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_rear_center", parameters=[ @@ -136,7 +136,7 @@ def generate_launch_description(): ) radar_rear_left_monitor = ComposableNode( - package="topic_state_monitor", + package="autoware_topic_state_monitor", plugin="topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_rear_left", parameters=[ @@ -155,7 +155,7 @@ def generate_launch_description(): ) radar_rear_right_monitor = ComposableNode( - package="topic_state_monitor", + package="autoware_topic_state_monitor", plugin="topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_rear_right", parameters=[ From d74f504294d1fb6f3170584ba624bb363fbfaed4 Mon Sep 17 00:00:00 2001 From: mitsudome-r Date: Mon, 27 Jan 2025 12:24:36 +0900 Subject: [PATCH 2/3] fix: add autoware namespace to plugin Signed-off-by: mitsudome-r --- .../launch/topic_state_monitor.launch.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py b/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py index 276068d1..994949b8 100644 --- a/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py +++ b/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py @@ -21,7 +21,7 @@ def generate_launch_description(): # GNSS topic monitor gnss_topic_monitor = ComposableNode( package="autoware_topic_state_monitor", - plugin="topic_state_monitor::TopicStateMonitorNode", + plugin="autoware::topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_gnss_pose", parameters=[ { @@ -41,7 +41,7 @@ def generate_launch_description(): # IMU topic monitor imu_topic_monitor = ComposableNode( package="autoware_topic_state_monitor", - plugin="topic_state_monitor::TopicStateMonitorNode", + plugin="autoware::topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_imu_data", parameters=[ { @@ -61,7 +61,7 @@ def generate_launch_description(): # Radar topic monitors radar_front_center_monitor = ComposableNode( package="autoware_topic_state_monitor", - plugin="topic_state_monitor::TopicStateMonitorNode", + plugin="autoware::topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_front_center", parameters=[ { @@ -80,7 +80,7 @@ def generate_launch_description(): radar_front_left_monitor = ComposableNode( package="autoware_topic_state_monitor", - plugin="topic_state_monitor::TopicStateMonitorNode", + plugin="autoware::topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_front_left", parameters=[ { @@ -99,7 +99,7 @@ def generate_launch_description(): radar_front_right_monitor = ComposableNode( package="autoware_topic_state_monitor", - plugin="topic_state_monitor::TopicStateMonitorNode", + plugin="autoware::topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_front_right", parameters=[ { @@ -118,7 +118,7 @@ def generate_launch_description(): radar_rear_center_monitor = ComposableNode( package="autoware_topic_state_monitor", - plugin="topic_state_monitor::TopicStateMonitorNode", + plugin="autoware::topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_rear_center", parameters=[ { @@ -137,7 +137,7 @@ def generate_launch_description(): radar_rear_left_monitor = ComposableNode( package="autoware_topic_state_monitor", - plugin="topic_state_monitor::TopicStateMonitorNode", + plugin="autoware::topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_rear_left", parameters=[ { @@ -156,7 +156,7 @@ def generate_launch_description(): radar_rear_right_monitor = ComposableNode( package="autoware_topic_state_monitor", - plugin="topic_state_monitor::TopicStateMonitorNode", + plugin="autoware::topic_state_monitor::TopicStateMonitorNode", name="topic_state_monitor_radar_rear_right", parameters=[ { From c54bd0f2a203059f415d7550124508b56a331aa8 Mon Sep 17 00:00:00 2001 From: mitsudome-r Date: Mon, 27 Jan 2025 12:24:54 +0900 Subject: [PATCH 3/3] fix: add autoware_topic_state_monitor to package dependency Signed-off-by: mitsudome-r --- aip_x2_gen2_launch/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/aip_x2_gen2_launch/package.xml b/aip_x2_gen2_launch/package.xml index c28cc25e..4f00d1d1 100644 --- a/aip_x2_gen2_launch/package.xml +++ b/aip_x2_gen2_launch/package.xml @@ -17,6 +17,7 @@ autoware_pointcloud_preprocessor autoware_radar_tracks_msgs_converter autoware_simple_object_merger + autoware_topic_state_monitor autoware_vehicle_velocity_converter common_sensor_launch septentrio_gnss_driver