Skip to content

Commit d3c228c

Browse files
urfeexurfeex
committed
Merge remote-tracking branch 'origin/main' into tool_contact
2 parents 79f3025 + 7e680a7 commit d3c228c

File tree

19 files changed

+82
-36
lines changed

19 files changed

+82
-36
lines changed

‎Universal_Robots_ROS2_Driver.jazzy.repos‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,26 @@ repositories:
2222
kinematics_interface:
2323
type: git
2424
url: https://github.com/ros-controls/kinematics_interface.git
25-
version: master
25+
version: jazzy
2626
control_msgs:
2727
type: git
2828
url: https://github.com/ros-controls/control_msgs.git
29-
version: master
29+
version: jazzy
3030
control_toolbox:
3131
type: git
3232
url: https://github.com/ros-controls/control_toolbox.git
33-
version: ros2-master
33+
version: jazzy
3434
realtime_tools:
3535
type: git
3636
url: https://github.com/ros-controls/realtime_tools.git
3737
version: jazzy
3838
moveit2:
3939
type: git
40-
url: https://github.com/ros-planning/moveit2.git
40+
url: https://github.com/moveit/moveit2.git
4141
version: main
4242
moveit_msgs:
4343
type: git
44-
url: https://github.com/ros-planning/moveit_msgs.git
44+
url: https://github.com/moveit/moveit_msgs.git
4545
version: ros2
4646
srdfdom:
4747
type: git

‎Universal_Robots_ROS2_Driver.rolling.repos‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ repositories:
3737
version: master
3838
moveit2:
3939
type: git
40-
url: https://github.com/ros-planning/moveit2.git
40+
url: https://github.com/moveit/moveit2.git
4141
version: main
4242
moveit_msgs:
4343
type: git
44-
url: https://github.com/ros-planning/moveit_msgs.git
44+
url: https://github.com/moveit/moveit_msgs.git
4545
version: ros2
4646
srdfdom:
4747
type: git

‎ur/CHANGELOG.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package ur
33
^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
3.1.1 (2025-03-17)
6+
------------------
7+
58
3.1.0 (2025-03-05)
69
------------------
710

‎ur/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>ur</name>
5-
<version>3.1.0</version>
5+
<version>3.1.1</version>
66
<description>Metapackage for universal robots</description>
77
<maintainer email="[email protected]">Felix Exner</maintainer>
88
<maintainer email="[email protected]">Rune Søe-Knudsen</maintainer>

‎ur_calibration/CHANGELOG.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package ur_calibration
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
3.1.1 (2025-03-17)
6+
------------------
7+
58
3.1.0 (2025-03-05)
69
------------------
710

‎ur_calibration/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ find_package(rclcpp REQUIRED)
1717
find_package(ur_robot_driver REQUIRED)
1818

1919
find_package(Eigen3 REQUIRED)
20-
find_package(yaml-cpp REQUIRED)
20+
find_package(yaml_cpp_vendor REQUIRED)
2121
find_package(ur_client_library REQUIRED)
2222

23-
set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
24-
2523
###########
2624
## Build ##
2725
###########
@@ -34,10 +32,9 @@ target_include_directories(calibration
3432
PUBLIC
3533
include
3634
${EIGEN3_INCLUDE_DIRS}
37-
${YAML_CPP_INCLUDE_DIRS}
3835
)
3936
target_link_libraries(calibration
40-
${YAML_CPP_LIBRARIES}
37+
yaml-cpp
4138
)
4239
ament_target_dependencies(calibration
4340
rclcpp

‎ur_calibration/package.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>ur_calibration</name>
4-
<version>3.1.0</version>
4+
<version>3.1.1</version>
55
<description>Package for extracting the factory calibration from a UR robot and change it such that it can be used by ur_description to gain a correct URDF</description>
66

77
<maintainer email="[email protected]">Felix Exner</maintainer>
@@ -20,7 +20,7 @@
2020
<depend>ur_robot_driver</depend>
2121

2222
<depend>eigen</depend>
23-
<depend>yaml-cpp</depend>
23+
<depend>yaml_cpp_vendor</depend>
2424

2525
<test_depend>ament_cmake_gmock</test_depend>
2626
<test_depend>ament_cmake_gtest</test_depend>

‎ur_controllers/CHANGELOG.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package ur_controllers
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
3.1.1 (2025-03-17)
6+
------------------
7+
* Update ros2_control API to get_optional (`#1289 <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues/1289>`_)
8+
* Contributors: Felix Exner
9+
510
3.1.0 (2025-03-05)
611
------------------
712
* ur_controllers: doc -- Fix link to index page of driver (`#1284 <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues/1284>`_)

‎ur_controllers/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>ur_controllers</name>
5-
<version>3.1.0</version>
5+
<version>3.1.1</version>
66
<description>Provides controllers that use the speed scaling interface of Universal Robots.</description>
77

88
<maintainer email="[email protected]">Felix Exner</maintainer>

‎ur_dashboard_msgs/CHANGELOG.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package ur_dashboard_msgs
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
3.1.1 (2025-03-17)
6+
------------------
7+
58
3.1.0 (2025-03-05)
69
------------------
710
* Port robot_state_helper to ROS2 (`#933 <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues/933>`_)

0 commit comments

Comments
 (0)