Merge branch 'humble' into mergify/bp/humble/pr-1692

ros-controls · Oct 8, 2024 · 349e2ac · 349e2ac
2 parents 0db5940 + f115f4f
commit 349e2ac
Show file tree

Hide file tree

Showing 28 changed files with 72 additions and 22 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -49,20 +49,20 @@ repos:
       args: ["--ignore=D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404"]
 
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black
         args: ["--line-length=99"]
 
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
     - id: flake8
       args: ["--extend-ignore=E501"]
 
   # CPP hooks
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v18.1.8
+    rev: v19.1.0
     hooks:
       - id: clang-format
         args: ['-fallback-style=none', '-i']
@@ -108,7 +108,7 @@ repos:
 
   # Docs - RestructuredText hooks
   - repo: https://github.com/PyCQA/doc8
-    rev: v1.1.1
+    rev: v1.1.2
     hooks:
       - id: doc8
         args: ['--max-line-length=100', '--ignore=D001']
@@ -132,7 +132,7 @@ repos:
         exclude: CHANGELOG\.rst|\.(svg|pyc|drawio)$
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.29.1
+    rev: 0.29.3
     hooks:
       - id: check-github-workflows
         args: ["--verbose"]

diff --git a/controller_interface/CHANGELOG.rst b/controller_interface/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package controller_interface
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+
 2.43.0 (2024-08-22)
 -------------------
 

diff --git a/controller_interface/package.xml b/controller_interface/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>controller_interface</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>Description of controller_interface</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>

diff --git a/controller_manager/CHANGELOG.rst b/controller_manager/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package controller_manager
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+* controller_manager: Add space to string literal concatenation (`#1245 <https://github.com/ros-controls/ros2_control/issues/1245>`_) (`#1747 <https://github.com/ros-controls/ros2_control/issues/1747>`_)
+* fix: the print of the information in control node was in wrong order (`#1726 <https://github.com/ros-controls/ros2_control/issues/1726>`_)
+* Contributors: Manuel Muth, roscan-tech
+
 2.43.0 (2024-08-22)
 -------------------
 * Infrom user why rt policy could not be set, infrom if is set. (backport `#1705 <https://github.com/ros-controls/ros2_control/issues/1705>`_) (`#1708 <https://github.com/ros-controls/ros2_control/issues/1708>`_)

diff --git a/controller_manager/package.xml b/controller_manager/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>controller_manager</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>Description of controller_manager</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>

diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp
@@ -973,7 +973,7 @@ controller_interface::return_type ControllerManager::switch_controller(
     {
       RCLCPP_WARN(
         get_logger(),
-        "Controller with name '%s' is not inactive so its following"
+        "Controller with name '%s' is not inactive so its following "
         "controllers do not have to be checked, because it cannot be activated.",
         controller_it->info.name.c_str());
       ret = controller_interface::return_type::ERROR;

diff --git a/controller_manager/src/ros2_control_node.cpp b/controller_manager/src/ros2_control_node.cpp
@@ -60,12 +60,20 @@ int main(int argc, char ** argv)
             "for details on how to enable realtime scheduling.",
             errno, strerror(errno));
         }
+        else
+        {
+          RCLCPP_INFO(
+            cm->get_logger(), "Successful set up FIFO RT scheduling policy with priority %i.",
+            kSchedPriority);
+        }
       }
       else
       {
-        RCLCPP_INFO(
-          cm->get_logger(), "Successful set up FIFO RT scheduling policy with priority %i.",
-          kSchedPriority);
+        RCLCPP_WARN(
+          cm->get_logger(),
+          "No real-time kernel detected on this system. See "
+          "[https://control.ros.org/master/doc/ros2_control/controller_manager/doc/userdoc.html] "
+          "for details on how to enable realtime scheduling.");
       }
 
       // for calculating sleep time

diff --git a/controller_manager_msgs/CHANGELOG.rst b/controller_manager_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package controller_manager_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+
 2.43.0 (2024-08-22)
 -------------------
 

diff --git a/controller_manager_msgs/package.xml b/controller_manager_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>controller_manager_msgs</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>Messages and services for the controller manager.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>

diff --git a/hardware_interface/CHANGELOG.rst b/hardware_interface/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package hardware_interface
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+
 2.43.0 (2024-08-22)
 -------------------
 

diff --git a/hardware_interface/package.xml b/hardware_interface/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>hardware_interface</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>ros2_control hardware interface</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>

