Skip to content

Commit ea2c2a0

Browse files
authored
Foxy: Update dependencies and binary repos file (#373)
* Remove upstream dependencies from binary build * sort package.xml according to schema * Updated ur_bringup package dependencies * Add notice about ros2_control_demos * remove ur_robot_driver dependency from ur_bringup This is the same as for the main branch and should be resolved separately * Do not fail fast * Add an understandable error in case of a missing ros2_control_demos
1 parent b085d50 commit ea2c2a0

File tree

6 files changed

+50
-17
lines changed

6 files changed

+50
-17
lines changed

.github/workflows/foxy-binary-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
max-parallel: 1
19+
fail-fast: false
1920
matrix:
2021
env:
2122
- {ROS_DISTRO: foxy, ROS_REPO: main}
2223
- {ROS_DISTRO: foxy, ROS_REPO: testing}
2324
env:
24-
UPSTREAM_WORKSPACE: Universal_Robots_ROS2_Driver-not-released.${{ matrix.env.ROS_DISTRO }}.repos
2525
DOCKER_RUN_OPTS: --network static_test_net
2626
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
2727
IMMEDIATE_TEST_OUTPUT: true

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,14 @@ The most relevant arguments are the following:
152152
153153
To check the controllers' state use `ros2 control list_controllers` command.
154154
155-
- Send some goal to the Joint Trajectory Controller by using a demo node from [ros2_control_demos](https://github.com/ros-controls/ros2_control_demos) package by starting the following command in another terminal:
155+
- Send some goal to the Joint Trajectory Controller by using a demo node from
156+
[ros2_control_demos](https://github.com/ros-controls/ros2_control_demos) package by starting the
157+
following command in another terminal.
158+
159+
**NOTE: As the `ros2_control_demos` package is currently not released for ROS2 Foxy, you'll have
160+
to build it in your workspace in order to use this launchfile. We are aware that this is not
161+
ideal, but we thought it would be better to not drop the testing launchfile at all and provide
162+
this info to users.**
156163
```
157164
ros2 launch ur_bringup test_joint_trajectory_controller.launch.py
158165
```

Universal_Robots_ROS2_Driver-not-released.foxy.repos

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

ur_bringup/launch/test_joint_trajectory_controller.launch.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
# Author: Denis Stogl
1616
#
1717
# Description: After a robot has been loaded, this will execute a series of trajectories.
18+
import sys
1819

1920
from launch import LaunchDescription
2021
from launch.substitutions import PathJoinSubstitution
2122
from launch_ros.actions import Node
2223
from launch_ros.substitutions import FindPackageShare
24+
from ament_index_python.packages import get_package_share_directory, PackageNotFoundError
2325

2426

2527
def generate_launch_description():
@@ -28,6 +30,20 @@ def generate_launch_description():
2830
[FindPackageShare("ur_bringup"), "config", "test_goal_publishers_config.yaml"]
2931
)
3032

33+
# Kind of hack until this dependency is released
34+
# TODO (@anyone): Remove this once the upstream package is released
35+
try:
36+
get_package_share_directory("ros2_control_test_nodes")
37+
except PackageNotFoundError:
38+
print(
39+
"ERROR:"
40+
"Could not find package 'ros2_control_test_nodes'. Please install it (build it from "
41+
"source) in order to run this launchfile. See here for details: explanation:\n"
42+
"https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/foxy"
43+
"#example-commands-for-testing-the-driver"
44+
)
45+
sys.exit(1)
46+
3147
return LaunchDescription(
3248
[
3349
Node(

ur_bringup/launch/test_scaled_joint_trajectory_controller.launch.py

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
# Author: Denis Stogl
1616
#
1717
# Description: After a robot has been loaded, this will execute a series of trajectories.
18+
import sys
1819

1920
from launch import LaunchDescription
2021
from launch.substitutions import PathJoinSubstitution
2122
from launch_ros.actions import Node
2223
from launch_ros.substitutions import FindPackageShare
24+
from ament_index_python.packages import get_package_share_directory, PackageNotFoundError
2325

2426

2527
def generate_launch_description():
@@ -28,17 +30,28 @@ def generate_launch_description():
2830
[FindPackageShare("ur_bringup"), "config", "test_goal_publishers_config.yaml"]
2931
)
3032

33+
# Kind of hack until this dependency is released
34+
# TODO (@anyone): Remove this once the upstream package is released
35+
try:
36+
get_package_share_directory("ros2_control_test_nodes")
37+
except PackageNotFoundError:
38+
print(
39+
"ERROR:"
40+
"Could not find package 'ros2_control_test_nodes'. Please install it (build it from "
41+
"source) in order to run this launchfile. See here for details: explanation:\n"
42+
"https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/foxy"
43+
"#example-commands-for-testing-the-driver"
44+
)
45+
sys.exit(1)
46+
3147
return LaunchDescription(
3248
[
3349
Node(
3450
package="ros2_control_test_nodes",
3551
executable="publisher_joint_trajectory_controller",
3652
name="publisher_scaled_joint_trajectory_controller",
3753
parameters=[position_goals],
38-
output={
39-
"stdout": "screen",
40-
"stderr": "screen",
41-
},
54+
output={"stdout": "screen", "stderr": "screen"},
4255
)
4356
]
4457
)

ur_bringup/package.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<version>0.0.0</version>
66
<description>Launch file and run-time configurations, e.g. controllers.</description>
77

8-
<author>Lovro Ivanov</author>
9-
<author>Denis Stogl</author>
108

119
<maintainer email="[email protected]">Marvin Große Besselmann</maintainer>
1210
<maintainer email="[email protected]">Lovro Ivanov</maintainer>
@@ -18,13 +16,21 @@
1816
<url type="bugtracker">https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues</url>
1917
<url type="repository">https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver</url>
2018

19+
<author>Lovro Ivanov</author>
20+
<author>Denis Stogl</author>
21+
2122
<buildtool_depend>ament_cmake</buildtool_depend>
2223

2324
<exec_depend>controller_manager</exec_depend>
2425
<exec_depend>joint_state_broadcaster</exec_depend>
26+
<exec_depend>joint_trajectory_controller</exec_depend>
2527
<exec_depend>launch</exec_depend>
2628
<exec_depend>launch_ros</exec_depend>
29+
<exec_depend>robot_state_publisher</exec_depend>
30+
<!--<exec_depend>ros2_controllers_test_nodes</exec_depend>-->
2731
<exec_depend>rviz2</exec_depend>
32+
<exec_depend>ur_controllers</exec_depend>
33+
<exec_depend>ur_description</exec_depend>
2834
<exec_depend>urdf</exec_depend>
2935
<exec_depend>xacro</exec_depend>
3036

0 commit comments

Comments
 (0)