From d3a12db82241cf1b0d12fd927bc17412729481a0 Mon Sep 17 00:00:00 2001
From: 1222-takeshi <m.takeshi1995@gmail.com>
Date: Tue, 7 May 2024 13:59:07 +0900
Subject: [PATCH] chore: rename aip_x1_1 to aip_x1

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>
---
 aip_x1_description/CMakeLists.txt                         | 2 +-
 aip_x1_description/package.xml                            | 6 +++---
 aip_x1_description/urdf/sensor_kit.xacro                  | 2 +-
 aip_x1_description/urdf/sensors.xacro                     | 4 ++--
 aip_x1_launch/CMakeLists.txt                              | 2 +-
 .../ground_segmentation/ground_segmentation.launch.py     | 4 ++--
 aip_x1_launch/launch/imu.launch.xml                       | 2 +-
 aip_x1_launch/launch/lidar.launch.xml                     | 6 +++---
 aip_x1_launch/launch/sensing.launch.xml                   | 8 ++++----
 aip_x1_launch/launch/velodyne_VLP16.launch.xml            | 2 +-
 aip_x1_launch/package.xml                                 | 6 +++---
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/aip_x1_description/CMakeLists.txt b/aip_x1_description/CMakeLists.txt
index 9e5669bf..56f4d802 100644
--- a/aip_x1_description/CMakeLists.txt
+++ b/aip_x1_description/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(aip_x1_1_description)
+project(aip_x1_description)
 
 find_package(ament_cmake_auto REQUIRED)
 
diff --git a/aip_x1_description/package.xml b/aip_x1_description/package.xml
index 382b29e2..f860fc5e 100644
--- a/aip_x1_description/package.xml
+++ b/aip_x1_description/package.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <package format="2">
-  <name>aip_x1_1_description</name>
+  <name>aip_x1_description</name>
   <version>0.1.0</version>
-  <description>The aip_x1_1_description package</description>
+  <description>The aip_x1_description package</description>
 
-  <maintainer email="yohei.mishina@tier4.jp">Yohei Mishina</maintainer>
+  <maintainer email="takeshi.miura@tier4.jp">Takeshi Miura</maintainer>
   <license>Apache 2</license>
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
diff --git a/aip_x1_description/urdf/sensor_kit.xacro b/aip_x1_description/urdf/sensor_kit.xacro
index 7629d304..df95f2fc 100644
--- a/aip_x1_description/urdf/sensor_kit.xacro
+++ b/aip_x1_description/urdf/sensor_kit.xacro
@@ -5,7 +5,7 @@
     <xacro:include filename="$(find imu_description)/urdf/imu.xacro"/>
 
     <xacro:arg name="gpu" default="false"/>
-    <xacro:arg name="config_dir" default="$(find aip_x1_1_description)/config"/>
+    <xacro:arg name="config_dir" default="$(find aip_x1_description)/config"/>
     <xacro:property name="sensor_kit_base_link" default="sensor_kit_base_link"/>
 
     <joint name="${sensor_kit_base_link}_joint" type="fixed">
diff --git a/aip_x1_description/urdf/sensors.xacro b/aip_x1_description/urdf/sensors.xacro
index 6690fb8f..56f048b4 100644
--- a/aip_x1_description/urdf/sensors.xacro
+++ b/aip_x1_description/urdf/sensors.xacro
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <robot name="vehicle" xmlns:xacro="http://ros.org/wiki/xacro">
 
-  <xacro:arg name="config_dir" default="$(find aip_x1_1_description)/config"/>
-  <xacro:include filename="$(find aip_x1_1_description)/urdf/sensor_kit.xacro"/>
+  <xacro:arg name="config_dir" default="$(find aip_x1_description)/config"/>
+  <xacro:include filename="$(find aip_x1_description)/urdf/sensor_kit.xacro"/>
   <xacro:property name="calibration" value="${load_yaml('$(arg config_dir)/sensors_calibration.yaml')}"/>
 
   <!-- sensor kit -->
