Skip to content

Commit 3e758b1

Browse files
author
Felix Exner
committed
Merge remote-tracking branch 'origin/main' into force_mode_arguments
2 parents b454a76 + 8f2dfa9 commit 3e758b1

File tree

65 files changed

+1967
-729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1967
-729
lines changed

.github/workflows/update-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# Create pull request
2929
- name: Create pull-request
3030
id: cpr
31-
uses: peter-evans/create-pull-request@v6
31+
uses: peter-evans/create-pull-request@v7
3232
with:
3333
branch: update-ci/pre-commit-autoupdate
3434
delete-branch: true

.pre-commit-config.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
repos:
1616
# Standard hooks
1717
- repo: https://github.com/pre-commit/pre-commit-hooks
18-
rev: v4.6.0
18+
rev: v5.0.0
1919
hooks:
2020
- id: check-added-large-files
2121
- id: check-ast
@@ -33,13 +33,13 @@ repos:
3333

3434
# Python hooks
3535
- repo: https://github.com/asottile/pyupgrade
36-
rev: v3.16.0
36+
rev: v3.17.0
3737
hooks:
3838
- id: pyupgrade
3939
args: [--py36-plus]
4040

4141
- repo: https://github.com/psf/black
42-
rev: 24.4.2
42+
rev: 24.8.0
4343
hooks:
4444
- id: black
4545
args: ["--line-length=100"]
@@ -51,7 +51,7 @@ repos:
5151
args: ["--ignore=D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D401,D404"]
5252

5353
- repo: https://github.com/pycqa/flake8
54-
rev: 7.1.0
54+
rev: 7.1.1
5555
hooks:
5656
- id: flake8
5757
args: ["--ignore=E501,W503"]
@@ -69,7 +69,7 @@ repos:
6969
- id: ament_cppcheck
7070
name: ament_cppcheck
7171
description: Static code analysis of C/C++ files.
72-
stages: [commit]
72+
stages: [pre-commit]
7373
entry: env AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS=1 ament_cppcheck
7474
language: system
7575
files: \.(h\+\+|h|hh|hxx|hpp|cuh|c|cc|cpp|cu|c\+\+|cxx|tpp|txx)$
@@ -80,7 +80,7 @@ repos:
8080
- id: ament_cpplint
8181
name: ament_cpplint
8282
description: Static code analysis of C/C++ files.
83-
stages: [commit]
83+
stages: [pre-commit]
8484
entry: ament_cpplint
8585
language: system
8686
files: \.(h\+\+|h|hh|hxx|hpp|cuh|c|cc|cpp|cu|c\+\+|cxx|tpp|txx)$
@@ -102,7 +102,7 @@ repos:
102102
- id: ament_lint_cmake
103103
name: ament_lint_cmake
104104
description: Check format of CMakeLists.txt files.
105-
stages: [commit]
105+
stages: [pre-commit]
106106
entry: ament_lint_cmake
107107
language: system
108108
files: CMakeLists.txt$
@@ -113,14 +113,14 @@ repos:
113113
- id: ament_copyright
114114
name: ament_copyright
115115
description: Check if copyright notice is available in all files.
116-
stages: [commit]
116+
stages: [pre-commit]
117117
entry: ament_copyright
118118
language: system
119119
args: ['--exclude', 'ur_robot_driver/doc/conf.py', 'ur_calibration/doc/conf.py']
120120

121121
# Docs - RestructuredText hooks
122122
- repo: https://github.com/PyCQA/doc8
123-
rev: v1.1.1
123+
rev: v1.1.2
124124
hooks:
125125
- id: doc8
126126
args: ['--max-line-length=100', '--ignore=D001']

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Universal Robots ROS2 Driver
22

33
Universal Robots has become a dominant supplier of lightweight, robotic manipulators for industry, as well as for scientific research and education.
4-
<center><img src="ur_robot_driver/doc/installation/initial_setup_images/e-Series.jpg" alt="Universal Robot e-Series family" style="width: 80%;"/></center>
4+
<center><img src="ur_robot_driver/doc/installation/initial_setup_images/family_photo.png" alt="Universal Robot family" style="width: 80%;"/></center>
55

66
This is one of the very first ROS2 manipulator drivers. Some of the new features are enabled by ROS2 and include decreased latency, improved security, and more flexibility regarding middleware configuration. The package contains launch files to quickly get started using the driver as a standalone version or in combination with MoveIt2
77

88
This driver is developed on top of [Universal_Robots_Client_Library](https://github.com/UniversalRobots/Universal_Robots_Client_Library) and support some key cobot functionalities like; pause at emergency stop, safeguard stop, automatic speed scaling to avoid violate the safety setting and manually speed scaling from the teach pendant. In addition the externalControl URCap makes it possible to include ROS2 behaviors in the robot program.
99

10-
The driver is compatible across the entire line of UR robots -- from 3 kg payload to 16 kg payload and includes both the CB3 and the E-series.
10+
The driver is compatible across the entire line of UR robots -- from 3 kg payload to 30 kg payload and includes all robots from the CB3 series and newer.
1111

1212

1313
Check also [presentations and videos](ur_robot_driver/doc/resources/README.md) about this driver.
@@ -93,6 +93,8 @@ receive no more updates and may be lacking features.
9393

9494
Please see the [requirements for the Universal_Robots_Client_Library](https://github.com/UniversalRobots/Universal_Robots_Client_Library#requirements), as this driver is build on top of Universal_Robots_Client_Library.
9595

96+
**Note**: A fundamental requirement for the driver is using Linux. Currently, there is no support for any other OS.
97+
9698
## Getting Started
9799

98100
For getting started, you'll basically need three steps:

Universal_Robots_ROS2_Driver-not-released.humble.repos

Lines changed: 0 additions & 6 deletions
This file was deleted.

Universal_Robots_ROS2_Driver-not-released.iron.repos

Lines changed: 0 additions & 6 deletions
This file was deleted.

Universal_Robots_ROS2_Driver.galactic.repos

Lines changed: 0 additions & 25 deletions
This file was deleted.

Universal_Robots_ROS2_Driver.humble.repos

Lines changed: 0 additions & 29 deletions
This file was deleted.

Universal_Robots_ROS2_Driver.iron.repos

Lines changed: 0 additions & 29 deletions
This file was deleted.

Universal_Robots_ROS2_Driver.jazzy.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories:
1010
ur_msgs:
1111
type: git
1212
url: https://github.com/ros-industrial/ur_msgs.git
13-
version: foxy-devel
13+
version: humble-devel
1414
ros2_control:
1515
type: git
1616
url: https://github.com/ros-controls/ros2_control.git

Universal_Robots_ROS2_Driver.rolling.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories:
1010
ur_msgs:
1111
type: git
1212
url: https://github.com/ros-industrial/ur_msgs.git
13-
version: foxy-devel
13+
version: humble-devel
1414
ros2_control:
1515
type: git
1616
url: https://github.com/ros-controls/ros2_control.git

0 commit comments

Comments
 (0)