diff --git a/aip_xx1_gen2_description/CMakeLists.txt b/aip_xx1_gen2_description/CMakeLists.txt
index 00fbf1b7..782df039 100644
--- a/aip_xx1_gen2_description/CMakeLists.txt
+++ b/aip_xx1_gen2_description/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.5)
project(aip_xx1_gen2_description)
find_package(ament_cmake_auto REQUIRED)
+find_package(aip_urdf_compiler REQUIRED)
ament_auto_find_build_dependencies()
diff --git a/aip_xx1_gen2_description/config/sensor_kit_calibration.yaml b/aip_xx1_gen2_description/config/sensor_kit_calibration.yaml
index 88288533..a0d91928 100644
--- a/aip_xx1_gen2_description/config/sensor_kit_calibration.yaml
+++ b/aip_xx1_gen2_description/config/sensor_kit_calibration.yaml
@@ -6,6 +6,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 0.0 # Design Value
+ type: monocular_camera
camera1/camera_link:
x: 0.372 # Design Value
y: 0.045 # Design Value
@@ -13,6 +14,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 0.0 # Design Value
+ type: monocular_camera
camera2/camera_link:
x: 0.372 # Design Value
y: -0.045 # Design Value
@@ -20,6 +22,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 0.0 # Design Value
+ type: monocular_camera
camera3/camera_link:
x: 0.133 # Design Value
y: 0.498 # Design Value
@@ -27,6 +30,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 0.872665 # Design Value
+ type: monocular_camera
camera4/camera_link:
x: 0.133 # Design Value
y: -0.498 # Design Value
@@ -34,6 +38,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: -0.872665 # Design Value
+ type: monocular_camera
camera5/camera_link:
x: 0.095 # Design Value
y: 0.524 # Design Value
@@ -41,6 +46,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 1.0472 # Design Value
+ type: monocular_camera
camera6/camera_link:
x: 0.095 # Design Value
y: -0.524 # Design Value
@@ -48,6 +54,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: -1.0472 # Design Value
+ type: monocular_camera
camera7/camera_link:
x: -0.345 # Design Value
y: 0.244 # Design Value
@@ -55,6 +62,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 2.70526 # Design Value
+ type: monocular_camera
camera8/camera_link:
x: -0.345 # Design Value
y: -0.244 # Design Value
@@ -62,6 +70,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: -2.70526 # Design Value
+ type: monocular_camera
camera9/camera_link:
x: -0.362 # Design Value
y: 0.202 # Design Value
@@ -69,6 +78,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 2.79253 # Design Value
+ type: monocular_camera
camera10/camera_link:
x: -0.362 # Design Value
y: -0.202 # Design Value
@@ -76,6 +86,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: -2.79253 # Design Value
+ type: monocular_camera
hesai_top_base_link:
x: 0.0 # Design Value
y: 0.0 # Design Value
@@ -83,6 +94,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 4.36332298038 # Design Value
+ type: pandar_ot128
hesai_left_base_link:
x: 0.0 # Design Value
y: 0.564 # Design Value
@@ -90,6 +102,7 @@ sensor_kit_base_link:
roll: 0.872665 # Design Value
pitch: 0.0 # Design Value
yaw: 3.14159265359 # Design Value
+ type: pandar_xt32
hesai_right_base_link:
x: 0.0 # Design Value
y: -0.564 # Design Value
@@ -97,6 +110,7 @@ sensor_kit_base_link:
roll: 0.69813132679 # Design Value
pitch: 0.0 # Design Value
yaw: 0.0 # Design Value
+ type: pandar_xt32
gnss_link:
x: -0.279 # Design Value
y: 0.0 # Design Value
@@ -104,6 +118,7 @@ sensor_kit_base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 0.0 # Design Value
+ type: imu
tamagawa/imu_link:
x: -0.129 # Design Value
y: 0.0 # Design Value
@@ -111,3 +126,4 @@ sensor_kit_base_link:
roll: 3.14159265359
pitch: 0.0 # Design Value
yaw: 3.14159265359 # Design Value
+ type: imu
diff --git a/aip_xx1_gen2_description/config/sensors_calibration.yaml b/aip_xx1_gen2_description/config/sensors_calibration.yaml
index a57d3ea9..4fb70f70 100644
--- a/aip_xx1_gen2_description/config/sensors_calibration.yaml
+++ b/aip_xx1_gen2_description/config/sensors_calibration.yaml
@@ -6,6 +6,7 @@ base_link:
roll: 0.0
pitch: 0.0
yaw: 0.0
+ type: units
hesai_front_left_base_link:
x: 3.373 # Design Value
y: 0.740 # Design Value
@@ -13,6 +14,7 @@ base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 2.44346132679 # Design Value
+ type: pandar_xt32
hesai_front_right_base_link:
x: 3.373 # Design Value
y: -0.740 # Design Value
@@ -20,6 +22,7 @@ base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 0.69813132679 # Design Value
+ type: pandar_xt32
# velodyne_rear_base_link: #unused
# x: -0.358
# y: 0.0
@@ -34,6 +37,7 @@ base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 0.0 # Design Value
+ type: radar
front_right/radar_link:
x: 3.384 # Design Value
y: -0.7775 # Design Value
@@ -41,6 +45,7 @@ base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: -1.22173 # Design Value
+ type: radar
front_left/radar_link:
x: 3.384 # Design Value
y: 0.7775 # Design Value
@@ -48,6 +53,7 @@ base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 1.22173 # Design Value
+ type: radar
rear_center/radar_link:
x: -0.858 # Design Value
y: 0.0 # Design Value
@@ -55,6 +61,7 @@ base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 3.141592 # Design Value
+ type: radar
rear_right/radar_link:
x: -0.782 # Design Value
y: -0.761 # Design Value
@@ -62,6 +69,7 @@ base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: -2.0944 # Design Value
+ type: radar
rear_left/radar_link:
x: -0.782 # Design Value
y: 0.761 # Design Value
@@ -69,3 +77,4 @@ base_link:
roll: 0.0 # Design Value
pitch: 0.0 # Design Value
yaw: 2.0944 # Design Value
+ type: radar
diff --git a/aip_xx1_gen2_description/package.xml b/aip_xx1_gen2_description/package.xml
index e1f2774f..94c8410c 100644
--- a/aip_xx1_gen2_description/package.xml
+++ b/aip_xx1_gen2_description/package.xml
@@ -11,6 +11,7 @@
aip_urdf_compiler
velodyne_description
+ aip_urdf_compiler
ament_cmake
diff --git a/aip_xx1_gen2_description/urdf/.gitignore b/aip_xx1_gen2_description/urdf/.gitignore
new file mode 100644
index 00000000..e1e98315
--- /dev/null
+++ b/aip_xx1_gen2_description/urdf/.gitignore
@@ -0,0 +1 @@
+*.xacro
diff --git a/aip_xx1_gen2_description/urdf/sensor_kit.xacro b/aip_xx1_gen2_description/urdf/sensor_kit.xacro
deleted file mode 100644
index 137b3589..00000000
--- a/aip_xx1_gen2_description/urdf/sensor_kit.xacro
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/aip_xx1_gen2_description/urdf/sensors.xacro b/aip_xx1_gen2_description/urdf/sensors.xacro
deleted file mode 100644
index 79c2c15f..00000000
--- a/aip_xx1_gen2_description/urdf/sensors.xacro
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-