diff --git a/hardware_interface_testing/CHANGELOG.rst b/hardware_interface_testing/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package hardware_interface_testing
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+
 2.43.0 (2024-08-22)
 -------------------
 

diff --git a/hardware_interface_testing/package.xml b/hardware_interface_testing/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>hardware_interface_testing</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>ros2_control hardware interface testing</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>

diff --git a/joint_limits/CHANGELOG.rst b/joint_limits/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package joint_limits
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+
 2.43.0 (2024-08-22)
 -------------------
 

diff --git a/joint_limits/package.xml b/joint_limits/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>joint_limits</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>Interfaces for handling of joint limits for controllers or hardware.</description>
 
   <maintainer email="[email protected]">Bence Magyar</maintainer>

diff --git a/ros2_control/CHANGELOG.rst b/ros2_control/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package ros2_control
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+
 2.43.0 (2024-08-22)
 -------------------
 

diff --git a/ros2_control/package.xml b/ros2_control/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>ros2_control</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>Metapackage for ROS2 control related packages</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>

diff --git a/ros2_control_test_assets/CHANGELOG.rst b/ros2_control_test_assets/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package ros2_control_test_assets
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+
 2.43.0 (2024-08-22)
 -------------------
 

diff --git a/ros2_control_test_assets/package.xml b/ros2_control_test_assets/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_control_test_assets</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>The package provides shared test resources for ros2_control stack
   </description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>

diff --git a/ros2controlcli/CHANGELOG.rst b/ros2controlcli/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package ros2controlcli
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+* [ros2controlcli] fix list_controllers when no controllers are loaded (`#1721 <https://github.com/ros-controls/ros2_control/issues/1721>`_) (`#1722 <https://github.com/ros-controls/ros2_control/issues/1722>`_)
+* Contributors: mergify[bot]
+
 2.43.0 (2024-08-22)
 -------------------
 * Make list controller and list hardware components immediately visualize the state. (backport `#1606 <https://github.com/ros-controls/ros2_control/issues/1606>`_) (`#1690 <https://github.com/ros-controls/ros2_control/issues/1690>`_)

diff --git a/ros2controlcli/package.xml b/ros2controlcli/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>ros2controlcli</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>
     The ROS 2 command line tools for ROS2 Control.
   </description>

diff --git a/ros2controlcli/ros2controlcli/verb/list_controllers.py b/ros2controlcli/ros2controlcli/verb/list_controllers.py
@@ -99,6 +99,10 @@ def main(self, *, args):
         with NodeStrategy(args) as node:
             response = list_controllers(node, args.controller_manager)
 
+            if not response.controller:
+                print("No controllers are currently loaded!")
+                return 0
+
             # Structure data as table for nicer output
             col_width_name = max(len(ctrl.name) for ctrl in response.controller)
             col_width_type = max(len(ctrl.type) for ctrl in response.controller)

diff --git a/ros2controlcli/setup.py b/ros2controlcli/setup.py
@@ -19,7 +19,7 @@
 
 setup(
     name=package_name,
-    version="2.43.0",
+    version="2.43.1",
     packages=find_packages(exclude=["test"]),
     data_files=[
         ("share/" + package_name, ["package.xml"]),

diff --git a/rqt_controller_manager/CHANGELOG.rst b/rqt_controller_manager/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rqt_controller_manager
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+
 2.43.0 (2024-08-22)
 -------------------
 

diff --git a/rqt_controller_manager/package.xml b/rqt_controller_manager/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>rqt_controller_manager</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>Graphical frontend for interacting with the controller manager.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>

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

diff --git a/transmission_interface/CHANGELOG.rst b/transmission_interface/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package transmission_interface
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.43.1 (2024-09-11)
+-------------------
+
 2.43.0 (2024-08-22)
 -------------------
 * Fix flaky transmission_interface tests by making them deterministic. (backport `#1665 <https://github.com/ros-controls/ros2_control/issues/1665>`_) (`#1670 <https://github.com/ros-controls/ros2_control/issues/1670>`_)

diff --git a/transmission_interface/package.xml b/transmission_interface/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>transmission_interface</name>
-  <version>2.43.0</version>
+  <version>2.43.1</version>
   <description>transmission_interface contains data structures for representing mechanical transmissions, methods for propagating values between actuator and joint spaces and tooling to support this.</description>
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>