Merge branch 'master' into add/statistics/hardware_components

saikishor · web-flow · commit 1d0514cc4e38 · 2025-03-19T13:27:30.000+01:00
diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp
@@ -3974,7 +3974,9 @@ rclcpp::NodeOptions ControllerManager::determine_controller_node_options(
     {
       if (
         node_options_arguments.back() == RCL_REMAP_FLAG ||
-        node_options_arguments.back() == RCL_SHORT_REMAP_FLAG)
+        node_options_arguments.back() == RCL_SHORT_REMAP_FLAG ||
+        node_options_arguments.back() == RCL_PARAM_FLAG ||
+        node_options_arguments.back() == RCL_SHORT_PARAM_FLAG)
       {
         node_options_arguments.pop_back();
       }

Original file line number	Diff line number	Diff line change
`@@ -3974,7 +3974,9 @@ rclcpp::NodeOptions ControllerManager::determine_controller_node_options(`
`3974`	`3974`	`{`
`3975`	`3975`	`if (`
`3976`	`3976`	`node_options_arguments.back() == RCL_REMAP_FLAG \|\|`
`3977`		`- node_options_arguments.back() == RCL_SHORT_REMAP_FLAG)`
	`3977`	`+ node_options_arguments.back() == RCL_SHORT_REMAP_FLAG \|\|`
	`3978`	`+ node_options_arguments.back() == RCL_PARAM_FLAG \|\|`
	`3979`	`+ node_options_arguments.back() == RCL_SHORT_PARAM_FLAG)`
`3978`	`3980`	`{`
`3979`	`3981`	`node_options_arguments.pop_back();`
`3980`	`3982`	`}`