Merge pull request #617 from ros-industrial/melodic-devel-staging

Melodic devel staging
ros-industrial · Nov 10, 2022 · 9238b2c · 9238b2c
2 parents c8c27c1 + 40e21b1
commit 9238b2c
Show file tree

Hide file tree

Showing 503 changed files with 9,797 additions and 9,366 deletions.
diff --git a/.github/workflows/ci_bionic.yml b/.github/workflows/ci_bionic.yml
@@ -0,0 +1,46 @@
+name: CI - Ubuntu Bionic
+
+on:
+  # direct pushes to protected branches are not supported
+  pull_request:
+  # run every day, at 7am UTC
+  schedule:
+    - cron: '0 7 * * *'
+  # allow manually starting this workflow
+  workflow_dispatch:
+
+jobs:
+  industrial_ci:
+    name: ROS Melodic (${{ matrix.ros_repo }})
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ros_distro: [ melodic ]
+        ros_repo: [ main, testing ]
+
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
+
+    steps:
+      - name: Fetch repository
+        uses: actions/checkout@v2
+
+      - name: ccache cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          # we always want the ccache cache to be persisted, as we cannot easily
+          # determine whether dependencies have changed, and ccache will manage
+          # updating the cache for us. Adding 'run_id' to the key will force an
+          # upload at the end of the job.
+          key: ccache-${{ matrix.ros_distro }}-${{ matrix.ros_repo }}-${{github.run_id}}
+          restore-keys: |
+            ccache-${{ matrix.ros_distro }}-${{ matrix.ros_repo }}
+
+      - name: Run industrial_ci
+        uses: ros-industrial/industrial_ci@master
+        env:
+          ROS_DISTRO: ${{ matrix.ros_distro }}
+          ROS_REPO: ${{ matrix.ros_repo }}
diff --git a/.github/workflows/ci_focal.yml b/.github/workflows/ci_focal.yml
@@ -0,0 +1,46 @@
+name: CI - Ubuntu Focal
+
+on:
+  # direct pushes to protected branches are not supported
+  pull_request:
+  # run every day, at 7am UTC
+  schedule:
+    - cron: '0 7 * * *'
+  # allow manually starting this workflow
+  workflow_dispatch:
+
+jobs:
+  industrial_ci:
+    name: ROS Noetic (${{ matrix.ros_repo }})
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ros_distro: [ noetic ]
+        ros_repo: [ main, testing ]
+
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
+
+    steps:
+      - name: Fetch repository
+        uses: actions/checkout@v2
+
+      - name: ccache cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          # we always want the ccache cache to be persisted, as we cannot easily
+          # determine whether dependencies have changed, and ccache will manage
+          # updating the cache for us. Adding 'run_id' to the key will force an
+          # upload at the end of the job.
+          key: ccache-${{ matrix.ros_distro }}-${{ matrix.ros_repo }}-${{github.run_id}}
+          restore-keys: |
+            ccache-${{ matrix.ros_distro }}-${{ matrix.ros_repo }}
+
+      - name: Run industrial_ci
+        uses: ros-industrial/industrial_ci@master
+        env:
+          ROS_DISTRO: ${{ matrix.ros_distro }}
+          ROS_REPO: ${{ matrix.ros_repo }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,21 @@
+ROS-Industrial is a community project. We welcome contributions from any source, from those who are extremely active to casual users. The following sections outline the steps on how to contribute to ROS-Industrial. It assumes there is an existing repository to which one would like to contribute (item 1 in the figure above) and one is familiar with the Git "Fork and Branch" workflow, detailed [here](http://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/).
+
+1. Before any development is undertaken, a contributor would communicate a need and/or issue to the ROS-Industrial community. This can be done by submitting an issue on the appropriate GitHub repo, the [issues repo](https://github.com/ros-industrial/ros_industrial_issues), or by posting a message in the [ROS-Industrial category on ROS Discourse](//swri-ros-pkg-dev@googlegroups.com). . Doing so may save you time if similar development is underway and ensure that whatever approach you take is acceptable to the community of reviewers once it is submitted.
+2. The second step (item 2) is to implement your change. If you are working on a code contribution, we highly recommend you utilize the [ROS Qt-Creator Plug-in](http://rosindustrial.org/news/2016/6/9/ros-qt-ide-plugin). Verify that your change successfully builds and passes all tests.
+3. Next, push your changes to a "feature" branch in your personal fork of the repo and issue a pull request (PR)(item 3). The PR allows maintainers to review the submitted code. Before the PR can be accepted, the maintainer and contributor must agree that the contribution is implemented appropriately. This process can take several back-and-forth steps (see [example](https://github.com/ros-industrial/motoman/pull/89)). Contributors should expect to spend as much time reviewing/changing the code as on the initial implementation. This time can be minimized by communicating with the ROS-Industrial community before any contribution is made.
+4. Issuing a Pull Request (PR) triggers the [Travis Continuous Integrations (CI)](https://github.com/ros-industrial/industrial_ci) step (item 4) which happens automatically in the background. The Travis CI performs several operations, and if any of the steps below fail, then the PR is marked accordingly for the maintainer.
+  * Travis Workflow:
+    * Installs a barebones ROS distribution on a fresh Ubuntu virtual machine.
+    * Creates a catkin workspace and puts the repository in it.
+    * Uses wstool to check out any from-source dependencies (i.e. other repositories).
+    * Resolves package dependencies using rosdep (i.e. install packages using apt-get).
+    * Compiles the catkin workspace.
+    * Runs all available unit tests.
+5. If the PR passes Travis CI and one of the maintainers is satisfied with the changes, they post a +1 as a comment on the PR (item 5). The +1 signifies that the PR is ready to be merged. All PRs require at least one +1 and pass Travis CI before it can be merged.
+6. The next step (item 6) is for the PR to be merged into the main branch. This is done through the GitHub web interface by selecting the “Merge pull request” button. After the PR is merged, all status badges are updated automatically.
+7. Periodically, the maintainer will release the package (item 7), which then gets sent to the [ROS Build Farm](http://wiki.ros.org/build.ros.org) for Debian creation.
+8. The publishing of the released packages (item 8) is managed by OSRF and is not on a set schedule. This usually happens when all packages for a given distro are built successfully and stable. The current status for the distro kinetic can be found [here](http://repositories.ros.org/status_page/ros_kinetic_default.html) . Navigating to other distros can be done by changing the distro name in the link.
+9. Once the package has been published, it is available to be installed by the developer (item 9).
+10. After the install of a new version, the developer may have questions, experience issues or it may not have the necessary functionality which should all be reported on the packages GitHub repository as an issue (item 10). If an issue is identified or there is missing functionality that the developer requires, the cycle starts back at (item 2).
+
+For more details, please refer to the [ROS-I wiki](http://wiki.ros.org/Industrial/DevProcess).
diff --git a/README.md b/README.md
@@ -1,12 +1,14 @@
 # Universal Robot
 
-[![Build Status](http://build.ros.org/job/Kdev__universal_robot__ubuntu_xenial_amd64/badge/icon)](http://build.ros.org/job/Kdev__universal_robot__ubuntu_xenial_amd64)
+[![Build Status: Ubuntu Bionic (Actions)](https://github.com/ros-industrial/universal_robot/workflows/CI%20-%20Ubuntu%20Bionic/badge.svg?branch=melodic-devel)](https://github.com/ros-industrial/universal_robot/actions?query=workflow%3A%22CI+-+Ubuntu+Bionic%22)
+[![Build Status: Ubuntu Focal (Actions)](https://github.com/ros-industrial/universal_robot/workflows/CI%20-%20Ubuntu%20Focal/badge.svg?branch=melodic-devel)](https://github.com/ros-industrial/universal_robot/actions?query=workflow%3A%22CI+-+Ubuntu+Focal%22)
+
 [![license - apache 2.0](https://img.shields.io/:license-Apache%202.0-yellowgreen.svg)](https://opensource.org/licenses/Apache-2.0)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
 [![support level: community](https://img.shields.io/badge/support%20level-community-lightgray.png)](http://rosindustrial.org/news/2016/10/7/better-supporting-a-growing-ros-industrial-software-platform)
 
-[ROS-Industrial](http://wiki.ros.org/Industrial) Universal Robot meta-package. See the [ROS wiki](http://wiki.ros.org/universal_robot) page for compatibility information and other more information.
+[ROS-Industrial](https://wiki.ros.org/Industrial) Universal Robot meta-package. See the [ROS wiki](https://wiki.ros.org/universal_robots) page for compatibility information and other more information.
 
 
 __Installation__
@@ -16,24 +18,24 @@ There are two different ways to install the packages in this repository. The fol
 
 ___Using apt (Ubuntu, Debian)___
 
-On supported Linux distributions (Ubuntu, up to 16.04 (Xenial), `i386` and `amd64`) and ROS versions:
+On supported Linux distributions (Ubuntu, 18.04 (Bionic) and 20.04 (Focal), `i386` and `amd64`) and ROS versions:
 
 ```
 sudo apt-get install ros-$ROS_DISTRO-universal-robot
 ```
 
-replace `$ROS_DISTRO` with `hydro`, `indigo` or `kinetic`, depending on which ROS version you have installed.
+replace `$ROS_DISTRO` with `melodic` or `noetic`, depending on which ROS version you have installed.
 
 
 ___Building from Source___
 
-There are releases available for ROS Hydro, Indigo and Kinetic. However, for the latest features and developments you might want to build the packages from source.
+There *will soon be* releases available for ROS Melodic and Noetic. However, for the latest features and developments you might want to build the packages from source.
 
 **NOTE**: please prefer using the binary release (see previous section) over building from source where possible. Source installs will not be automatically updated by new package releases and require more work to setup.
 
-The following instructions assume that a [Catkin workspace](http://wiki.ros.org/catkin/Tutorials/create_a_workspace) has been created at `$HOME/catkin_ws` and that the source space is at `$HOME/catkin_ws/src`. Update paths appropriately if they are different on the build machine.
+The following instructions assume that a [Catkin workspace](https://wiki.ros.org/catkin/Tutorials/create_a_workspace) has been created at `$HOME/catkin_ws` and that the source space is at `$HOME/catkin_ws/src`. Update paths appropriately if they are different on the build machine.
 
-In all other cases the packages will have to be build from sources in a Catkin workspace: 
+In all other cases the packages will have to be build from sources in a Catkin workspace:
 
 ```
 cd $HOME/catkin_ws/src
@@ -58,73 +60,48 @@ source $HOME/catkin_ws/devel/setup.bash
 __Usage__
 
 ___With real Hardware___
-There are launch files available to bringup a real robot - either UR5 or UR10.  
-In the following the commands for the UR5 are given. For the UR10, simply replace the prefix accordingly.
-
-Don't forget to source the correct setup shell files and use a new terminal for each command!   
-
-To bring up the real robot, run:
 
-```roslaunch ur_bringup ur5_bringup.launch robot_ip:=IP_OF_THE_ROBOT [reverse_port:=REVERSE_PORT]```
+For using real hardware, please use the
+[`ur_robot_driver`](https://github.com/UniversalRobots/Universal_Robots_ROS_Driver). Installation
+and startup instructions are available there separately.
 
+If you have a particular old robot running Software CB1 or CB2, please use the
+[`ur_modern_driver`](https://github.com/ros-industrial/ur_modern_driver) instead.
 
-CAUTION:  
+CAUTION:
 Remember that you should always have your hands on the big red button in case there is something in the way or anything unexpected happens.
 
+___MoveIt! with real Hardware___
+Additionally, you can use MoveIt! to control the robot.
+There exist MoveIt! configuration packages for all robots.
 
-___MoveIt! with real Hardware___  
-Additionally, you can use MoveIt! to control the robot.  
-There exist MoveIt! configuration packages for both robots.  
+In the following the commands for the UR5 are given. For other robots, simply replace the prefix accordingly.
 
-For setting up the MoveIt! nodes to allow motion planning run:
+For setting up the MoveIt! nodes to allow motion planning run e.g.:
 
-```roslaunch ur5_moveit_config ur5_moveit_planning_execution.launch```
+```roslaunch ur5_moveit_config moveit_planning_execution.launch```
 
 For starting up RViz with a configuration including the MoveIt! Motion Planning plugin run:
 
-```roslaunch ur5_moveit_config moveit_rviz.launch config:=true```
-
-
-NOTE:  
-As MoveIt! seems to have difficulties with finding plans for the UR with full joint limits [-2pi, 2pi], there is a joint_limited version using joint limits restricted to [-pi,pi]. In order to use this joint limited version, simply use the launch file arguments 'limited', i.e.:  
-
-```roslaunch ur_bringup ur5_bringup.launch limited:=true robot_ip:=IP_OF_THE_ROBOT [reverse_port:=REVERSE_PORT]```
-
-```roslaunch ur5_moveit_config ur5_moveit_planning_execution.launch limited:=true```
-
-```roslaunch ur5_moveit_config moveit_rviz.launch config:=true```
+```roslaunch ur5_moveit_config moveit_rviz.launch```
 
+___Usage with Gazebo Simulation___
+There are launch files available to bringup a simulated robot.
 
-___Usage with Gazebo Simulation___  
-There are launch files available to bringup a simulated robot - either UR5 or UR10.  
-In the following the commands for the UR5 are given. For the UR10, simply replace the prefix accordingly.
-
-Don't forget to source the correct setup shell files and use a new terminal for each command!   
+Don't forget to source the correct setup shell files and use a new terminal for each command!
 
 To bring up the simulated robot in Gazebo, run:
 
-```roslaunch ur_gazebo ur5.launch```
+```roslaunch ur_gazebo ur5_bringup.launch```
 
 
-___MoveIt! with a simulated robot___  
-Again, you can use MoveIt! to control the simulated robot.  
+___MoveIt! with a simulated robot___
+Again, you can use MoveIt! to control the simulated robot.
 
 For setting up the MoveIt! nodes to allow motion planning run:
 
-```roslaunch ur5_moveit_config ur5_moveit_planning_execution.launch sim:=true```
+```roslaunch ur5_moveit_config moveit_planning_execution.launch sim:=true```
 
 For starting up RViz with a configuration including the MoveIt! Motion Planning plugin run:
 
-```roslaunch ur5_moveit_config moveit_rviz.launch config:=true```
-
-
-NOTE:  
-As MoveIt! seems to have difficulties with finding plans for the UR with full joint limits [-2pi, 2pi], there is a joint_limited version using joint limits restricted to [-pi,pi]. In order to use this joint limited version, simply use the launch file arguments 'limited', i.e.:  
-
-```roslaunch ur_gazebo ur5.launch limited:=true```
-
-```roslaunch ur5_moveit_config ur5_moveit_planning_execution.launch sim:=true limited:=true```
-
-```roslaunch ur5_moveit_config moveit_rviz.launch config:=true```
-
-
+```roslaunch ur5_moveit_config moveit_rviz.launch```
diff --git a/universal_robot/CHANGELOG.rst b/universal_robot/CHANGELOG.rst
diff --git a/universal_robot/CMakeLists.txt b/universal_robot/CMakeLists.txt
diff --git a/universal_robot/package.xml b/universal_robot/package.xml
diff --git a/universal_robots/CMakeLists.txt b/universal_robots/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(universal_robots)
 find_package(catkin REQUIRED)
 catkin_metapackage()
diff --git a/universal_robots/package.xml b/universal_robots/package.xml
@@ -20,20 +20,16 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <exec_depend>ur10_e_moveit_config</exec_depend>
+  <exec_depend>ur10e_moveit_config</exec_depend>
   <exec_depend>ur10_moveit_config</exec_depend>
-  <exec_depend>ur3_e_moveit_config</exec_depend>
+  <exec_depend>ur16e_moveit_config</exec_depend>
+  <exec_depend>ur3e_moveit_config</exec_depend>
   <exec_depend>ur3_moveit_config</exec_depend>
-  <exec_depend>ur5_e_moveit_config</exec_depend>
+  <exec_depend>ur5e_moveit_config</exec_depend>
   <exec_depend>ur5_moveit_config</exec_depend>
-  <exec_depend>ur_bringup</exec_depend>
   <exec_depend>ur_description</exec_depend>
-  <exec_depend>ur_driver</exec_depend>
-  <exec_depend>ur_e_description</exec_depend>
-  <exec_depend>ur_e_gazebo</exec_depend>
   <exec_depend>ur_gazebo</exec_depend>
   <exec_depend>ur_kinematics</exec_depend>
-  <exec_depend>ur_msgs</exec_depend>
 
   <export>
     <metapackage/>