Merge branch 'master' into fix/failed/hw/initialization/logs

ros-controls · Aug 27, 2024 · 167e1b2 · 167e1b2
2 parents 3a8f949 + d200408
commit 167e1b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/controller_manager/src/ros2_control_node.cpp b/controller_manager/src/ros2_control_node.cpp
@@ -50,7 +50,6 @@ int main(int argc, char ** argv)
       // A simple way to reject non ros args
       continue;
     }
-    RCLCPP_INFO(rclcpp::get_logger("CM args"), "Adding argument: %s", argv[i]);
     node_arguments.push_back(argv[i]);
   }
   cm_node_options.arguments(node_arguments);

diff --git a/ros2controlcli/ros2controlcli/verb/list_controllers.py b/ros2controlcli/ros2controlcli/verb/list_controllers.py
@@ -98,6 +98,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)