From 5db182140327390f9036fa63cdb8f4b93a208931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Tue, 10 Oct 2023 14:38:56 +0200 Subject: [PATCH] Fix doc of load_controller (#1132) (cherry picked from commit 19c8ff8651433727e05154f13a0531dd705b2278) # Conflicts: # ros2controlcli/doc/userdoc.rst --- ros2controlcli/doc/userdoc.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ros2controlcli/doc/userdoc.rst b/ros2controlcli/doc/userdoc.rst index d604a26fe8..33c7e0b980 100644 --- a/ros2controlcli/doc/userdoc.rst +++ b/ros2controlcli/doc/userdoc.rst @@ -148,7 +148,7 @@ load_controller .. code-block:: console $ ros2 control load_controller -h - usage: ros2 control load_controller [-h] [--spin-time SPIN_TIME] [--set_state {configure,activate}] [-c CONTROLLER_MANAGER] [--include-hidden-nodes] controller_name + usage: ros2 control load_controller [-h] [--spin-time SPIN_TIME] [--set-state {inactive,active}] [-c CONTROLLER_MANAGER] [--include-hidden-nodes] controller_name Load a controller in a controller manager @@ -159,7 +159,11 @@ load_controller -h, --help show this help message and exit --spin-time SPIN_TIME Spin time in seconds to wait for discovery (only applies when not using an already running daemon) +<<<<<<< HEAD --set_state {configured,inactive,active} +======= + --set-state {inactive,active} +>>>>>>> 19c8ff8 (Fix doc of load_controller (#1132)) Set the state of the loaded controller -c CONTROLLER_MANAGER, --controller-manager CONTROLLER_MANAGER Name of the controller manager ROS node