From c5a53916c12bb4d10c2b0040d96954ca5b14b87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Mon, 11 Mar 2024 19:27:56 +0100 Subject: [PATCH] Codeformat from new pre-commit config (#1433) (cherry picked from commit 591b06cdd2c949bc0ce82680d9025261634762fb) # Conflicts: # rqt_controller_manager/rqt_controller_manager/controller_manager.py --- .../test/test_controller_manager_srvs.cpp | 12 ++++-------- controller_manager/test/test_spawner_unspawner.cpp | 3 +-- .../test_force_torque_sensor.cpp | 3 +-- joint_limits/include/joint_limits/joint_limits.hpp | 9 +++------ .../rqt_controller_manager/controller_manager.py | 11 +++++++++++ 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/controller_manager/test/test_controller_manager_srvs.cpp b/controller_manager/test/test_controller_manager_srvs.cpp index 9e211f1254..b129c95e0e 100644 --- a/controller_manager/test/test_controller_manager_srvs.cpp +++ b/controller_manager/test/test_controller_manager_srvs.cpp @@ -780,8 +780,7 @@ TEST_F(TestControllerManagerSrvs, list_sorted_complex_chained_controllers) auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t { auto it = std::find_if( - result->controller.begin(), result->controller.end(), - [controller_name](auto itf) + result->controller.begin(), result->controller.end(), [controller_name](auto itf) { return (itf.name.find(controller_name) != std::string::npos); }); return std::distance(result->controller.begin(), it); }; @@ -992,8 +991,7 @@ TEST_F(TestControllerManagerSrvs, list_sorted_independent_chained_controllers) auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t { auto it = std::find_if( - result->controller.begin(), result->controller.end(), - [controller_name](auto itf) + result->controller.begin(), result->controller.end(), [controller_name](auto itf) { return (itf.name.find(controller_name) != std::string::npos); }); return std::distance(result->controller.begin(), it); }; @@ -1269,8 +1267,7 @@ TEST_F(TestControllerManagerSrvs, list_large_number_of_controllers_with_chains) auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t { auto it = std::find_if( - result->controller.begin(), result->controller.end(), - [controller_name](auto itf) + result->controller.begin(), result->controller.end(), [controller_name](auto itf) { return (itf.name.find(controller_name) != std::string::npos); }); return std::distance(result->controller.begin(), it); }; @@ -1494,8 +1491,7 @@ TEST_F(TestControllerManagerSrvs, list_sorted_large_chained_controller_tree) auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t { auto it = std::find_if( - result->controller.begin(), result->controller.end(), - [controller_name](auto itf) + result->controller.begin(), result->controller.end(), [controller_name](auto itf) { return (itf.name.find(controller_name) != std::string::npos); }); return std::distance(result->controller.begin(), it); }; diff --git a/controller_manager/test/test_spawner_unspawner.cpp b/controller_manager/test/test_spawner_unspawner.cpp index 7c03a8862d..15cf557c86 100644 --- a/controller_manager/test/test_spawner_unspawner.cpp +++ b/controller_manager/test/test_spawner_unspawner.cpp @@ -233,8 +233,7 @@ TEST_F(TestLoadController, unload_on_kill) // Launch spawner with unload on kill // timeout command will kill it after the specified time with signal SIGINT std::stringstream ss; - ss << "timeout --signal=INT 5 " - << "ros2 run controller_manager spawner " + ss << "timeout --signal=INT 5 " << "ros2 run controller_manager spawner " << "ctrl_3 -c test_controller_manager -t " << std::string(test_controller::TEST_CONTROLLER_CLASS_NAME) << " --unload-on-kill"; diff --git a/hardware_interface/test/test_hardware_components/test_force_torque_sensor.cpp b/hardware_interface/test/test_hardware_components/test_force_torque_sensor.cpp index d226e08fd9..47b19f9769 100644 --- a/hardware_interface/test/test_hardware_components/test_force_torque_sensor.cpp +++ b/hardware_interface/test/test_hardware_components/test_force_torque_sensor.cpp @@ -43,8 +43,7 @@ class TestForceTorqueSensor : public SensorInterface { if ( std::find_if( - state_interfaces.begin(), state_interfaces.end(), - [&ft_key](const auto & interface_info) + state_interfaces.begin(), state_interfaces.end(), [&ft_key](const auto & interface_info) { return interface_info.name == ft_key; }) == state_interfaces.end()) { return CallbackReturn::ERROR; diff --git a/joint_limits/include/joint_limits/joint_limits.hpp b/joint_limits/include/joint_limits/joint_limits.hpp index fffab7a841..6ae0bba0bc 100644 --- a/joint_limits/include/joint_limits/joint_limits.hpp +++ b/joint_limits/include/joint_limits/joint_limits.hpp @@ -122,14 +122,11 @@ struct SoftJointLimits { std::stringstream ss_output; - ss_output << " soft position limits: " - << "[" << min_position << ", " << max_position << "]\n"; + ss_output << " soft position limits: " << "[" << min_position << ", " << max_position << "]\n"; - ss_output << " k-position: " - << "[" << k_position << "]\n"; + ss_output << " k-position: " << "[" << k_position << "]\n"; - ss_output << " k-velocity: " - << "[" << k_velocity << "]\n"; + ss_output << " k-velocity: " << "[" << k_velocity << "]\n"; return ss_output.str(); } diff --git a/rqt_controller_manager/rqt_controller_manager/controller_manager.py b/rqt_controller_manager/rqt_controller_manager/controller_manager.py index d142ea847b..cbe16d3802 100644 --- a/rqt_controller_manager/rqt_controller_manager/controller_manager.py +++ b/rqt_controller_manager/rqt_controller_manager/controller_manager.py @@ -415,4 +415,15 @@ def _get_parameter_controller_names(node, node_name): """Get list of ROS parameter names that potentially represent a controller configuration.""" parameter_names = call_list_parameters(node=node, node_name=node_name) suffix = ".type" +<<<<<<< HEAD return [n[: -len(suffix)] for n in parameter_names if n.endswith(suffix)] +======= + # @note: The versions conditioning is added here to support the source-compatibility with Humble + try: + return [ + n[: -len(suffix)] for n in parameter_names.result().result.names if n.endswith(suffix) + ] + finally: + # for humble, ros2param < 0.20.0 + return [n[: -len(suffix)] for n in parameter_names if n.endswith(suffix)] +>>>>>>> 591b06c (Codeformat from new pre-commit config (#1433))