Skip to content

Commit 031ddc6

Browse files
christophfroehlichchristophfroehlich
authored
Merge branch 'master' into master
2 parents e20e63c + ac35696 commit 031ddc6

File tree

83 files changed

+1217
-361
lines changed

Some content is hidden

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

83 files changed

+1217
-361
lines changed

‎ackermann_steering_controller/CHANGELOG.rst‎

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

5+
4.22.0 (2025-03-17)
6+
-------------------
7+
58
4.21.0 (2025-03-01)
69
-------------------
710
* Fix the exported interface naming in the chainable controllers (`#1528 <https://github.com/ros-controls/ros2_controllers/issues/1528>`_)

‎ackermann_steering_controller/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>ackermann_steering_controller</name>
5-
<version>4.21.0</version>
5+
<version>4.22.0</version>
66
<description>Steering controller for Ackermann kinematics. Rear fixed wheels are powering the vehicle and front wheels are steering it.</description>
77

88
<maintainer email="[email protected]">Bence Magyar</maintainer>

‎admittance_controller/CHANGELOG.rst‎

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

5+
4.22.0 (2025-03-17)
6+
-------------------
7+
58
4.21.0 (2025-03-01)
69
-------------------
710
* Cleanup dependencies (add `angles`, rm `filters`) (`#1555 <https://github.com/ros-controls/ros2_controllers/issues/1555>`_)

‎admittance_controller/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>admittance_controller</name>
5-
<version>4.21.0</version>
5+
<version>4.22.0</version>
66
<description>Implementation of admittance controllers for different input and output interface.</description>
77

88
<maintainer email="[email protected]">Bence Magyar</maintainer>

‎bicycle_steering_controller/CHANGELOG.rst‎

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

5+
4.22.0 (2025-03-17)
6+
-------------------
7+
58
4.21.0 (2025-03-01)
69
-------------------
710
* Fix the exported interface naming in the chainable controllers (`#1528 <https://github.com/ros-controls/ros2_controllers/issues/1528>`_)

‎bicycle_steering_controller/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>bicycle_steering_controller</name>
5-
<version>4.21.0</version>
5+
<version>4.22.0</version>
66
<description>Steering controller with bicycle kinematics. Rear fixed wheel is powering the vehicle and front wheel is steering.</description>
77

88
<maintainer email="[email protected]">Bence Magyar</maintainer>

‎diff_drive_controller/CHANGELOG.rst‎

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

5+
4.22.0 (2025-03-17)
6+
-------------------
7+
* Use the custom validators directly from control_toolbox (`#1504 <https://github.com/ros-controls/ros2_controllers/issues/1504>`_)
8+
* Use new handles API in diff_drive_controller (`#1565 <https://github.com/ros-controls/ros2_controllers/issues/1565>`_)
9+
* Contributors: Christoph Fröhlich, Sai Kishor Kothakota
10+
511
4.21.0 (2025-03-01)
612
-------------------
713
* Fix the exported interface naming in the chainable controllers (`#1528 <https://github.com/ros-controls/ros2_controllers/issues/1528>`_)

‎diff_drive_controller/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ endforeach()
3535
add_compile_definitions(RCPPUTILS_VERSION_MAJOR=${rcpputils_VERSION_MAJOR})
3636
add_compile_definitions(RCPPUTILS_VERSION_MINOR=${rcpputils_VERSION_MINOR})
3737

38+
# get include dirs from control_toolbox for the custom validators
39+
get_target_property(TB_INCLUDE_DIRS control_toolbox::rate_limiter_parameters INTERFACE_INCLUDE_DIRECTORIES)
3840
generate_parameter_library(diff_drive_controller_parameters
3941
src/diff_drive_controller_parameter.yaml
40-
include/diff_drive_controller/custom_validators.hpp
42+
${TB_INCLUDE_DIRS}/control_toolbox/custom_validators.hpp
4143
)
4244

4345
add_library(diff_drive_controller SHARED
@@ -51,7 +53,8 @@ target_include_directories(diff_drive_controller PUBLIC
5153
)
5254
target_link_libraries(diff_drive_controller
5355
PUBLIC
54-
diff_drive_controller_parameters)
56+
diff_drive_controller_parameters
57+
control_toolbox::rate_limiter_parameters)
5558
ament_target_dependencies(diff_drive_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
5659
pluginlib_export_plugin_description_file(controller_interface diff_drive_plugin.xml)
5760

‎diff_drive_controller/include/diff_drive_controller/custom_validators.hpp‎

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

‎diff_drive_controller/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="3">
33
<name>diff_drive_controller</name>
4-
<version>4.21.0</version>
4+
<version>4.22.0</version>
55
<description>Controller for a differential-drive mobile base.</description>
66

77
<maintainer email="[email protected]">Bence Magyar</maintainer>

0 commit comments

Comments
 (0)