Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Update the robot state helper for ROS2 #6

Closed
wants to merge 41 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
3822b11
Move pkgs that will not be initially ported into a subfolder
Oct 30, 2020
e66c9d8
Add ur5_moveit_config, ur_bringup, ur_description pkgs
Oct 30, 2020
30b0043
Change pkg versions to 0.0.0
Oct 30, 2020
fb5b300
Update CMakeLists and package.xml for:
Oct 30, 2020
e3909d8
COLCON_IGNORE deprecated pkgs
Nov 1, 2020
1d282b4
Clean out ur_controllers, it needs a complete rewrite
Nov 2, 2020
c8f9bd7
Add a copy of the ROS1 ur_client_library
Nov 2, 2020
fd6c65a
COLCON_IGNORE ur_client_library (will build with CMake instead)
Nov 2, 2020
a037c66
Initial work toward compiling ur_robot_driver
Nov 3, 2020
a2b78aa
Delete all launch/config files with no UR5 relation
Nov 3, 2020
cc16d40
Compile ur_dashboard_msgs for ROS2
Nov 3, 2020
ae73b91
Clean out ur_robot_driver for initial ROS2 compilation
Nov 3, 2020
48ed68a
Update package.xml files so `ros2 pkg list` shows all pkgs
Nov 4, 2020
f414683
Simplify ur_description URDF, eliminate parsing
Nov 4, 2020
7850f61
Merge pull request #1 from PickNikRobotics/andyz/fixup_package_xml
Nov 5, 2020
9c7c674
Update packaging for ROS2
zultron Nov 3, 2020
9fb6dcd
Add moveit_ci config and update .rosinstall
zultron Nov 5, 2020
b46015a
Silence `ament_lint_cmake` errors
zultron Nov 5, 2020
5b78d5d
.travis.yml: Disable `-Werror`
zultron Nov 5, 2020
4340011
Add XML schema to all `package.xml` files
zultron Nov 5, 2020
68e4b24
ur_client_library: Remove `catkin` from `CMakeLists`
zultron Nov 6, 2020
b426d68
Add `.dir-locals.el` setting `cmake-mode` vars
zultron Nov 6, 2020
c0f827a
Reset `ur_client_library` to 0.0.0
zultron Nov 6, 2020
abaa258
Remove deprecated, unused `ur_calibration` package
zultron Nov 6, 2020
23bcfbe
README: Update build instructions
zultron Nov 6, 2020
8458a73
Disable `moveit2` source build in CI config
zultron Nov 6, 2020
b26a99e
Revert "Disable `moveit2` source build in CI config"
zultron Nov 6, 2020
1c3972d
Use a fork of UR_Client_Library rather than copy/pasting into this repo
Nov 7, 2020
b584d29
Remove ur5_moveit_config from CI, remove moveit stuff from .repos.yaml
Nov 7, 2020
9e2a018
Comment MoveIt2 deps until debians are available
Nov 8, 2020
1563c56
Ignore -Wredundant-decls warnings in CI testing
Nov 8, 2020
3d56e3f
Delete controller_stopper and ur_bringup pkgs
Nov 9, 2020
458b60d
Load UR5 SRDF too
Nov 10, 2020
5f6fd85
Add move_group launch file
Nov 10, 2020
79cd4f2
Hardware interface framework (#3)
Nov 10, 2020
5de42f6
Add robot_state_helper into build process. Prepare for additionl refa…
livanov93 Nov 12, 2020
29e9853
Initialize service client in the helper constructor.
livanov93 Nov 12, 2020
938ff95
Prepare set mode action server.
livanov93 Nov 12, 2020
4d03bb0
Create separate cbs for accept, cancel and receive goal.
livanov93 Nov 13, 2020
7511a23
Remove build folder.
livanov93 Nov 13, 2020
6eec8a9
Comment goal and preempt callbacks for simple action client option.
livanov93 Nov 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .dir-locals.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(
(nil . ())
;; Silence `ament_lint_cmake` errors
(cmake-mode . (
;; Tab found; please use spaces [whitespace/tabs]
(indent-tabs-mode . nil)
;; Lines should be <= 80 characters long [linelength]
(fill-column . 80)
;; Line ends in whitespace [whitespace/eol]
(show-trailing-whitespace . t)
))
)
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ install_manifest.txt
*~
.idea
.directory
.vscode
.vscode
.moveit_ci/
34 changes: 34 additions & 0 deletions .repos.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
repositories:
control_msgs:
type: git
url: https://github.com/ros-controls/control_msgs.git
version: foxy-devel
geometric_shapes:
type: git
url: https://github.com/ros-planning/geometric_shapes.git
version: ros2
realtime_tools:
type: git
url: https://github.com/ros-controls/realtime_tools.git
version: foxy-devel
ros2_control:
type: git
url: https://github.com/ros-controls/ros2_control.git
version: master
ros2_controllers:
type: git
url: https://github.com/ros-controls/ros2_controllers.git
version: master
srdfdom:
type: git
url: https://github.com/ros-planning/srdfdom.git
version: ros2
ur_client_library:
type: git
url: https://github.com/PickNikRobotics/Universal_Robots_Client_Library.git
version: foxy-devel
warehouse_ros:
type: git
url: https://github.com/ros-planning/warehouse_ros.git
version: ros2

49 changes: 49 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# This config file for Travis CI utilizes https://github.com/ros-planning/moveit_ci/ package.
sudo: required
dist: trusty
services:
- docker
language: cpp
compiler: gcc
cache: ccache

notifications:
email:
recipients:
- zelenak@picknik.ai

env:
global: # default values that are common to all configurations (can be overriden below)
- ROS_DISTRO=foxy # ROS distro to test for
- ROS_REPO=ros # ROS binary repository [ros | ros-shadow-fixed]
- TEST_BLACKLIST=ur5_moveit_config # list packages, for which to skip the unittests
- UPSTREAM_WORKSPACE=.repos.yaml # pull in packages from a local
- WARNINGS_OK=false # Don't accept warnings [true | false]
# TODO(andyz): -Werror disabled because of compiler warnings
# in geometric_shapes ("redundant redeclaration of ‘void
# qh_[...]’")
# TODO(andyz): -Wredundant-decls disabled because of compiler warnings
# See https://github.com/ros2/rosidl_typesupport_fastrtps/issues/28
- CXXFLAGS="-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-unused-function"

jobs:
fast_finish: true
include:
- name: "[Foxy] - clang-format, ament_lint"
env: TEST="clang-format ament_lint"
# - name: "[Foxy] - code-coverage"
# env: TEST=code-coverage
- name: "[Foxy] - gcc (build,test)"
env: ROS_DISTRO=foxy
- name: "[Foxy] - clang (build,test,clang-tidy-fix)"
compiler: clang
env: TEST=clang-tidy-fix
CXXFLAGS="-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-overloaded-virtual"

before_script:
# Clone the moveit_ci repository into Travis' workspace
- git clone --depth 1 -q https://github.com/ros-planning/moveit_ci.git -b ros2 .moveit_ci

script:
# Run the test script
- .moveit_ci/travis.sh
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,20 @@
# Universal Robots ROS2 Driver

Alpha version of the ROS2 Universal Robots driver. Should be transferred to the Universal Robots org when ready.

## Build Instructions

To build this package in a ROS Foxy workspace, clone this repo
into the `src/` directory, then:

```
# Clone source-based dependencies into src/ directory
vcs import --skip-existing --input src/Universal_Robots_ROS2_Driver/.repos.yaml src

# Install package-based dependencies
rosdep install -y --rosdistro $ROS_DISTRO --ignore-src --from-paths src

# Build sources
source /opt/ros/$ROS_DISTRO/setup.bash
colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release
```
202 changes: 0 additions & 202 deletions controller_stopper/CMakeLists.txt

This file was deleted.

Loading