From db9be3c8bc4d76f04575ad217aec9362f7ec037c Mon Sep 17 00:00:00 2001
From: a-maumau <maumaumaumaumaumaumaumaumaumau@gmail.com>
Date: Thu, 26 Sep 2024 18:06:46 +0900
Subject: [PATCH 1/2] add autoware prefix

Signed-off-by: a-maumau <maumaumaumaumaumaumaumaumaumau@gmail.com>
---
 aip_x1_launch/launch/sensing.launch.xml       | 2 +-
 aip_x1_launch/package.xml                     | 2 +-
 aip_x2_launch/launch/sensing.launch.xml       | 2 +-
 aip_x2_launch/package.xml                     | 2 +-
 aip_xx1_gen2_launch/launch/sensing.launch.xml | 2 +-
 aip_xx1_gen2_launch/package.xml               | 2 +-
 aip_xx1_launch/launch/sensing.launch.xml      | 2 +-
 aip_xx1_launch/package.xml                    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aip_x1_launch/launch/sensing.launch.xml b/aip_x1_launch/launch/sensing.launch.xml
index 1c294fdf..81f599fc 100644
--- a/aip_x1_launch/launch/sensing.launch.xml
+++ b/aip_x1_launch/launch/sensing.launch.xml
@@ -30,7 +30,7 @@
     </include>
 
     <!-- Vehicle twist -->
-    <include file="$(find-pkg-share vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
+    <include file="$(find-pkg-share autoware_vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
       <arg name="input_vehicle_velocity_topic" value="/vehicle/status/velocity_status"/>
       <arg name="output_twist_with_covariance" value="/sensing/vehicle_velocity_converter/twist_with_covariance"/>
       <arg name="config_file" value="$(find-pkg-share individual_params)/config/$(var vehicle_id)/aip_x1/vehicle_velocity_converter.param.yaml" />
diff --git a/aip_x1_launch/package.xml b/aip_x1_launch/package.xml
index 84e7ee19..195b1020 100644
--- a/aip_x1_launch/package.xml
+++ b/aip_x1_launch/package.xml
@@ -13,11 +13,11 @@
   <exec_depend>autoware_gnss_poser</exec_depend>
   <exec_depend>autoware_imu_corrector</exec_depend>
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
+  <exec_depend>autoware_vehicle_velocity_converter</exec_depend>
   <exec_depend>tamagawa_imu_driver</exec_depend>
   <exec_depend>topic_tools</exec_depend>
   <exec_depend>ublox_gps</exec_depend>
   <exec_depend>usb_cam</exec_depend>
-  <exec_depend>vehicle_velocity_converter</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>
diff --git a/aip_x2_launch/launch/sensing.launch.xml b/aip_x2_launch/launch/sensing.launch.xml
index 274f6334..e3a49057 100644
--- a/aip_x2_launch/launch/sensing.launch.xml
+++ b/aip_x2_launch/launch/sensing.launch.xml
@@ -30,7 +30,7 @@
     </include>
 
     <!-- Vehicle twist -->
-    <include file="$(find-pkg-share vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
+    <include file="$(find-pkg-share autoware_vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
       <arg name="input_vehicle_velocity_topic" value="/vehicle/status/velocity_status"/>
       <arg name="output_twist_with_covariance" value="/sensing/vehicle_velocity_converter/twist_with_covariance"/>
       <arg name="config_file" value="$(find-pkg-share individual_params)/config/$(var vehicle_id)/aip_x2/vehicle_velocity_converter.param.yaml" />
diff --git a/aip_x2_launch/package.xml b/aip_x2_launch/package.xml
index 1bcc5b50..a765544e 100644
--- a/aip_x2_launch/package.xml
+++ b/aip_x2_launch/package.xml
@@ -14,6 +14,7 @@
   <exec_depend>autoware_imu_corrector</exec_depend>
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
   <exec_depend>autoware_simple_object_merger</exec_depend>
+  <exec_depend>autoware_vehicle_velocity_converter</exec_depend>
   <exec_depend>common_sensor_launch</exec_depend>
   <exec_depend>dummy_diag_publisher</exec_depend>
   <exec_depend>septentrio_gnss_driver</exec_depend>
@@ -21,7 +22,6 @@
   <exec_depend>topic_tools</exec_depend>
   <exec_depend>ublox_gps</exec_depend>
   <exec_depend>usb_cam</exec_depend>
-  <exec_depend>vehicle_velocity_converter</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>
diff --git a/aip_xx1_gen2_launch/launch/sensing.launch.xml b/aip_xx1_gen2_launch/launch/sensing.launch.xml
index 74f24c15..5c18089b 100644
--- a/aip_xx1_gen2_launch/launch/sensing.launch.xml
+++ b/aip_xx1_gen2_launch/launch/sensing.launch.xml
@@ -36,7 +36,7 @@
     </include>
 
     <!-- Vehicle twist -->
