diff --git a/urdf/realsense.xacro b/urdf/realsense.xacro index f90810f353dc37ae695f39867aa6a5fffff0432c..962696fd77bd34d62118800254cc9404f845e6cd 100644 --- a/urdf/realsense.xacro +++ b/urdf/realsense.xacro @@ -3,32 +3,39 @@ <root xmlns:xacro="http://ros.org/wiki/xacro"> <xacro:include filename="$(find iri_realsense_depth_description)/urdf/realsense.gazebo" /> + <!--<xacro:include filename="$(find realsense2_description)/urdf/_d435.urdf.xacro"/>--> - <xacro:macro name="realsense_depth" params="parent model *origin sim_config"> + <xacro:macro name="realsense_depth" params="parent model name:=camera *origin sim_config first:=true"> <xacro:arg name="use_nominal_extrinsics" default="True" /> <xacro:if value="${model == 'd435'}"> - <xacro:include filename="$(find realsense2_description)/urdf/_d435.urdf.xacro"/> - <sensor_d435 parent="${parent}" > + <xacro:if value="${first == 'true'}"> + <xacro:include filename="$(find realsense2_description)/urdf/_d435.urdf.xacro"/> + </xacro:if> + <sensor_d435 parent="${parent}" name="${name}"> <xacro:insert_block name="origin"/> </sensor_d435> </xacro:if> <xacro:if value="${model == 'r410'}"> - <xacro:include filename="$(find realsense2_descritpion)/urdf/_r410.urdf.xacro"/> - <sensor_r410 parent="${parent}"> + <xacro:if value="${first == 'true'}"> + <xacro:include filename="$(find realsense2_description)/urdf/_r410.urdf.xacro"/> + </xacro:if> + <sensor_r410 parent="${parent}" name="${name}"> <xacro:insert_block name="origin"/> </sensor_r410> </xacro:if> <xacro:if value="${model == 'r430'}"> - <xacro:include filename="$(find realsense2_description)/urdf/_r430.urdf.xacro"/> - <sensor_r430 parent="${parent}"> + <xacro:if value="${first == 'true'}"> + <xacro:include filename="$(find realsense2_description)/urdf/_r430.urdf.xacro"/> + </xacro:if> + <sensor_r430 parent="${parent}" name="${name}"> <xacro:insert_block name="origin"/> </sensor_r430> </xacro:if> - <xacro:realsense_depth_gazebo name="camera" sim_config="${sim_config}"/> + <xacro:realsense_depth_gazebo name="${name}" sim_config="${sim_config}"/> </xacro:macro> diff --git a/urdf/realsense_d435.xacro b/urdf/realsense_d435.xacro new file mode 100644 index 0000000000000000000000000000000000000000..ba3d9ca80a6009c62c3c8e95f85059eb6f0c0c21 --- /dev/null +++ b/urdf/realsense_d435.xacro @@ -0,0 +1,19 @@ +<?xml version="1.0"?> + +<root xmlns:xacro="http://ros.org/wiki/xacro"> + + <xacro:include filename="$(find iri_realsense_depth_description)/urdf/realsense.gazebo" /> + <xacro:include filename="$(find realsense2_description)/urdf/_d435.urdf.xacro"/> + + <xacro:macro name="realsense_d435_depth" params="parent name:=camera *origin sim_config"> + + <xacro:arg name="use_nominal_extrinsics" default="True" /> + <sensor_d435 parent="${parent}" name="${name}"> + <xacro:insert_block name="origin"/> + </sensor_d435> + + <xacro:realsense_depth_gazebo name="${name}" sim_config="${sim_config}"/> + + </xacro:macro> + +</root> diff --git a/urdf/realsense_r410.xacro b/urdf/realsense_r410.xacro new file mode 100644 index 0000000000000000000000000000000000000000..52cd76dce7f1c083db3294860a68a83436fc4227 --- /dev/null +++ b/urdf/realsense_r410.xacro @@ -0,0 +1,19 @@ +<?xml version="1.0"?> + +<root xmlns:xacro="http://ros.org/wiki/xacro"> + + <xacro:include filename="$(find iri_realsense_depth_description)/urdf/realsense.gazebo" /> + <xacro:include filename="$(find realsense2_description)/urdf/_r410.urdf.xacro"/> + + <xacro:macro name="realsense_r410_depth" params="parent model *origin sim_config"> + + <xacro:arg name="use_nominal_extrinsics" default="True" /> + <sensor_r410 parent="${parent}" name="${name}"> + <xacro:insert_block name="origin"/> + </sensor_r410> + + <xacro:realsense_depth_gazebo name="${name}" sim_config="${sim_config}"/> + + </xacro:macro> + +</root> diff --git a/urdf/realsense_r430.xacro b/urdf/realsense_r430.xacro new file mode 100644 index 0000000000000000000000000000000000000000..4d6ca84f10e7f47cc3a2ad4d032edf0b2bf6b4c2 --- /dev/null +++ b/urdf/realsense_r430.xacro @@ -0,0 +1,19 @@ +<?xml version="1.0"?> + +<root xmlns:xacro="http://ros.org/wiki/xacro"> + + <xacro:include filename="$(find iri_realsense_depth_description)/urdf/realsense.gazebo" /> + <xacro:include filename="$(find realsense2_description)/urdf/_r430.urdf.xacro"/> + + <xacro:macro name="realsense_r430_depth" params="parent model *origin sim_config"> + + <xacro:arg name="use_nominal_extrinsics" default="True" /> + <sensor_r430 parent="${parent}" name="${name}"> + <xacro:insert_block name="origin"/> + </sensor_r430> + + <xacro:realsense_depth_gazebo name="${name}" sim_config="${sim_config}"/> + + </xacro:macro> + +</root>