Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ros-industrial/easy_manipulation_deployment
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bbe2d529b3f07a3b5c65210ea5803dad87d6963a
Choose a base ref
..
head repository: ros-industrial/easy_manipulation_deployment
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5569e4ef65a43f5f6dc8e9b831c002f6642bef7c
Choose a head ref
Showing with 154 additions and 56 deletions.
  1. +1 −1 assets/end_effectors/onrobot_airpick4/onrobot_airpick4_description/package.xml
  2. +14 −2 assets/end_effectors/onrobot_airpick4/onrobot_airpick4_moveit_config/package.xml
  3. +2 −2 assets/end_effectors/robotiq_3f_gripper/robotiq_3f_gripper_description/package.xml
  4. +14 −2 assets/end_effectors/robotiq_3f_gripper/robotiq_3f_moveit_config/package.xml
  5. +24 −21 assets/end_effectors/robotiq_85_gripper/robotiq_85_description/package.xml
  6. +13 −3 assets/end_effectors/robotiq_85_gripper/robotiq_85_moveit_config/package.xml
  7. +11 −0 assets/end_effectors/single_suction_gripper/single_suction_description/package.xml
  8. +13 −0 assets/end_effectors/single_suction_gripper/single_suction_moveit_config/package.xml
  9. +3 −0 assets/environment/realsense2_description/package.xml
  10. +1 −0 assets/robots/fanuc/fanuc_description/package.xml
  11. +14 −0 assets/robots/fanuc/fanuc_moveit_config/package.xml
  12. +7 −5 easy_manipulation_deployment/emd_demo_nodes/run_dynamic_safety/package.xml
  13. +2 −1 easy_manipulation_deployment/emd_demo_nodes/run_grasp_execution/package.xml
  14. +1 −1 easy_manipulation_deployment/emd_demo_nodes/run_grasp_planner/package.xml
  15. +2 −1 easy_manipulation_deployment/emd_demo_nodes/run_waypoint_execution/package.xml
  16. +9 −4 easy_manipulation_deployment/emd_dynamic_safety/package.xml
  17. +7 −3 easy_manipulation_deployment/emd_grasp_execution/package.xml
  18. +13 −8 easy_manipulation_deployment/emd_grasp_planner/package.xml
  19. +3 −2 easy_manipulation_deployment/emd_waypoint_execution/package.xml
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
<license>BSD</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>dual_gripper</depend>

<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
@@ -18,4 +19,3 @@
<build_type>ament_cmake</build_type>
</export>
</package>

Original file line number Diff line number Diff line change
@@ -14,7 +14,20 @@
<url type="bugtracker">https://github.com/ros-planning/moveit_setup_assistant/issues</url>
<url type="repository">https://github.com/ros-planning/moveit_setup_assistant</url>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake</buildtool_depend>
<depend>joint_state_publisher</depend>
<depend>joy</depend>
<depend>moveit_ros_benchmarks</depend>
<depend>moveit_ros_move_group</depend>
<depend>moveit_ros_visualization</depend>
<depend>moveit_ros_warehouse</depend>
<depend>moveit_setup_assistant</depend>
<depend>robot_state_publisher</depend>
<depend>robotiq_85_description</depend>
<depend>robotiq_85_moveit_config</depend>
<depend>rviz</depend>
<depend>warehouse_ros</depend>
<depend>xacro</depend>

<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
@@ -26,4 +39,3 @@
<build_type>ament_cmake</build_type>
</export>
</package>

Original file line number Diff line number Diff line change
@@ -10,6 +10,8 @@
<license>BSD</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>robotiq_3f_gripper_visualization</depend>
<depend>xacro</depend>

<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
@@ -18,5 +20,3 @@
<build_type>ament_cmake</build_type>
</export>
</package>


Original file line number Diff line number Diff line change
@@ -14,7 +14,20 @@
<url type="bugtracker">https://github.com/ros-planning/moveit_setup_assistant/issues</url>
<url type="repository">https://github.com/ros-planning/moveit_setup_assistant</url>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake</buildtool_depend>
<depend>joint_state_publisher</depend>
<depend>joy</depend>
<depend>moveit_ros_benchmarks</depend>
<depend>moveit_ros_move_group</depend>
<depend>moveit_ros_visualization</depend>
<depend>moveit_ros_warehouse</depend>
<depend>moveit_setup_assistant</depend>
<depend>robot_state_publisher</depend>
<depend>robotiq_85_description</depend>
<depend>robotiq_85_moveit_config</depend>
<depend>rviz</depend>
<depend>warehouse_ros</depend>
<depend>xacro</depend>

<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
@@ -26,4 +39,3 @@
<build_type>ament_cmake</build_type>
</export>
</package>

Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
<?xml version="1.0"?>
<package format="3">
<name>robotiq_85_description</name>
<version>0.6.4</version>

