Skip to content

Commit b72f313

Browse files
saikishorsaikishor
authored
Merge branch 'master' into integrate/pal_statistics
2 parents d398ea7 + 00c7088 commit b72f313

File tree

32 files changed

+136
-72
lines changed

32 files changed

+136
-72
lines changed

‎controller_interface/CHANGELOG.rst

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

5+
4.24.0 (2025-01-13)
6+
-------------------
7+
* Trigger shutdown transition in destructor (`#1979 <https://github.com/ros-controls/ros2_control/issues/1979>`_)
8+
* Contributors: Christoph Fröhlich
9+
510
4.23.0 (2024-12-29)
611
-------------------
712
* Remove boilerplate visibility macros (`#1972 <https://github.com/ros-controls/ros2_control/issues/1972>`_)

‎controller_interface/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_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="2">
44
<name>controller_interface</name>
5-
<version>4.23.0</version>
5+
<version>4.24.0</version>
66
<description>Description of controller_interface</description>
77
<maintainer email="[email protected]">Bence Magyar</maintainer>
88
<maintainer email="[email protected]">Denis Štogl</maintainer>

‎controller_manager/CHANGELOG.rst

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

5+
4.24.0 (2025-01-13)
6+
-------------------
7+
* [CM] Remove obsolete ControllerMock from the tests (`#1990 <https://github.com/ros-controls/ros2_control/issues/1990>`_)
8+
* Initialize robot description in ControllerManager (`#1983 <https://github.com/ros-controls/ros2_control/issues/1983>`_)
9+
* Contributors: Dominic Reber, Wiktor Bajor
10+
511
4.23.0 (2024-12-29)
612
-------------------
713
* Remove boilerplate visibility macros (`#1972 <https://github.com/ros-controls/ros2_control/issues/1972>`_)

‎controller_manager/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_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="2">
44
<name>controller_manager</name>
5-
<version>4.23.0</version>
5+
<version>4.24.0</version>
66
<description>Description of controller_manager</description>
77
<maintainer email="[email protected]">Bence Magyar</maintainer>
88
<maintainer email="[email protected]">Denis Štogl</maintainer>

‎controller_manager/test/controller_manager_test_common.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,4 @@ class ControllerManagerRunner
226226
ControllerManagerFixture<CtrlMgr> * cmf_;
227227
};
228228

229-
class ControllerMock : public controller_interface::ControllerInterface
230-
{
231-
public:
232-
MOCK_METHOD0(update, controller_interface::return_type(void));
233-
};
234-
235229
#endif // CONTROLLER_MANAGER_TEST_COMMON_HPP_

‎controller_manager_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 controller_manager_msgs
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.24.0 (2025-01-13)
6+
-------------------
7+
58
4.23.0 (2024-12-29)
69
-------------------
710

‎controller_manager_msgs/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>controller_manager_msgs</name>
5-
<version>4.23.0</version>
5+
<version>4.24.0</version>
66
<description>Messages and services for the controller manager.</description>
77
<maintainer email="[email protected]">Bence Magyar</maintainer>
88
<maintainer email="[email protected]">Denis Štogl</maintainer>

‎hardware_interface/CHANGELOG.rst

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

5+
4.24.0 (2025-01-13)
6+
-------------------
7+
* Add missing link of mock_components to hardware_interface (`#1992 <https://github.com/ros-controls/ros2_control/issues/1992>`_)
8+
* Using urdf/model.hpp for rolling (`#1978 <https://github.com/ros-controls/ros2_control/issues/1978>`_)
9+
* Remove visibility include from docs (`#1975 <https://github.com/ros-controls/ros2_control/issues/1975>`_)
10+
* Contributors: Christoph Fröhlich, Silvio Traversaro, verma nakul
11+
512
4.23.0 (2024-12-29)
613
-------------------
714
* Remove boilerplate visibility macros (`#1972 <https://github.com/ros-controls/ros2_control/issues/1972>`_)

‎hardware_interface/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ target_include_directories(mock_components PUBLIC
5555
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
5656
$<INSTALL_INTERFACE:include/hardware_interface>
5757
)
58+
target_link_libraries(mock_components PUBLIC hardware_interface)
5859
ament_target_dependencies(mock_components PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
5960

6061
pluginlib_export_plugin_description_file(

‎hardware_interface/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="2">
33
<name>hardware_interface</name>
4-
<version>4.23.0</version>
4+
<version>4.24.0</version>
55
<description>ros2_control hardware interface</description>
66
<maintainer email="[email protected]">Bence Magyar</maintainer>
77
<maintainer email="[email protected]">Denis Štogl</maintainer>

0 commit comments

Comments
 (0)