From 9c3b8432a73436e4a3ed77764d0798f7b7ee9bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20=C3=89corchard?= <gael@km-robotics.cz>
Date: Tue, 12 Dec 2023 08:55:10 +0100
Subject: [PATCH] Remove `urdf` from file names with macro definition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove `.urdf` from file names of xacro files that only define macros.

Signed-off-by: Gaël Écorchard <gael@km-robotics.cz>
---
 .../urdf/lite/turtlebot4.urdf.xacro                  |  8 ++++----
 ...bracket.urdf.xacro => camera_bracket_macro.xacro} |  0
 .../sensors/{oakd.urdf.xacro => oakd_macro.xacro}    |  0
 .../{rplidar.urdf.xacro => rplidar_macro.xacro}      |  0
 ...ate.urdf.xacro => tower_sensor_plate_macro.xacro} |  0
 ...tandoff.urdf.xacro => tower_standoff_macro.xacro} |  0
 .../urdf/standard/turtlebot4.urdf.xacro              | 12 ++++++------
 ...ght_block.urdf.xacro => weight_block_macro.xacro} |  0
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename turtlebot4_description/urdf/sensors/{camera_bracket.urdf.xacro => camera_bracket_macro.xacro} (100%)
 rename turtlebot4_description/urdf/sensors/{oakd.urdf.xacro => oakd_macro.xacro} (100%)
 rename turtlebot4_description/urdf/sensors/{rplidar.urdf.xacro => rplidar_macro.xacro} (100%)
 rename turtlebot4_description/urdf/standard/{tower_sensor_plate.urdf.xacro => tower_sensor_plate_macro.xacro} (100%)
 rename turtlebot4_description/urdf/standard/{tower_standoff.urdf.xacro => tower_standoff_macro.xacro} (100%)
 rename turtlebot4_description/urdf/standard/{weight_block.urdf.xacro => weight_block_macro.xacro} (100%)

diff --git a/turtlebot4_description/urdf/lite/turtlebot4.urdf.xacro b/turtlebot4_description/urdf/lite/turtlebot4.urdf.xacro
index 5de1406..9e159b4 100644
--- a/turtlebot4_description/urdf/lite/turtlebot4.urdf.xacro
+++ b/turtlebot4_description/urdf/lite/turtlebot4.urdf.xacro
@@ -2,9 +2,9 @@
 <robot name="turtlebot4" xmlns:xacro="http://ros.org/wiki/xacro">
   <!-- Base create3 model -->
   <xacro:include filename="$(find irobot_create_description)/urdf/create3.urdf.xacro" />
-  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/rplidar.urdf.xacro" />
-  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/oakd.urdf.xacro" />
-  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/camera_bracket.urdf.xacro" />
+  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/rplidar_macro.xacro" />
+  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/oakd_macro.xacro" />
+  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/camera_bracket_macro.xacro" />
 
   <!-- Mechanical properties -->
   <xacro:property name="rplidar_x_offset"              value="${0.393584*cm2m}"/>
@@ -25,7 +25,7 @@
     <origin xyz="${rplidar_x_offset} ${rplidar_y_offset} ${rplidar_z_offset + base_link_z_offset}"
             rpy="0 0 ${pi/2}"/>
   </xacro:rplidar>
-  
+
   <xacro:camera_bracket name="oakd_camera_bracket" parent_link="base_link">
     <origin xyz="${camera_mount_x_offset} ${camera_mount_y_offset} ${camera_mount_z_offset + base_link_z_offset}"/>
   </xacro:camera_bracket>
diff --git a/turtlebot4_description/urdf/sensors/camera_bracket.urdf.xacro b/turtlebot4_description/urdf/sensors/camera_bracket_macro.xacro
similarity index 100%
rename from turtlebot4_description/urdf/sensors/camera_bracket.urdf.xacro
rename to turtlebot4_description/urdf/sensors/camera_bracket_macro.xacro
diff --git a/turtlebot4_description/urdf/sensors/oakd.urdf.xacro b/turtlebot4_description/urdf/sensors/oakd_macro.xacro
similarity index 100%
rename from turtlebot4_description/urdf/sensors/oakd.urdf.xacro
rename to turtlebot4_description/urdf/sensors/oakd_macro.xacro
diff --git a/turtlebot4_description/urdf/sensors/rplidar.urdf.xacro b/turtlebot4_description/urdf/sensors/rplidar_macro.xacro
similarity index 100%
rename from turtlebot4_description/urdf/sensors/rplidar.urdf.xacro
rename to turtlebot4_description/urdf/sensors/rplidar_macro.xacro
diff --git a/turtlebot4_description/urdf/standard/tower_sensor_plate.urdf.xacro b/turtlebot4_description/urdf/standard/tower_sensor_plate_macro.xacro
similarity index 100%
rename from turtlebot4_description/urdf/standard/tower_sensor_plate.urdf.xacro
rename to turtlebot4_description/urdf/standard/tower_sensor_plate_macro.xacro
diff --git a/turtlebot4_description/urdf/standard/tower_standoff.urdf.xacro b/turtlebot4_description/urdf/standard/tower_standoff_macro.xacro
similarity index 100%
rename from turtlebot4_description/urdf/standard/tower_standoff.urdf.xacro
rename to turtlebot4_description/urdf/standard/tower_standoff_macro.xacro
diff --git a/turtlebot4_description/urdf/standard/turtlebot4.urdf.xacro b/turtlebot4_description/urdf/standard/turtlebot4.urdf.xacro
index a9ddf98..d56a7e1 100644
--- a/turtlebot4_description/urdf/standard/turtlebot4.urdf.xacro
+++ b/turtlebot4_description/urdf/standard/turtlebot4.urdf.xacro
@@ -2,12 +2,12 @@
 <robot name="turtlebot4" xmlns:xacro="http://ros.org/wiki/xacro">
   <!-- Base create3 model -->
   <xacro:include filename="$(find irobot_create_description)/urdf/create3.urdf.xacro" />
-  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/rplidar.urdf.xacro" />
-  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/oakd.urdf.xacro" />
-  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/camera_bracket.urdf.xacro" />
-  <xacro:include filename="$(find turtlebot4_description)/urdf/standard/tower_standoff.urdf.xacro" />
-  <xacro:include filename="$(find turtlebot4_description)/urdf/standard/tower_sensor_plate.urdf.xacro" />
-  <xacro:include filename="$(find turtlebot4_description)/urdf/standard/weight_block.urdf.xacro" />
+  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/rplidar_macro.xacro" />
+  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/oakd_macro.xacro" />
+  <xacro:include filename="$(find turtlebot4_description)/urdf/sensors/camera_bracket_macro.xacro" />
+  <xacro:include filename="$(find turtlebot4_description)/urdf/standard/tower_standoff_macro.xacro" />
+  <xacro:include filename="$(find turtlebot4_description)/urdf/standard/tower_sensor_plate_macro.xacro" />
+  <xacro:include filename="$(find turtlebot4_description)/urdf/standard/weight_block_macro.xacro" />
 
   <!-- Mechanical properties -->
   <xacro:property name="shell_z_offset"                value="${3*cm2m}" />
diff --git a/turtlebot4_description/urdf/standard/weight_block.urdf.xacro b/turtlebot4_description/urdf/standard/weight_block_macro.xacro
similarity index 100%
rename from turtlebot4_description/urdf/standard/weight_block.urdf.xacro
rename to turtlebot4_description/urdf/standard/weight_block_macro.xacro