<description>Stanley Innovation Robotiq 85 Visual Models</description>
<maintainer email="dev@stanleyinnovation.com">Patrick Hussey</maintainer>
<author>Patrick Hussey</author>

<license>BSD</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>

<?xml version="1.0"?>
<package format="3">
<name>robotiq_85_description</name>
<version>0.6.4</version>

<description>Stanley Innovation Robotiq 85 Visual Models</description>
<maintainer email="dev@stanleyinnovation.com">Patrick Hussey</maintainer>
<author>Patrick Hussey</author>

<license>BSD</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>joint_state_publisher</depend>
<depend>robot_state_publisher</depend>
<depend>rviz</depend>
<depend>xacro</depend>

<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>
Original file line number Diff line number Diff line change
@@ -14,16 +14,26 @@
<url type="bugtracker">https://github.com/ros-planning/moveit_setup_assistant/issues</url>
<url type="repository">https://github.com/ros-planning/moveit_setup_assistant</url>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake</buildtool_depend>
<depend>joint_state_publisher</depend>
<depend>joy</depend>
<depend>moveit_ros_benchmarks</depend>
<depend>moveit_ros_move_group</depend>
<depend>moveit_ros_visualization</depend>
<depend>moveit_ros_warehouse</depend>
<depend>moveit_setup_assistant</depend>
<depend>robot_state_publisher</depend>
<depend>robotiq_85_description</depend>
<depend>rviz</depend>
<depend>warehouse_ros</depend>
<depend>xacro</depend>

<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
<exec_depend>xacro</exec_depend>
<build_depend>robotiq_85_description</build_depend>
<exec_depend>robotiq_85_description</exec_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>

Original file line number Diff line number Diff line change
@@ -15,6 +15,17 @@
<url type="repository">https://github.com/ros-planning/moveit-resources</url>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>double_fixture</depend>
<depend>dual_gripper</depend>
<depend>gazebo_ros</depend>
<depend>joint_state_publisher</depend>
<depend>mounting_kit</depend>
<depend>robot_state_publisher</depend>
<depend>robotiq_85_description</depend>
<depend>rostopic</depend>
<depend>rviz</depend>
<depend>tf</depend>
<depend>ur_description</depend>

<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
Original file line number Diff line number Diff line change
@@ -15,6 +15,19 @@
<url type="repository">https://github.com/ros-planning/moveit-resources</url>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>joint_state_publisher</depend>
<depend>joy</depend>
<depend>moveit_ros_benchmarks</depend>
<depend>moveit_ros_move_group</depend>
<depend>moveit_ros_visualization</depend>
<depend>moveit_ros_warehouse</depend>
<depend>moveit_setup_assistant</depend>
<depend>robot_state_publisher</depend>
<depend>robotiq_85_description</depend>
<depend>robotiq_85_moveit_config</depend>
<depend>rviz</depend>
<depend>warehouse_ros</depend>
<depend>xacro</depend>

<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
3 changes: 3 additions & 0 deletions assets/environment/realsense2_description/package.xml
Original file line number Diff line number Diff line change
@@ -13,9 +13,12 @@
<author email="sergey.dorodnicov@intel.com">Sergey Dorodnicov</author>
<author email="doron.hirshberg@intel.com">Doron Hirshberg</author>

<exec_depend>python-rospkg</exec_depend>
<exec_depend>xacro</exec_depend>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>robot_state_publisher</depend>
<depend>rviz</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
1 change: 1 addition & 0 deletions assets/robots/fanuc/fanuc_description/package.xml
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
<url type="repository">https://github.com/ros-planning/moveit-resources</url>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>moveit_resources_fanuc_description</depend>

<export>
<build_type>ament_cmake</build_type>
14 changes: 14 additions & 0 deletions assets/robots/fanuc/fanuc_moveit_config/package.xml
Original file line number Diff line number Diff line change
@@ -20,6 +20,20 @@
<url type="repository">https://github.com/ros-planning/moveit_resources</url>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>controller_manager</depend>
<depend>gazebo_ros</depend>
<depend>joint_state_publisher</depend>
<depend>joy</depend>
<depend>moveit_resources_fanuc_description</depend>
<depend>moveit_resources_fanuc_moveit_config</depend>
<depend>moveit_ros_benchmarks</depend>
<depend>moveit_ros_move_group</depend>
<depend>moveit_ros_visualization</depend>
<depend>moveit_ros_warehouse</depend>
<depend>moveit_setup_assistant</depend>
<depend>robot_state_publisher</depend>
<depend>rviz</depend>
<depend>warehouse_ros_mongo</depend>