diff --git a/aip_x1_launch/CMakeLists.txt b/aip_x1_launch/CMakeLists.txt
index 707bd8ce..c384a1a6 100644
--- a/aip_x1_launch/CMakeLists.txt
+++ b/aip_x1_launch/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(aip_x1_1_launch)
+project(aip_x1_launch)
 
 find_package(ament_cmake_auto REQUIRED)
 ament_auto_find_build_dependencies()
diff --git a/aip_x1_launch/launch/ground_segmentation/ground_segmentation.launch.py b/aip_x1_launch/launch/ground_segmentation/ground_segmentation.launch.py
index 8cc51174..31d985f5 100644
--- a/aip_x1_launch/launch/ground_segmentation/ground_segmentation.launch.py
+++ b/aip_x1_launch/launch/ground_segmentation/ground_segmentation.launch.py
@@ -34,7 +34,7 @@ def __init__(self, context):
         self.context = context
         self.vehicle_info = self.get_vehicle_info()
         ground_segmentation_param_path = os.path.join(
-            get_package_share_directory("aip_x1_1_launch"),
+            get_package_share_directory("aip_x1_launch"),
             "config/ground_segmentation/ground_segmentation.param.yaml",
         )
         with open(ground_segmentation_param_path, "r") as f:
@@ -369,7 +369,7 @@ def create_single_frame_outlier_filter_components(input_topic, output_topic):
                         "inpaint_radius": 1.0,
                         "param_file_path": PathJoinSubstitution(
                             [
-                                FindPackageShare("aip_x1_1_launch"),
+                                FindPackageShare("aip_x1_launch"),
                                 "config",
                                 "ground_segmentation",
                                 "elevation_map_parameters.yaml",
diff --git a/aip_x1_launch/launch/imu.launch.xml b/aip_x1_launch/launch/imu.launch.xml
index 2008eda8..e9d035f3 100644
--- a/aip_x1_launch/launch/imu.launch.xml
+++ b/aip_x1_launch/launch/imu.launch.xml
@@ -21,7 +21,7 @@
     </group>
 
     <arg name="imu_raw_name" default="tamagawa/imu_raw"/>
-    <arg name="imu_corrector_param_file" default="$(find-pkg-share individual_params)/config/$(var vehicle_id)/aip_x1_1/imu_corrector.param.yaml"/>
+    <arg name="imu_corrector_param_file" default="$(find-pkg-share individual_params)/config/$(var vehicle_id)/aip_x1/imu_corrector.param.yaml"/>
     <include file="$(find-pkg-share imu_corrector)/launch/imu_corrector.launch.xml">
       <arg name="input_topic" value="$(var imu_raw_name)"/>
       <arg name="output_topic" value="imu_data" />
diff --git a/aip_x1_launch/launch/lidar.launch.xml b/aip_x1_launch/launch/lidar.launch.xml
index 72e0c41d..348f1cba 100644
--- a/aip_x1_launch/launch/lidar.launch.xml
+++ b/aip_x1_launch/launch/lidar.launch.xml
@@ -38,19 +38,19 @@
         <arg name="min_range" value="0.05"/>
         <arg name="max_range" value="200.0"/>
         <arg name="return_mode" value="Strongest" />
-        <arg name="config_file" value="$(find-pkg-share individual_params)/config/$(var vehicle_id)/aip_x1_1/xt32.csv" />
+        <arg name="config_file" value="$(find-pkg-share individual_params)/config/$(var vehicle_id)/aip_x1/xt32.csv" />
         <arg name="launch_driver" value="$(var launch_driver)" />
         <arg name="vehicle_mirror_param_file" value="$(var vehicle_mirror_param_file)" />
       </include>
     </group>
 
-    <include file="$(find-pkg-share aip_x1_1_launch)/launch/pointcloud_preprocessor.launch.py">
+    <include file="$(find-pkg-share aip_x1_launch)/launch/pointcloud_preprocessor.launch.py">
       <arg name="base_frame" value="base_link" />
       <arg name="use_intra_process" value="true" />
       <arg name="use_multithread" value="false" />
       <arg name="container_name" value="$(var pointcloud_container_name)"/>
     </include>
 
-    <include file="$(find-pkg-share aip_x1_1_launch)/launch/topic_state_monitor.launch.py"/>
+    <include file="$(find-pkg-share aip_x1_launch)/launch/topic_state_monitor.launch.py"/>
   </group>
 </launch>
diff --git a/aip_x1_launch/launch/sensing.launch.xml b/aip_x1_launch/launch/sensing.launch.xml
index 1419d429..0f23a733 100644
--- a/aip_x1_launch/launch/sensing.launch.xml
+++ b/aip_x1_launch/launch/sensing.launch.xml
@@ -8,7 +8,7 @@
 
   <group>
     <!-- LiDAR Driver -->
-    <include file="$(find-pkg-share aip_x1_1_launch)/launch/lidar.launch.xml">
+    <include file="$(find-pkg-share aip_x1_launch)/launch/lidar.launch.xml">
       <arg name="launch_driver" value="$(var launch_driver)" />
       <arg name="vehicle_mirror_param_file" value="$(var vehicle_mirror_param_file)" />
       <arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
@@ -16,12 +16,12 @@
     </include>
 
     <!-- IMU Driver -->
-    <include file="$(find-pkg-share aip_x1_1_launch)/launch/imu.launch.xml">
+    <include file="$(find-pkg-share aip_x1_launch)/launch/imu.launch.xml">
       <arg name="launch_driver" value="$(var launch_driver)" />
     </include>
 
     <!-- GNSS Driver -->
-    <include file="$(find-pkg-share aip_x1_1_launch)/launch/gnss.launch.xml" unless="$(var use_awsim)">
+    <include file="$(find-pkg-share aip_x1_launch)/launch/gnss.launch.xml" unless="$(var use_awsim)">
       <arg name="launch_driver" value="$(var launch_driver)" />
     </include>
 
@@ -29,7 +29,7 @@
     <include file="$(find-pkg-share 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_1/vehicle_velocity_converter.param.yaml" />
+      <arg name="config_file" value="$(find-pkg-share individual_params)/config/$(var vehicle_id)/aip_x1/vehicle_velocity_converter.param.yaml" />
     </include>
   </group>
 
diff --git a/aip_x1_launch/launch/velodyne_VLP16.launch.xml b/aip_x1_launch/launch/velodyne_VLP16.launch.xml
index 8ad01878..3156db29 100644
--- a/aip_x1_launch/launch/velodyne_VLP16.launch.xml
+++ b/aip_x1_launch/launch/velodyne_VLP16.launch.xml
@@ -16,7 +16,7 @@
   <arg name="view_width" default="6.28" />
   <arg name="vehicle_mirror_param_file" />
 
-  <include file="$(find-pkg-share aip_x1_1_launch)/launch/velodyne_node_container.launch.py">
+  <include file="$(find-pkg-share aip_x1_launch)/launch/velodyne_node_container.launch.py">
     <arg name="launch_driver" value="$(var launch_driver)"/>
     <arg name="model" value="$(var model)"/>
     <arg name="calibration" value="$(var calibration)"/>
diff --git a/aip_x1_launch/package.xml b/aip_x1_launch/package.xml
index f20fb08e..ae587883 100644
--- a/aip_x1_launch/package.xml
+++ b/aip_x1_launch/package.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>aip_x1_1_launch</name>
+  <name>aip_x1_launch</name>
   <version>0.1.0</version>
-  <description>The aip_x1_1_launch package</description>
+  <description>The aip_x1_launch package</description>
 
-  <maintainer email="yohei.mishina@tier4.jp">Yohei Mishina</maintainer>
+  <maintainer email="takeshi.miura@tier4.jp">Takeshi Miura</maintainer>
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>