Merge branch 'master' into ci/codecov

ros-controls · Nov 2, 2023 · 936e7fb · 936e7fb
2 parents e2db769 + c6ecab7
commit 936e7fb
Show file tree

Hide file tree

Showing 45 changed files with 104 additions and 37 deletions.
diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           required-ros-distributions: ${{ env.ROS_DISTRO }}
       - uses: actions/checkout@v4
-      - uses: ros-tooling/[email protected].3
+      - uses: ros-tooling/[email protected].4
         with:
           target-ros2-distro: ${{ env.ROS_DISTRO }}
           import-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/reusable-ros-tooling-source-build.yml b/.github/workflows/reusable-ros-tooling-source-build.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
-      - uses: ros-tooling/[email protected].3
+      - uses: ros-tooling/[email protected].4
         with:
           target-ros2-distro: ${{ inputs.ros_distro }}
           ref: ${{ inputs.ref }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -58,21 +58,10 @@ repos:
       args: ["--ignore=E501"]
 
   # CPP hooks
-  - repo: local
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v14.0.6
     hooks:
       - id: clang-format
-        name: clang-format
-        description: Format files with ClangFormat.
-        entry: clang-format-14
-        language: system
-        files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$
-        args: ['-fallback-style=none', '-i']
-  # The same options as in ament_cppcheck are used, but its not working...
-  #- repo: https://github.com/pocc/pre-commit-hooks
-    #rev: v1.1.1
-    #hooks:
-      #- id: cppcheck
-        #args: ['--error-exitcode=1', '-f', '--inline-suppr', '-q', '-rp', '--suppress=internalAstError', '--suppress=unknownMacro', '--verbose']
 
   - repo: local
     hooks:

diff --git a/ackermann_steering_controller/CHANGELOG.rst b/ackermann_steering_controller/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package ackermann_steering_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+* Improve docs (`#785 <https://github.com/ros-controls/ros2_controllers/issues/785>`_)
+* Contributors: Christoph Fröhlich
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/ackermann_steering_controller/package.xml b/ackermann_steering_controller/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>ackermann_steering_controller</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Steering controller for Ackermann kinematics. Rear fixed wheels are powering the vehicle and front wheels are steering it.</description>
   <license>Apache License 2.0</license>
   <maintainer email="[email protected]">Bence Magyar</maintainer>

diff --git a/admittance_controller/CHANGELOG.rst b/admittance_controller/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package admittance_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/admittance_controller/package.xml b/admittance_controller/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>admittance_controller</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Implementation of admittance controllers for different input and output interface.</description>
   <maintainer email="[email protected]">Denis Štogl</maintainer>
   <maintainer email="[email protected]">Bence Magyar</maintainer>

diff --git a/bicycle_steering_controller/CHANGELOG.rst b/bicycle_steering_controller/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package bicycle_steering_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+* Improve docs (`#785 <https://github.com/ros-controls/ros2_controllers/issues/785>`_)
+* Contributors: Christoph Fröhlich
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/bicycle_steering_controller/package.xml b/bicycle_steering_controller/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>bicycle_steering_controller</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Steering controller with bicycle kinematics. Rear fixed wheel is powering the vehicle and front wheel is steering.</description>
   <license>Apache License 2.0</license>
   <maintainer email="[email protected]">Bence Magyar</maintainer>

diff --git a/diff_drive_controller/CHANGELOG.rst b/diff_drive_controller/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package diff_drive_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/diff_drive_controller/package.xml b/diff_drive_controller/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>diff_drive_controller</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Controller for a differential drive mobile base.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Jordan Palacios</maintainer>

diff --git a/effort_controllers/CHANGELOG.rst b/effort_controllers/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package effort_controllers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 * [Doc] Add specific documentation on the available fw cmd controllers (`#765 <https://github.com/ros-controls/ros2_controllers/issues/765>`_)

diff --git a/effort_controllers/package.xml b/effort_controllers/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>effort_controllers</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Generic controller for forwarding commands.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Jordan Palacios</maintainer>

diff --git a/force_torque_sensor_broadcaster/CHANGELOG.rst b/force_torque_sensor_broadcaster/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package force_torque_sensor_broadcaster
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/force_torque_sensor_broadcaster/package.xml b/force_torque_sensor_broadcaster/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>force_torque_sensor_broadcaster</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Controller to publish state of force-torque sensors.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>

diff --git a/forward_command_controller/CHANGELOG.rst b/forward_command_controller/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package forward_command_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 * [Doc] Add specific documentation on the available fw cmd controllers (`#765 <https://github.com/ros-controls/ros2_controllers/issues/765>`_)

diff --git a/forward_command_controller/package.xml b/forward_command_controller/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>forward_command_controller</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Generic controller for forwarding commands.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Jordan Palacios</maintainer>

diff --git a/gripper_controllers/CHANGELOG.rst b/gripper_controllers/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package gripper_controllers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/gripper_controllers/package.xml b/gripper_controllers/package.xml
@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>gripper_controllers</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>The gripper_controllers package</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
 

diff --git a/imu_sensor_broadcaster/CHANGELOG.rst b/imu_sensor_broadcaster/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package imu_sensor_broadcaster
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/imu_sensor_broadcaster/package.xml b/imu_sensor_broadcaster/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>imu_sensor_broadcaster</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Controller to publish readings of IMU sensors.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>

diff --git a/joint_state_broadcaster/CHANGELOG.rst b/joint_state_broadcaster/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package joint_state_broadcaster
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/joint_state_broadcaster/package.xml b/joint_state_broadcaster/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>joint_state_broadcaster</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Broadcaster to publish joint state</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Stogl</maintainer>

diff --git a/joint_trajectory_controller/CHANGELOG.rst b/joint_trajectory_controller/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package joint_trajectory_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+* Cleanup comments and unnecessary checks (`#803 <https://github.com/ros-controls/ros2_controllers/issues/803>`_)
+* Update requirements of state interfaces (`#798 <https://github.com/ros-controls/ros2_controllers/issues/798>`_)
+* [JTC] Add tests for acceleration command interface (`#752 <https://github.com/ros-controls/ros2_controllers/issues/752>`_)
+* Contributors: Christoph Fröhlich
+
 3.16.0 (2023-09-20)
 -------------------
 * [Docs] Improve interface description of JTC (`#770 <https://github.com/ros-controls/ros2_controllers/issues/770>`_)

diff --git a/joint_trajectory_controller/package.xml b/joint_trajectory_controller/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>joint_trajectory_controller</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Controller for executing joint-space trajectories on a group of joints</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Jordan Palacios</maintainer>

diff --git a/position_controllers/CHANGELOG.rst b/position_controllers/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package position_controllers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 * [Doc] Add specific documentation on the available fw cmd controllers (`#765 <https://github.com/ros-controls/ros2_controllers/issues/765>`_)

diff --git a/position_controllers/package.xml b/position_controllers/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>position_controllers</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Generic controller for forwarding commands.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Jordan Palacios</maintainer>

diff --git a/range_sensor_broadcaster/CHANGELOG.rst b/range_sensor_broadcaster/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package range_sensor_broadcaster
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/range_sensor_broadcaster/package.xml b/range_sensor_broadcaster/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>range_sensor_broadcaster</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Controller to publish readings of Range sensors.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <author email="[email protected]">Florent Chretien</author>

diff --git a/ros2_controllers/CHANGELOG.rst b/ros2_controllers/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package ros2_controllers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/ros2_controllers/package.xml b/ros2_controllers/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>ros2_controllers</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Metapackage for ROS2 controllers related packages</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Jordan Palacios</maintainer>

diff --git a/ros2_controllers_test_nodes/CHANGELOG.rst b/ros2_controllers_test_nodes/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package ros2_controllers_test_nodes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+* [TestNodes] Optimize output about setup of JTC publisher (`#792 <https://github.com/ros-controls/ros2_controllers/issues/792>`_)
+* Contributors: Dr. Denis
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/ros2_controllers_test_nodes/package.xml b/ros2_controllers_test_nodes/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>ros2_controllers_test_nodes</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Demo nodes for showing and testing functionalities of the ros2_control framework.</description>
 
   <maintainer email="[email protected]">Denis Štogl</maintainer>

diff --git a/ros2_controllers_test_nodes/setup.py b/ros2_controllers_test_nodes/setup.py
@@ -20,7 +20,7 @@
 
 setup(
     name=package_name,
-    version="3.16.0",
+    version="3.17.0",
     packages=[package_name],
     data_files=[
         ("share/ament_index/resource_index/packages", ["resource/" + package_name]),

diff --git a/rqt_joint_trajectory_controller/CHANGELOG.rst b/rqt_joint_trajectory_controller/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rqt_joint_trajectory_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/rqt_joint_trajectory_controller/package.xml b/rqt_joint_trajectory_controller/package.xml
@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>rqt_joint_trajectory_controller</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Graphical frontend for interacting with joint_trajectory_controller instances.</description>
 
   <maintainer email="[email protected]">Bence Magyar</maintainer>

diff --git a/rqt_joint_trajectory_controller/setup.py b/rqt_joint_trajectory_controller/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name=package_name,
-    version="3.16.0",
+    version="3.17.0",
     packages=[package_name],
     data_files=[
         ("share/ament_index/resource_index/packages", ["resource/" + package_name]),

diff --git a/steering_controllers_library/CHANGELOG.rst b/steering_controllers_library/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog for package steering_controllers_library
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.17.0 (2023-10-31)
+-------------------
+* Steering controllers library: fix open loop mode (`#793 <https://github.com/ros-controls/ros2_controllers/issues/793>`_)
+  * set last*velocity variables for open loop odometry
+  * Make function arguments const
+  * Update function in header file too
+* Improve docs (`#785 <https://github.com/ros-controls/ros2_controllers/issues/785>`_)
+* Contributors: Christoph Fröhlich
+
 3.16.0 (2023-09-20)
 -------------------
 

diff --git a/steering_controllers_library/package.xml b/steering_controllers_library/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>steering_controllers_library</name>
-  <version>3.16.0</version>
+  <version>3.17.0</version>
   <description>Package for steering robot configurations including odometry and interfaces.</description>
   <license>Apache License 2.0</license>
   <maintainer email="[email protected]">Bence Magyar</maintainer>