forked from ros-industrial/motoman
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'kinetic-devel' into point-streaming
- Loading branch information
Showing
19 changed files
with
239 additions
and
216 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,25 @@ | ||
| <package> | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>motoman</name> | ||
| <version>0.3.5</version> | ||
| <description>The motoman stack constains libraries, configuration files, and ROS nodes for controlling a Motoman robot from ROS-Industrial</description> | ||
| <maintainer email="[email protected]">Shaun Edwards</maintainer> | ||
| <license>BSD</license> | ||
| <url type="website">http://ros.org/wiki/motoman</url> | ||
| <url type="website">http://wiki.ros.org/motoman</url> | ||
| <author email="[email protected]">Shaun Edwards</author> | ||
|
|
||
| <buildtool_depend>catkin</buildtool_depend> | ||
|
|
||
| <run_depend>motoman_driver</run_depend> | ||
| <run_depend>motoman_mh5_support</run_depend> | ||
| <run_depend>motoman_sia10d_support</run_depend> | ||
| <run_depend>motoman_sia20d_moveit_config</run_depend> | ||
| <run_depend>motoman_sia20d_support</run_depend> | ||
| <run_depend>motoman_sia5d_support</run_depend> | ||
|
|
||
| <exec_depend>motoman_driver</exec_depend> | ||
| <exec_depend>motoman_mh5_support</exec_depend> | ||
| <exec_depend>motoman_msgs</exec_depend> | ||
| <exec_depend>motoman_sda10f_moveit_config</exec_depend> | ||
| <exec_depend>motoman_sda10f_support</exec_depend> | ||
| <exec_depend>motoman_sia10d_support</exec_depend> | ||
| <exec_depend>motoman_sia10f_support</exec_depend> | ||
| <exec_depend>motoman_sia20d_moveit_config</exec_depend> | ||
| <exec_depend>motoman_sia20d_support</exec_depend> | ||
| <exec_depend>motoman_sia5d_support</exec_depend> | ||
|
|
||
| <export> | ||
| <metapackage/> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,36 @@ | ||
| <package> | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>motoman_driver</name> | ||
| <version>0.3.5</version> | ||
| <description>The motoman driver package includes nodes for interfacing with a motoman | ||
| industrial robot controllers.</description> | ||
| <description> | ||
| This package provides nodes for interfacing with Motoman industrial robot controllers. | ||
| </description> | ||
| <author>Jeremy Zoss (Southwest Research Institute)</author> | ||
| <author>Ted Miller (MotoROS) (Yaskawa Motoman)</author> | ||
| <author>Eric Marcil (MotoROS) (Yaskawa Motoman)</author> | ||
| <maintainer email="[email protected]">Jeremy Zoss (Southwest Research Institute)</maintainer> | ||
| <license>BSD</license> | ||
| <url type="website">http://ros.org/wiki/motoman_driver</url> | ||
| <author email="[email protected]">Jeremy Zoss (Southwest Research Institute)</author> | ||
|
|
||
| <buildtool_depend>catkin</buildtool_depend> | ||
| <url type="website">http://wiki.ros.org/motoman_driver</url> | ||
| <url type="bugtracker">https://github.com/ros-industrial/motoman/issues</url> | ||
| <url type="repository">https://github.com/ros-industrial/motoman</url> | ||
|
|
||
| <build_depend>actionlib</build_depend> | ||
| <build_depend>actionlib_msgs</build_depend> | ||
| <build_depend>control_msgs</build_depend> | ||
| <build_depend>industrial_msgs</build_depend> | ||
| <build_depend>industrial_robot_client</build_depend> | ||
| <build_depend>industrial_utils</build_depend> | ||
| <build_depend>motoman_msgs</build_depend> | ||
| <build_depend>roscpp</build_depend> | ||
| <build_depend>roslint</build_depend> | ||
| <build_depend>sensor_msgs</build_depend> | ||
| <build_depend>simple_message</build_depend> | ||
| <build_depend>std_msgs</build_depend> | ||
| <build_depend>std_srvs</build_depend> | ||
| <build_depend>trajectory_msgs</build_depend> | ||
| <build_depend>urdf</build_depend> | ||
| <buildtool_depend>catkin</buildtool_depend> | ||
|
|
||
| <run_depend>actionlib</run_depend> | ||
| <run_depend>actionlib_msgs</run_depend> | ||
| <run_depend>control_msgs</run_depend> | ||
| <run_depend>industrial_msgs</run_depend> | ||
| <run_depend>industrial_robot_client</run_depend> | ||
| <run_depend>industrial_utils</run_depend> | ||
| <run_depend>motoman_msgs</run_depend> | ||
| <run_depend>roscpp</run_depend> | ||
| <run_depend>sensor_msgs</run_depend> | ||
| <run_depend>simple_message</run_depend> | ||
| <run_depend>std_msgs</run_depend> | ||
| <run_depend>std_srvs</run_depend> | ||
| <run_depend>trajectory_msgs</run_depend> | ||
| <run_depend>urdf</run_depend> | ||
| <test_depend>roslint</test_depend> | ||
|
|
||
| <export> | ||
| </export> | ||
| <depend>actionlib</depend> | ||
| <depend>actionlib_msgs</depend> | ||
| <depend>control_msgs</depend> | ||
| <depend>industrial_msgs</depend> | ||
| <depend>industrial_robot_client</depend> | ||
| <depend>industrial_utils</depend> | ||
| <depend>motoman_msgs</depend> | ||
| <depend>roscpp</depend> | ||
| <depend>sensor_msgs</depend> | ||
| <depend>simple_message</depend> | ||
| <depend>std_msgs</depend> | ||
| <depend>std_srvs</depend> | ||
| <depend>trajectory_msgs</depend> | ||
| <depend>urdf</depend> | ||
| </package> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
|
|
||
| <package> | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>motoman_mh5_support</name> | ||
| <version>0.3.5</version> | ||
| <description> | ||
|
|
@@ -32,16 +32,16 @@ | |
| <author>Shaun Edwards</author> | ||
| <maintainer email="[email protected]"/> | ||
| <license>BSD</license> | ||
| <url type="website">http://ros.org/wiki/motoman_mh5_support</url> | ||
| <url type="website">http://wiki.ros.org/motoman_mh5_support</url> | ||
| <url type="bugtracker">https://github.com/ros-industrial/motoman/issues</url> | ||
| <url type="repository">https://github.com/ros-industrial/motoman</url> | ||
| <buildtool_depend>catkin</buildtool_depend> | ||
| <build_depend>roslaunch</build_depend> | ||
| <run_depend>motoman_driver</run_depend> | ||
| <run_depend>robot_state_publisher</run_depend> | ||
| <run_depend>rviz</run_depend> | ||
| <run_depend>joint_state_publisher</run_depend> | ||
| <run_depend>xacro</run_depend> | ||
| <test_depend>roslaunch</test_depend> | ||
| <exec_depend>joint_state_publisher</exec_depend> | ||
| <exec_depend>motoman_driver</exec_depend> | ||
| <exec_depend>robot_state_publisher</exec_depend> | ||
| <exec_depend>rviz</exec_depend> | ||
| <exec_depend>xacro</exec_depend> | ||
| <export> | ||
| <architecture_independent/> | ||
| </export> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,43 @@ | ||
| cmake_minimum_required(VERSION 2.8.3) | ||
| project(motoman_msgs) | ||
|
|
||
| find_package(catkin REQUIRED COMPONENTS std_msgs trajectory_msgs industrial_msgs genmsg message_generation) | ||
| find_package(catkin | ||
| REQUIRED COMPONENTS | ||
| industrial_msgs | ||
| message_generation | ||
| std_msgs | ||
| trajectory_msgs | ||
| ) | ||
|
|
||
| add_message_files( | ||
| DIRECTORY | ||
| msg | ||
| FILES | ||
| DynamicJointsGroup.msg | ||
| DynamicJointPoint.msg | ||
| DynamicJointTrajectory.msg | ||
| DynamicJointState.msg | ||
| DynamicJointTrajectoryFeedback.msg | ||
| ) | ||
| DynamicJointPoint.msg | ||
| DynamicJointsGroup.msg | ||
| DynamicJointState.msg | ||
| DynamicJointTrajectory.msg | ||
| DynamicJointTrajectoryFeedback.msg | ||
| ) | ||
|
|
||
| add_service_files( | ||
| DIRECTORY | ||
| srv | ||
| FILES | ||
| CmdJointTrajectoryEx.srv | ||
| ) | ||
| CmdJointTrajectoryEx.srv | ||
| ) | ||
|
|
||
| generate_messages( | ||
| DEPENDENCIES trajectory_msgs std_msgs industrial_msgs | ||
| DEPENDENCIES | ||
| industrial_msgs | ||
| std_msgs | ||
| trajectory_msgs | ||
| ) | ||
|
|
||
| catkin_package( | ||
| CATKIN_DEPENDS message_runtime std_msgs trajectory_msgs industrial_msgs genmsg | ||
| CATKIN_DEPENDS | ||
| industrial_msgs | ||
| message_runtime | ||
| std_msgs | ||
| trajectory_msgs | ||
| ) |
Oops, something went wrong.