From: grpetry <gabriel.petry26@gmail.com>
Date: Wed, 12 Jun 2019 17:39:06 +0000 (-0300)
Subject: Merge branch 'devel_nav' into melodic
X-Git-Tag: petryTCC~7
X-Git-Url: http://git.ece.ufrgs.br/?a=commitdiff_plain;h=58974f99b242658bdca9f79b6b45a7a2b7881a78;p=twil.git

Merge branch 'devel_nav' into melodic
---

58974f99b242658bdca9f79b6b45a7a2b7881a78
diff --cc twil_description/xacro/twil.urdf.xacro
index e97e71a,7ee5cd3..08b88e9
--- a/twil_description/xacro/twil.urdf.xacro
+++ b/twil_description/xacro/twil.urdf.xacro
@@@ -12,10 -12,10 +12,13 @@@
    <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">