Skip to content

Commit 0efd121

Browse files
Levi-ArmstrongLevi-Armstrong
committed
Merge pull request #26 from gavanderhoorn/irb120_4400_minor_cleanups
Minor cleanup of manifests and build scripts of IRB 120 and 4400 pkgs
2 parents 395703d + bc89312 commit 0efd121

File tree

4 files changed

+52
-35
lines changed

4 files changed

+52
-35
lines changed

‎abb_irb120_support/CMakeLists.txt

+8-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ catkin_package()
88

99
if (CATKIN_ENABLE_TESTING)
1010
find_package(roslaunch REQUIRED)
11-
roslaunch_add_file_check(tests/roslaunch_test.xml)
11+
roslaunch_add_file_check(tests/roslaunch_test.xml
12+
DEPENDENCIES
13+
# not nice, but industrial_robot_client doesn't prefix its targets
14+
joint_trajectory_action
15+
abb_driver_robot_state
16+
abb_driver_motion_download_interface)
1217
endif()
1318

14-
foreach(dir config launch meshes urdf)
15-
install(DIRECTORY ${dir}/
16-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
17-
endforeach()
19+
install(DIRECTORY config launch meshes urdf
20+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

‎abb_irb120_support/package.xml

+19-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1+
<?xml version="1.0"?>
12
<package>
23
<name>abb_irb120_support</name>
3-
<version>0.2.0</version>
4+
<version>0.1.0</version>
45
<description>
56
<p>
67
ROS-Industrial support for the ABB IRB 120 (and variants).
78
</p>
89
<p>
910
This package contains configuration data, 3D models and launch files
10-
for ABB IRB 120 manipulators. This includes the base model (120) and the 120T.
11+
for ABB IRB 120 manipulators. This includes the base model (120) and
12+
the 120T.
1113
</p>
1214
<p>
13-
Joint limits and max joint velocities are based on the information in the
14-
<a href="http://new.abb.com/products/robotics/industrial-robots/irb-120/irb-120-data">ABB
15-
IRB 120 technical data sheet</a> (Version: ROB0149EN_D, May 2012). All URDFs / XACROs are
16-
based on the default motion and joint velocity limits, unless noted otherwise (ie: no
17-
support for high speed joints, extended / limited motion ranges or other options).
15+
Joint limits and max joint velocities are based on the information in the
16+
<a href="http://new.abb.com/products/robotics/industrial-robots/irb-120/irb-120-data">
17+
ABB IRB 120 technical data sheet</a> (Version: ROB0149EN_D, May 2012).
18+
All urdfs / xacros are based on the default motion and joint velocity
19+
limits, unless noted otherwise (ie: no support for high speed joints,
20+
extended / limited motion ranges or other options).
1821
</p>
1922
<p>
2023
Before using any of the configuration files and / or meshes included
@@ -24,18 +27,25 @@
2427
</description>
2528
<author email="[email protected]">Mark Culleton (Trinity College Dublin)</author>
2629
<maintainer email="[email protected]">Mark Culleton (Trinity College Dublin)</maintainer>
30+
<maintainer email="[email protected]">Levi Armstrong (SwRI)</maintainer>
2731
<license>Apache2</license>
2832

29-
<url type="website">http://wiki.ros.org/abb</url>
33+
<url type="website">http://wiki.ros.org/abb_irb120_support</url>
3034
<url type="bugtracker">https://github.com/ros-industrial/abb_experimental/issues</url>
3135
<url type="repository">https://github.com/ros-industrial/abb_experimental</url>
3236

3337
<buildtool_depend>catkin</buildtool_depend>
3438

35-
<build_depend>roslaunch</build_depend>
39+
<build_depend version_gte="1.9.55">roslaunch</build_depend>
3640

3741
<run_depend>abb_driver</run_depend>
42+
<run_depend>abb_resources</run_depend>
3843
<run_depend>joint_state_publisher</run_depend>
3944
<run_depend>robot_state_publisher</run_depend>
4045
<run_depend>rviz</run_depend>
46+
<run_depend>xacro</run_depend>
47+
48+
<export>
49+
<architecture_independent/>
50+
</export>
4151
</package>

‎abb_irb4400_support/CMakeLists.txt

+7-9
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@ catkin_package()
99
if (CATKIN_ENABLE_TESTING)
1010
find_package(roslaunch REQUIRED)
1111
roslaunch_add_file_check(tests/roslaunch_test.xml
12-
DEPENDENCIES
13-
# not nice, but industrial_robot_client doesn't prefix its targets
14-
joint_trajectory_action
15-
abb_driver_robot_state
16-
abb_driver_motion_download_interface)
12+
DEPENDENCIES
13+
# not nice, but industrial_robot_client doesn't prefix its targets
14+
joint_trajectory_action
15+
abb_driver_robot_state
16+
abb_driver_motion_download_interface)
1717
endif()
1818

19-
foreach(dir config launch meshes urdf)
20-
install(DIRECTORY ${dir}/
21-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
22-
endforeach()
19+
install(DIRECTORY config launch meshes urdf
20+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

‎abb_irb4400_support/package.xml

+18-12
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1+
<?xml version="1.0"?>
12
<package>
23
<name>abb_irb4400_support</name>
34
<version>0.1.0</version>
45
<description>
56
<p>
6-
ROS Industrial support for the ABB IRB4400 (and variants).
7+
ROS-Industrial support for the ABB IRB 4400 (and variants).
78
</p>
89
<p>
9-
This package contains configuration data, 3D models and launch files
10-
for ABB IRB4400 manipulators. This currently includes the L30.
10+
This package contains configuration data, 3D models and launch files
11+
for ABB IRB 4400 manipulators. This currently includes the L30.
1112
</p>
1213
<p>
13-
Joint limits and max joint velocities are based on the information in the
14+
Joint limits and max joint velocities are based on the information in the
1415
<a href="http://www05.abb.com/global/scot/scot352.nsf/veritydisplay/c90b98aaa057bd6ec12576cb00528ef6/$file/Product%20specification%204400%20M99%20BWOS3.2.pdf">
15-
ABB IRB 4400 product specification document</a> (Article No: 3HAC 8770-1).
16-
All urdfs / xacros are based on the default motion and joint velocity
17-
limits, unless noted otherwise (ie: no support for high speed joints,
16+
ABB IRB 4400 product specification document</a> (Article No: 3HAC 8770-1).
17+
All urdfs / xacros are based on the default motion and joint velocity
18+
limits, unless noted otherwise (ie: no support for high speed joints,
1819
extended / limited motion ranges or other options).
1920
</p>
2021
<p>
21-
Before using any of the configuration files and / or meshes included
22-
in this package, be sure to check they are correct for the particular
22+
Before using any of the configuration files and / or meshes included
23+
in this package, be sure to check they are correct for the particular
2324
robot model and configuration you intend to use them with.
2425
</p>
2526
</description>
26-
<author email="[email protected]">Dan Solomon (Southwest Research Institute)</author>
27-
<maintainer email="[email protected]">Shaun Edwards (Southwest Research Institute)</maintainer>
27+
<author>Dan Solomon</author>
28+
<maintainer email="[email protected]">Shaun Edwards (SwRI)</maintainer>
2829
<license>Apache2</license>
2930

30-
<url type="website">http://ros.org/wiki/abb_irb4400_support</url>
31+
<url type="website">http://wiki.ros.org/abb_irb4400_support</url>
3132
<url type="bugtracker">https://github.com/ros-industrial/abb_experimental/issues</url>
3233
<url type="repository">https://github.com/ros-industrial/abb_experimental</url>
3334

@@ -36,8 +37,13 @@
3637
<build_depend version_gte="1.9.55">roslaunch</build_depend>
3738

3839
<run_depend>abb_driver</run_depend>
40+
<run_depend>abb_resources</run_depend>
3941
<run_depend>joint_state_publisher</run_depend>
4042
<run_depend>robot_state_publisher</run_depend>
4143
<run_depend>rviz</run_depend>
44+
<run_depend>xacro</run_depend>
4245

46+
<export>
47+
<architecture_independent/>
48+
</export>
4349
</package>

0 commit comments

Comments
 (0)