Skip to content

Commit

Permalink
Create a copy of abb_irb6600_support and rename to abb_irb6640_support
Browse files Browse the repository at this point in the history
   - The abb_irb6600_support contained the irb6640 not the irb6600. A duplicate of the irb6640 will remain in the abb_irb6600_support package until Jade
  • Loading branch information
Levi-Armstrong committed Jan 20, 2017
1 parent d0cdcb0 commit 43e31b4
Show file tree
Hide file tree
Showing 46 changed files with 3,570 additions and 194 deletions.
1 change: 1 addition & 0 deletions abb/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<run_depend>abb_irb2400_support</run_depend>
<run_depend>abb_irb5400_support</run_depend>
<run_depend>abb_irb6600_support</run_depend>
<run_depend>abb_irb6640_support</run_depend>
<run_depend>abb_irb6640_moveit_config</run_depend>
<run_depend>abb_resources</run_depend>

Expand Down
11 changes: 9 additions & 2 deletions abb_irb6600_support/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
robot model and configuration you intend to use them with.
</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>
<author>Dan Solomon (Southwest Research Institute)</author>
<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 @@ -38,4 +38,11 @@
<run_depend>joint_state_publisher</run_depend>
<run_depend>robot_state_publisher</run_depend>
<run_depend>rviz</run_depend>

<export>
<deprecated>
All files related to the irb6640 will be removed in Jade, please use the
abb_irb6640_support package going forward.
</deprecated>
</export>
</package>
12 changes: 6 additions & 6 deletions abb_irb6600_support/urdf/irb6640.xacro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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 43e31b4

Please sign in to comment.