From f2a74e1d43e756e7b57332a1072ef459d20a851b Mon Sep 17 00:00:00 2001
From: Kenzo Lobos-Tsunekawa <kenzo.lobos@tier4.jp>
Date: Tue, 12 Mar 2024 19:09:10 +0900
Subject: [PATCH] fix: fixed naming and enabled the radars

Signed-off-by: Kenzo Lobos-Tsunekawa <kenzo.lobos@tier4.jp>
---
 aip_xx1_description/urdf/sensors.xacro   | 12 ++++++------
 aip_xx1_launch/launch/sensing.launch.xml |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aip_xx1_description/urdf/sensors.xacro b/aip_xx1_description/urdf/sensors.xacro
index f6899f14..64dbf6bb 100644
--- a/aip_xx1_description/urdf/sensors.xacro
+++ b/aip_xx1_description/urdf/sensors.xacro
@@ -59,7 +59,7 @@
   <!-- embedded radar sensors -->
   <xacro:include filename="$(find radar_description)/urdf/radar.xacro"/>
   <xacro:radar_macro
-    name="radar_front_center"
+    name="front_center/radar_link"
     parent="base_link"
     x="${calibration['base_link']['front_center/radar_link']['x']}"
     y="${calibration['base_link']['front_center/radar_link']['y']}"
@@ -69,7 +69,7 @@
     yaw="${calibration['base_link']['front_center/radar_link']['yaw']}"
   />
   <xacro:radar_macro
-    name="radar_front_right"
+    name="front_right/radar_link"
     parent="base_link"
     x="${calibration['base_link']['front_right/radar_link']['x']}"
     y="${calibration['base_link']['front_right/radar_link']['y']}"
@@ -79,7 +79,7 @@
     yaw="${calibration['base_link']['front_right/radar_link']['yaw']}"
   />
   <xacro:radar_macro
-    name="radar_front_left"
+    name="front_left/radar_link"
     parent="base_link"
     x="${calibration['base_link']['front_left/radar_link']['x']}"
     y="${calibration['base_link']['front_left/radar_link']['y']}"
@@ -89,7 +89,7 @@
     yaw="${calibration['base_link']['front_left/radar_link']['yaw']}"
   />
   <xacro:radar_macro
-    name="radar_back_center"
+    name="rear_center/radar_link"
     parent="base_link"
     x="${calibration['base_link']['rear_center/radar_link']['x']}"
     y="${calibration['base_link']['rear_center/radar_link']['y']}"
@@ -99,7 +99,7 @@
     yaw="${calibration['base_link']['rear_center/radar_link']['yaw']}"
   />
   <xacro:radar_macro
-    name="radar_back_right"
+    name="rear_right/radar_link"
     parent="base_link"
     x="${calibration['base_link']['rear_right/radar_link']['x']}"
     y="${calibration['base_link']['rear_right/radar_link']['y']}"
@@ -109,7 +109,7 @@
     yaw="${calibration['base_link']['rear_right/radar_link']['yaw']}"
   />
   <xacro:radar_macro
-    name="radar_back_left"
+    name="rear_left/radar_link"
     parent="base_link"
     x="${calibration['base_link']['rear_left/radar_link']['x']}"
     y="${calibration['base_link']['rear_left/radar_link']['y']}"
diff --git a/aip_xx1_launch/launch/sensing.launch.xml b/aip_xx1_launch/launch/sensing.launch.xml
index e8aa4186..ba6b935c 100644
--- a/aip_xx1_launch/launch/sensing.launch.xml
+++ b/aip_xx1_launch/launch/sensing.launch.xml
@@ -33,9 +33,9 @@
     </include>
 
     <!-- Radar Driver -->
-    <!-- <include file="$(find-pkg-share aip_xx1_launch)/launch/radar.launch.xml">
+    <include file="$(find-pkg-share aip_xx1_launch)/launch/radar.launch.xml">
       <arg name="launch_driver" value="$(var launch_driver)" />
-    </include> -->
+    </include>
 
     <!-- Vehicle twist -->
     <include file="$(find-pkg-share vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">