Skip to content

Commit

Permalink
Fix formatting and wording
Browse files Browse the repository at this point in the history
  • Loading branch information
Levi-Armstrong committed Jul 31, 2015
1 parent e0e1a32 commit 8e5ecff
Show file tree
Hide file tree
Showing 10 changed files with 371 additions and 411 deletions.
7 changes: 5 additions & 2 deletions abb_irb6600_support/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</p>
</description>
<author email="ds____on@swri.org">Dan Solomon (Southwest Research Institute)</author>
<maintainer email="sedwards@swri.org">Shaun Edwards (Southwest Research Institute)</maintainer>
<maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
<license>Apache2</license>

<url type="website">http://ros.org/wiki/abb_irb6600_support</url>
Expand All @@ -40,6 +40,9 @@
<run_depend>rviz</run_depend>

<export>
<deprecated> All files related to the irb6640 will be removed in Jade, use the abb_irb6640_support package going forward. </deprecated>
<deprecated>
All files related to the irb6640 will be removed in Jade, please use the
abb_irb6640_support package going forward.
</deprecated>
</export>
</package>
16 changes: 10 additions & 6 deletions abb_irb6600_support/urdf/irb6640.xacro
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" ?>

<robot name="abb_irb6640" xmlns:xacro="http://ros.org/wiki/xacro">
<xacro:include filename="$(find abb_irb6600_support)/urdf/irb6640_macro.xacro"/>
<xacro:abb_irb6640 prefix=""/>
</robot>
<?xml version="1.0" ?>

<robot name="abb_irb6640" xmlns:xacro="http://ros.org/wiki/xacro">

<xacro:include filename="$(find abb_irb6600_support)/urdf/irb6640_macro.xacro"/>

<xacro:abb_irb6640 prefix=""/>

</robot>

Loading

0 comments on commit 8e5ecff

Please sign in to comment.