-    <include file="$(find-pkg-share vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
+    <include file="$(find-pkg-share autoware_vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
       <arg name="input_vehicle_velocity_topic" value="/vehicle/status/velocity_status"/>
       <arg name="output_twist_with_covariance" value="/sensing/vehicle_velocity_converter/twist_with_covariance"/>
       <arg name="config_file" value="$(find-pkg-share individual_params)/config/$(var vehicle_id)/aip_xx1/vehicle_velocity_converter.param.yaml" />
diff --git a/aip_xx1_gen2_launch/package.xml b/aip_xx1_gen2_launch/package.xml
index b37d8f0b..d3ee074a 100644
--- a/aip_xx1_gen2_launch/package.xml
+++ b/aip_xx1_gen2_launch/package.xml
@@ -15,6 +15,7 @@
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
   <exec_depend>autoware_radar_tracks_msgs_converter</exec_depend>
   <exec_depend>autoware_simple_object_merger</exec_depend>
+  <exec_depend>autoware_vehicle_velocity_converter</exec_depend>
   <exec_depend>common_sensor_launch</exec_depend>
   <exec_depend>glog_component</exec_depend>
   <exec_depend>pacmod3</exec_depend>
@@ -23,7 +24,6 @@
   <exec_depend>topic_tools</exec_depend>
   <exec_depend>ublox_gps</exec_depend>
   <exec_depend>usb_cam</exec_depend>
-  <exec_depend>vehicle_velocity_converter</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>
diff --git a/aip_xx1_launch/launch/sensing.launch.xml b/aip_xx1_launch/launch/sensing.launch.xml
index 2128f30a..c2e659a0 100644
--- a/aip_xx1_launch/launch/sensing.launch.xml
+++ b/aip_xx1_launch/launch/sensing.launch.xml
@@ -36,7 +36,7 @@
     </include>
 
     <!-- Vehicle twist -->
-    <include file="$(find-pkg-share vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
+    <include file="$(find-pkg-share autoware_vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
       <arg name="input_vehicle_velocity_topic" value="/vehicle/status/velocity_status"/>
       <arg name="output_twist_with_covariance" value="/sensing/vehicle_velocity_converter/twist_with_covariance"/>
       <arg name="config_file" value="$(find-pkg-share individual_params)/config/$(var vehicle_id)/aip_xx1/vehicle_velocity_converter.param.yaml" />
diff --git a/aip_xx1_launch/package.xml b/aip_xx1_launch/package.xml
index 0b5b5be9..c22dfa01 100644
--- a/aip_xx1_launch/package.xml
+++ b/aip_xx1_launch/package.xml
@@ -13,6 +13,7 @@
   <exec_depend>autoware_gnss_poser</exec_depend>
   <exec_depend>autoware_imu_corrector</exec_depend>
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
+  <exec_depend>autoware_vehicle_velocity_converter</exec_depend>
   <exec_depend>common_sensor_launch</exec_depend>
   <exec_depend>glog_component</exec_depend>
   <exec_depend>pacmod3</exec_depend>
@@ -21,7 +22,6 @@
   <exec_depend>topic_tools</exec_depend>
   <exec_depend>ublox_gps</exec_depend>
   <exec_depend>usb_cam</exec_depend>
-  <exec_depend>vehicle_velocity_converter</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>

From 7da67dc3c2ac0f7a204b74d2340aea19da203407 Mon Sep 17 00:00:00 2001
From: Masaki Baba <maumaumaumaumaumaumaumaumaumau@gmail.com>
Date: Fri, 15 Nov 2024 10:08:38 +0900
Subject: [PATCH 2/2] fix package.xml

---
 aip_x1_launch/package.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/aip_x1_launch/package.xml b/aip_x1_launch/package.xml
index cb5aaa98..83d15cbe 100644
--- a/aip_x1_launch/package.xml
+++ b/aip_x1_launch/package.xml
@@ -19,13 +19,11 @@
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
   <exec_depend>autoware_vehicle_velocity_converter</exec_depend>
   <exec_depend>common_sensor_launch</exec_depend>
-  <exec_depend>glog_component</exec_depend>
-  <exec_depend>pacmod3</exec_depend>
+  <exec_depend>individual_params</exec_depend>
+  <exec_depend>rclcpp_components</exec_depend>
   <exec_depend>ros2_socketcan</exec_depend>
   <exec_depend>tamagawa_imu_driver</exec_depend>
-  <exec_depend>topic_tools</exec_depend>
-  <exec_depend>ublox_gps</exec_depend>
-  <exec_depend>usb_cam</exec_depend>
+  <exec_depend>topic_state_monitor</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>