<!-- Disabled to avoid circular dependencies with MoveIt packages
depending on moveit_resources for testing -->
Original file line number Diff line number Diff line change
@@ -8,17 +8,19 @@
<license>TODO: License declaration</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<build_depend>moveit_common</build_depend>

<depend>moveit_ros_planning_interface</depend>
<depend>trajectory_msgs</depend>
<build_depend>moveit_common</build_depend>

<exec_depend>controller_manager</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
<exec_depend>tf2_ros</exec_depend>
<exec_depend>rviz2</exec_depend>
<exec_depend>moveit_resources_panda_moveit_config</exec_depend>

<exec_depend>emd_dynamic_safety</exec_depend>
<exec_depend>moveit_resources_panda_moveit_config</exec_depend>
<exec_depend>python-yaml</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
<exec_depend>rviz2</exec_depend>
<exec_depend>tf2_ros</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Original file line number Diff line number Diff line change
@@ -8,9 +8,10 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>rclcpp</depend>

<depend>emd_grasp_execution</depend>
<depend>rclcpp</depend>
<exec_depend>python-yaml</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>rclcpp</depend>

<depend>emd_grasp_planner</depend>
<depend>rclcpp</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Original file line number Diff line number Diff line change
@@ -8,10 +8,11 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>rclcpp</depend>

<depend>emd_grasp_execution</depend>
<depend>emd_waypoint_execution</depend>
<depend>rclcpp</depend>
<exec_depend>python-yaml</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
13 changes: 9 additions & 4 deletions easy_manipulation_deployment/emd_dynamic_safety/package.xml
Original file line number Diff line number Diff line change
@@ -11,19 +11,24 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>joint_trajectory_controller</depend>
<depend>pluginlib</depend>
<depend>pluginlib</depend>

<depend>rclcpp</depend>
<depend>rclcpp_lifecycle</depend>
<depend>realtime_tools</depend>
<depend>pluginlib</depend>
<depend>joint_trajectory_controller</depend>
<depend>sensor_msgs</depend>
<depend>std_msgs</depend>
<depend>trajectory_msgs</depend>
<depend>visualization_msgs</depend>
<test_depend>ament_cmake_gtest</test_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
<test_depend>ament_cmake_gtest</test_depend>
<test_depend>moveit_planners_ompl</test_depend>

<test_depend>moveit_resources_panda_description</test_depend>
<test_depend>moveit_planners_ompl</test_depend>

<export>
<build_type>ament_cmake</build_type>
10 changes: 7 additions & 3 deletions easy_manipulation_deployment/emd_grasp_execution/package.xml
Original file line number Diff line number Diff line change
@@ -9,19 +9,23 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>emd_msgs</depend>
<depend>geometry_msgs</depend>

<depend>moveit_ros_planning_interface</depend>
<depend>emd_msgs</depend>
<depend>rclcpp</depend>
<depend>sensor_msgs</depend>
<depend>shape_msgs</depend>
<depend>trajectory_msgs</depend>
<depend>yaml_cpp_vendor</depend>

<build_depend>pluginlib</build_depend>
<build_depend>tf2</build_depend>
<build_depend>tf2_ros</build_depend>
<depend>yaml_cpp_vendor</depend>
<test_depend>ament_cmake_gtest</test_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
<test_depend>ament_cmake_gtest</test_depend>

<export>
<build_type>ament_cmake</build_type>
21 changes: 13 additions & 8 deletions easy_manipulation_deployment/emd_grasp_planner/package.xml
Original file line number Diff line number Diff line change
@@ -9,28 +9,33 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>rclcpp</depend>
<depend>emd_msgs</depend>
<depend>geometry_msgs</depend>
<depend>geometry_msgs</depend>
<depend>message_filters</depend>
<depend>octomap</depend>
<depend>rclcpp</depend>
<depend>sensor_msgs</depend>
<depend>sensor_msgs</depend>
<depend>geometry_msgs</depend>
<depend>shape_msgs</depend>
<depend>emd_msgs</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
<depend>shape_msgs</depend>
<depend>visualization_msgs</depend>
<build_depend>builtin_interfaces</build_depend>

<build_depend>cv_bridge</build_depend>
<build_depend>libccd-dev</build_depend>
<build_depend>libfcl-dev</build_depend>
<build_depend>libpcl-all-dev</build_depend>
<build_depend>builtin_interfaces</build_depend>
<build_depend>rosidl_default_generators</build_depend>
<build_depend>tf2</build_depend>
<exec_depend>builtin_interfaces</exec_depend>
<exec_depend>rosidl_default_runtime</exec_depend>
<member_of_group>rosidl_interface_packages</member_of_group>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
<member_of_group>rosidl_interface_packages</member_of_group>
</package>
Loading