Skip to content

Commit 4044fc2

Browse files
fmauchsaikishorParker-Drouillarddestoglchristophfroehlich
authored
Fix/spawner interrupt (#1666)
* [ResourceManager] Make destructor virtual for use in derived classes (#1607) * Fix typos in test_resource_manager.cpp (#1609) * [CM] Remove support for the description parameter and use only `robot_description` topic (#1358) --------- Co-authored-by: Felix Exner <[email protected]> Co-authored-by: Christoph Froehlich <[email protected]> * move critical variables to the private context (#1623) * Fix controller starting with later load of robot description test (#1624) * Fix the duplicated restart of the controller_manager services initialization * Scope the ControllerManagerRunner to avoid malloc and other test issues * reorder the tests for consistent log at the end * Remove noqa (#1626) * Unused header cleanup (#1627) * Create debugging.rst (#1625) --------- Co-authored-by: Sai Kishor Kothakota <[email protected]> Co-authored-by: Christoph Froehlich <[email protected]> * Update changelogs * 4.14.0 * add missing rclcpp logging include for Humble compatibility build (#1635) * [CM] Remove deprecated spawner args (#1639) * Add a pytest launch file to test ros2_control_node (#1636) * Fix rst markup (#1642) * Fix rqt_cm paragraph * Fix indent * CM: Add missing includes (#1641) * [RM] Add `get_hardware_info` method to the Hardware Components (#1643) * Fix the namespaced controller_manager spawner + added tests (#1640) * Bump version of pre-commit hooks (#1649) Co-authored-by: christophfroehlich <[email protected]> * Add missing include for executors (#1653) * Update changelogs * 4.15.0 * refactor SwitchParams to fix the incosistencies in the spawner tests (#1638) * Modify test with missing CM to have a timeout * Catch exception when CM services are not found And print the error and exit in the application * Exit with code 1 on unreached CM --------- Co-authored-by: Sai Kishor Kothakota <[email protected]> Co-authored-by: Parker Drouillard <[email protected]> Co-authored-by: Dr. Denis <[email protected]> Co-authored-by: Christoph Froehlich <[email protected]> Co-authored-by: Christoph Fröhlich <[email protected]> Co-authored-by: Henry Moore <[email protected]> Co-authored-by: Lennart Nachtigall <[email protected]> Co-authored-by: Sai Kishor Kothakota <[email protected]> Co-authored-by: Bence Magyar <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: christophfroehlich <[email protected]>
1 parent ea7d4ca commit 4044fc2

File tree

125 files changed

+1250
-959
lines changed

Some content is hidden

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

125 files changed

+1250
-959
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ repos:
3737

3838
# Python hooks
3939
- repo: https://github.com/asottile/pyupgrade
40-
rev: v3.16.0
40+
rev: v3.17.0
4141
hooks:
4242
- id: pyupgrade
4343
args: [--py36-plus]
@@ -133,7 +133,7 @@ repos:
133133
exclude: CHANGELOG\.rst|\.(svg|pyc|drawio)$
134134

135135
- repo: https://github.com/python-jsonschema/check-jsonschema
136-
rev: 0.28.6
136+
rev: 0.29.1
137137
hooks:
138138
- id: check-github-workflows
139139
args: ["--verbose"]

controller_interface/CHANGELOG.rst

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

5+
4.15.0 (2024-08-05)
6+
-------------------
7+
8+
4.14.0 (2024-07-23)
9+
-------------------
10+
* Unused header cleanup (`#1627 <https://github.com/ros-controls/ros2_control/issues/1627>`_)
11+
* move critical variables to the private context (`#1623 <https://github.com/ros-controls/ros2_control/issues/1623>`_)
12+
* Contributors: Henry Moore, Sai Kishor Kothakota
13+
514
4.13.0 (2024-07-08)
615
-------------------
716
* [ControllerChaining] Export state interfaces from chainable controllers (`#1021 <https://github.com/ros-controls/ros2_control/issues/1021>`_)

controller_interface/include/controller_interface/controller_interface.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#define CONTROLLER_INTERFACE__CONTROLLER_INTERFACE_HPP_
1717

1818
#include <memory>
19-
#include <string>
2019
#include <vector>
2120

2221
#include "controller_interface/controller_interface_base.hpp"

controller_interface/include/controller_interface/controller_interface_base.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "hardware_interface/loaned_command_interface.hpp"
2626
#include "hardware_interface/loaned_state_interface.hpp"
2727

28-
#include "rclcpp/rclcpp.hpp"
2928
#include "rclcpp/version.h"
3029
#include "rclcpp_lifecycle/lifecycle_node.hpp"
3130

@@ -258,12 +257,12 @@ class ControllerInterfaceBase : public rclcpp_lifecycle::node_interfaces::Lifecy
258257
protected:
259258
std::vector<hardware_interface::LoanedCommandInterface> command_interfaces_;
260259
std::vector<hardware_interface::LoanedStateInterface> state_interfaces_;
261-
unsigned int update_rate_ = 0;
262-
bool is_async_ = false;
263-
std::string urdf_ = "";
264260

265261
private:
266262
std::shared_ptr<rclcpp_lifecycle::LifecycleNode> node_;
263+
unsigned int update_rate_ = 0;
264+
bool is_async_ = false;
265+
std::string urdf_ = "";
267266
};
268267

269268
using ControllerInterfaceBaseSharedPtr = std::shared_ptr<ControllerInterfaceBase>;

controller_interface/include/semantic_components/range_sensor.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#ifndef SEMANTIC_COMPONENTS__RANGE_SENSOR_HPP_
1616
#define SEMANTIC_COMPONENTS__RANGE_SENSOR_HPP_
1717

18-
#include <limits>
1918
#include <string>
2019
#include <vector>
2120

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.13.0</version>
5+
<version>4.15.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_interface/src/controller_interface.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,8 @@
1414

1515
#include "controller_interface/controller_interface.hpp"
1616

17-
#include <memory>
18-
#include <string>
19-
#include <utility>
2017
#include <vector>
2118

22-
#include "hardware_interface/types/lifecycle_state_names.hpp"
23-
#include "lifecycle_msgs/msg/state.hpp"
24-
2519
namespace controller_interface
2620
{
2721
ControllerInterface::ControllerInterface() : ControllerInterfaceBase() {}

controller_interface/src/controller_interface_base.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <utility>
2020
#include <vector>
2121

22-
#include "hardware_interface/types/lifecycle_state_names.hpp"
2322
#include "lifecycle_msgs/msg/state.hpp"
2423

2524
namespace controller_interface

controller_interface/test/test_chainable_controller_interface.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
#ifndef TEST_CHAINABLE_CONTROLLER_INTERFACE_HPP_
1616
#define TEST_CHAINABLE_CONTROLLER_INTERFACE_HPP_
1717

18+
#include <gmock/gmock.h>
19+
1820
#include <string>
1921
#include <vector>
2022

21-
#include "gmock/gmock.h"
22-
2323
#include "controller_interface/chainable_controller_interface.hpp"
2424
#include "hardware_interface/handle.hpp"
25-
#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
2625

2726
constexpr char TEST_CONTROLLER_NAME[] = "testable_chainable_controller";
2827
constexpr double INTERFACE_VALUE = 1989.0;

controller_interface/test/test_controller_interface.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#define TEST_CONTROLLER_INTERFACE_HPP_
1717

1818
#include "controller_interface/controller_interface.hpp"
19-
#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
2019

2120
constexpr char TEST_CONTROLLER_NAME[] = "testable_controller_interface";
2221

0 commit comments

Comments
 (0)