Skip to content

Remove urdf from file names with macro definition #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
galou wants to merge 1 commit into
base: humble
Choose a base branch
from
Open

Remove urdf from file names with macro definition #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions turtlebot4_description/urdf/lite/turtlebot4.urdf.xacro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand All @@ -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>
Expand Down
0 ...on/urdf/sensors/camera_bracket.urdf.xacro → ...n/urdf/sensors/camera_bracket_macro.xacro
View file
Open in desktop
File renamed without changes.
0 ..._description/urdf/sensors/oakd.urdf.xacro → ...description/urdf/sensors/oakd_macro.xacro
View file
Open in desktop
File renamed without changes.
0 ...scription/urdf/sensors/rplidar.urdf.xacro → ...cription/urdf/sensors/rplidar_macro.xacro
View file
Open in desktop
File renamed without changes.
0 ...df/standard/tower_sensor_plate.urdf.xacro → ...f/standard/tower_sensor_plate_macro.xacro
View file
Open in desktop
File renamed without changes.
0 ...n/urdf/standard/tower_standoff.urdf.xacro → .../urdf/standard/tower_standoff_macro.xacro
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions turtlebot4_description/urdf/standard/turtlebot4.urdf.xacro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" />
Expand Down
0 ...ion/urdf/standard/weight_block.urdf.xacro → ...on/urdf/standard/weight_block_macro.xacro
View file
Open in desktop
File renamed without changes.