Merge branch 'main' into pose_broadcaster

UniversalRobots · Nov 11, 2024 · c8f3b35 · c8f3b35
2 parents 628bc8d + 984c218
commit c8f3b35
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 7 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
 
   # Python hooks
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.18.0
+    rev: v3.19.0
     hooks:
     -   id: pyupgrade
         args: [--py36-plus]

diff --git a/ur/CHANGELOG.rst b/ur/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package ur
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.4.13 (2024-10-28)
+-------------------
+
 2.4.12 (2024-10-14)
 -------------------
 

diff --git a/ur/package.xml b/ur/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ur</name>
-  <version>2.4.12</version>
+  <version>2.4.13</version>
   <description>Metapackage for universal robots</description>
   <maintainer email="exner@fzi.de">Felix Exner</maintainer>
   <maintainer email="dipentima@fzi.de">Vincenzo Di Pentima</maintainer>

diff --git a/ur_calibration/CHANGELOG.rst b/ur_calibration/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package ur_calibration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.4.13 (2024-10-28)
+-------------------
+
 2.4.12 (2024-10-14)
 -------------------
 

diff --git a/ur_calibration/package.xml b/ur_calibration/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>ur_calibration</name>
-  <version>2.4.12</version>
+  <version>2.4.13</version>
   <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>
 
   <maintainer email="exner@fzi.de">Felix Exner</maintainer>

diff --git a/ur_controllers/CHANGELOG.rst b/ur_controllers/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package ur_controllers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.4.13 (2024-10-28)
+-------------------
+* [SJTC] Make scaling interface optional (`#1145 <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues/1145>`_)
+* Contributors: Felix Exner (fexner)
+
 2.4.12 (2024-10-14)
 -------------------
 

diff --git a/ur_controllers/package.xml b/ur_controllers/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ur_controllers</name>
-  <version>2.4.12</version>
+  <version>2.4.13</version>
   <description>Provides controllers that use the speed scaling interface of Universal Robots.</description>
 
   <maintainer email="exner@fzi.de">Felix Exner</maintainer>

diff --git a/ur_dashboard_msgs/CHANGELOG.rst b/ur_dashboard_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package ur_dashboard_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.4.13 (2024-10-28)
+-------------------
+
 2.4.12 (2024-10-14)
 -------------------
 

diff --git a/ur_dashboard_msgs/package.xml b/ur_dashboard_msgs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ur_dashboard_msgs</name>
-  <version>2.4.12</version>
+  <version>2.4.13</version>
   <description>Messages around the UR Dashboard server.</description>
 
   <maintainer email="exner@fzi.de">Felix Exner</maintainer>

diff --git a/ur_moveit_config/CHANGELOG.rst b/ur_moveit_config/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package ur_moveit_config
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.4.13 (2024-10-28)
+-------------------
+* Pass use_sim_time to MoveIt's RViz instance (`#1144 <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues/1144>`_)
+* Contributors: Felix Exner (fexner)
+
 2.4.12 (2024-10-14)
 -------------------
 

diff --git a/ur_moveit_config/package.xml b/ur_moveit_config/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ur_moveit_config</name>
-  <version>2.4.12</version>
+  <version>2.4.13</version>
   <description>
      An example package with MoveIt2 configurations for UR robots.
   </description>

diff --git a/ur_robot_driver/CHANGELOG.rst b/ur_robot_driver/CHANGELOG.rst
@@ -1,3 +1,9 @@
+2.4.13 (2024-10-28)
+-------------------
+* Fix component lifecycle (`#1098 <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues/1098>`_)
+* Add missing state interfaces for get_robot_software_version (`#1153 <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues/1153>`_)
+* Contributors: Felix Exner (fexner)
+
 2.4.12 (2024-10-14)
 -------------------
 * Revert "Add passthrough interfaces for joints (`#1121 <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues/1121>`_)" (`#1151 <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/issues/1151>`_)

diff --git a/ur_robot_driver/package.xml b/ur_robot_driver/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ur_robot_driver</name>
-  <version>2.4.12</version>
+  <version>2.4.13</version>
   <description>The new driver for Universal Robots UR3, UR5 and UR10 robots with CB3 controllers and the e-series.</description>
 
   <maintainer email="exner@fzi.de">Felix Exner</maintainer>