Merge branch 'devel_nav' into melodic
authorgrpetry <gabriel.petry26@gmail.com>
Wed, 12 Jun 2019 17:39:06 +0000 (14:39 -0300)
committergrpetry <gabriel.petry26@gmail.com>
Wed, 12 Jun 2019 17:39:06 +0000 (14:39 -0300)
1  2 
twil_description/xacro/twil.urdf.xacro

    <xacro:include filename="$(find twil_description)/xacro/battery_bosch_12v.urdf.xacro" />
    <xacro:include filename="$(find twil_description)/xacro/cpu.urdf.xacro" />
    <xacro:include filename="$(find twil_description)/xacro/eurocard.urdf.xacro" />
 +  <xacro:include filename="$(find twil_description)/xacro/tower.urdf.xacro" />
 +  <xacro:include filename="$(find twil_description)/xacro/step_motor.urdf.xacro" />
 +  <xacro:include filename="$(find twil_description)/xacro/sonar.urdf.xacro" />
  
+   <!--> Added camera description <-->
+   <xacro:include filename="$(find realsense2_description)/urdf/_d435.urdf.xacro" />
    <link name="twil_origin" />
  
    <xacro:chassis name="chassis" parent="twil_origin">