Skip to content

Commit 81cb58a

Browse files
author
Felix Exner (fexner)
authored
Merge branch 'main' into fix_component_lifecycle
2 parents 1e15980 + 961dedd commit 81cb58a

File tree

62 files changed

+1657
-747
lines changed

Some content is hidden

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

62 files changed

+1657
-747
lines changed

.github/helpers/check_urls.sh

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
IGNORE_FILES=""
6+
IGNORE_PATTERNS=""
7+
8+
while getopts ":f:d:p:" opt; do
9+
case "${opt}" in
10+
f)
11+
IGNORE_FILES="${OPTARG}";;
12+
d)
13+
IGNORE_DIRS="${OPTARG}";;
14+
p)
15+
IGNORE_PATTERNS="${OPTARG}";;
16+
\?)
17+
echo "Invalid option -$OPTARG"
18+
exit;;
19+
esac
20+
done
21+
22+
read -r -a ignore_files <<<"$IGNORE_FILES"
23+
read -r -a ignore_dirs <<<"$IGNORE_DIRS"
24+
read -r -a ignore_patterns <<<"$IGNORE_PATTERNS"
25+
26+
IGNORE_FILES_ARG=""
27+
for item in "${ignore_files[@]}"; do
28+
IGNORE_FILES_ARG="$IGNORE_FILES_ARG --exclude=$item"
29+
done
30+
IGNORE_DIRS_ARG=""
31+
for item in "${ignore_dirs[@]}"; do
32+
IGNORE_DIRS_ARG="$IGNORE_DIRS_ARG --exclude-dir=$item"
33+
done
34+
35+
#Find URLs in code:
36+
urls=$(grep -oP '(http|ftp|https):\/\/([a-zA-Z0-9_-]+(?:(?:\.[a-zA-Z0-9_-]+)+))([a-zA-Z0-9_.,@?^=%&:\/~+#-]*[a-zA-Z0-9_@?^=%&\/~+#-])?' -rI $IGNORE_FILES_ARG $IGNORE_DIRS_ARG)
37+
38+
fail_counter=0
39+
40+
FAILED_LINKS=()
41+
for item in $urls; do
42+
# echo $item
43+
skip=0
44+
for pattern in "${ignore_patterns[@]}"; do
45+
[[ "$item" =~ $pattern ]] && skip=1
46+
done
47+
48+
if [[ $skip == 1 ]]; then
49+
echo "SKIPPING $item"
50+
continue
51+
fi
52+
53+
filename=$(echo "$item" | cut -d':' -f1)
54+
url=$(echo "$item" | cut -d':' -f2-)
55+
echo -n "Checking $url from file $filename"
56+
if ! curl --head --silent --fail "$url" 2>&1 > /dev/null; then
57+
echo -e " \033[0;31mNOT FOUND\033[32m\n"
58+
FAILED_LINKS+=("$url from file $filename")
59+
((fail_counter=fail_counter+1))
60+
else
61+
printf " \033[32mok\033[0m\n"
62+
fi
63+
done
64+
65+
echo "Failed files:"
66+
printf '%s\n' "${FAILED_LINKS[@]}"
67+
exit $fail_counter

.github/workflows/check_links.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Check Links
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
9+
jobs:
10+
check_links:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: Check URLs
15+
run: |
16+
.github/helpers/check_urls.sh \
17+
-d ".git build CMakeModules debian" \
18+
-f "package.xml ursim_docker.rst" \
19+
-p "vnc\.html"

.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: 8 additions & 8 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.17.0
36+
rev: v3.18.0
3737
hooks:
3838
- id: pyupgrade
3939
args: [--py36-plus]
4040

4141
- repo: https://github.com/psf/black
42-
rev: 24.8.0
42+
rev: 24.10.0
4343
hooks:
4444
- id: black
4545
args: ["--line-length=100"]
@@ -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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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/family_photo.png" alt="Universal Robot family" style="width: 80%;"/></center>
4+
<div align="center"><img src="ur_robot_driver/doc/installation/initial_setup_images/family_photo.png" alt="Universal Robot family" style="width: 90%;"/></div>
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

@@ -103,24 +103,24 @@ For getting started, you'll basically need three steps:
103103
```bash
104104
sudo apt-get install ros-rolling-ur
105105
```
106-
See the [installation instructions](https://docs.ros.org/en/ros2_packages/rolling/api/ur_robot_driver/installation/installation.html) for more details and source-build instructions.
106+
See the [installation instructions](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/installation/installation.html) for more details and source-build instructions.
107107

108108
2. **Start & Setup the robot**. Once you've installed the driver, [setup the
109-
robot](https://docs.ros.org/en/ros2_packages/rolling/api/ur_robot_driver/installation/robot_setup.html)
109+
robot](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/installation/robot_setup.html)
110110
and [create a program for external
111-
control](https://docs.ros.org/en/ros2_packages/rolling/api/ur_robot_driver/installation/install_urcap_e_series.html).
111+
control](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/installation/install_urcap_e_series.html).
112112

113113
Please do this step carefully and extract the calibration as explained
114-
[here](https://docs.ros.org/en/ros2_packages/rolling/api/ur_robot_driver/installation/robot_setup.html#extract-calibration-information).
114+
[here](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/installation/robot_setup.html#extract-calibration-information).
115115
Otherwise the TCP's pose will not be correct inside the ROS ecosystem.
116116

117117
If no real robot is required, you can [use a simulated
118-
robot](https://docs.ros.org/en/ros2_packages/rolling/api/ur_robot_driver/usage.html#usage-with-official-ur-simulator)
118+
robot](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/usage/simulation.html#usage-with-official-ur-simulator)
119119
that will behave almost exactly like the real robot.
120120

121121

122122
3. **Start the driver**. See the [usage
123-
documentation](https://docs.ros.org/en/ros2_packages/rolling/api/ur_robot_driver/usage.html) for
123+
documentation](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/usage/toc.html) for
124124
details.
125125

126126
```bash
@@ -129,7 +129,7 @@ For getting started, you'll basically need three steps:
129129
ros2 launch ur_robot_driver ur_control.launch.py ur_type:=ur5e robot_ip:=192.168.56.101
130130
```
131131

132-
4. Unless started in [headless mode](https://docs.ros.org/en/ros2_packages/rolling/api/ur_robot_driver/ROS_INTERFACE.html#headless-mode): Run the external_control program by **pressing `play` on the teach pendant**.
132+
4. Unless started in [headless mode](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/operation_modes.html#headless-mode): Run the external_control program by **pressing `play` on the teach pendant**.
133133

134134

135135
## MoveIt! support
@@ -142,9 +142,9 @@ Watch MoveIt in action with the Universal Robots ROS2 driver:
142142
*The video shows free-space trajectory planning around a modeled collision scene object using the MoveIt2 MotionPlanning widget for Rviz2.*
143143

144144
See the [MoveIt!
145-
section](https://docs.ros.org/en/ros2_packages/rolling/api/ur_robot_driver/usage.html#using-moveit)
145+
section](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/usage/move.html#using-moveit)
146146
of the [Usage
147-
guide](https://docs.ros.org/en/ros2_packages/rolling/api/ur_robot_driver/usage.html) for details.
147+
guide](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/usage/toc.html) for details.
148148

149149
## Expected Changes in the Near Future
150150

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.

0 commit comments

Comments
 (0)