From 3f842fce07b5d0503de3a8a4722b988292267767 Mon Sep 17 00:00:00 2001 From: Mamoru Sobue Date: Mon, 19 Feb 2024 12:25:11 +0900 Subject: [PATCH 1/3] chore(tier4_control_launch): control validator name Signed-off-by: Mamoru Sobue --- launch/tier4_control_launch/launch/control.launch.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/launch/tier4_control_launch/launch/control.launch.py b/launch/tier4_control_launch/launch/control.launch.py index 3d55fed77d034..53ff8b8de1092 100644 --- a/launch/tier4_control_launch/launch/control.launch.py +++ b/launch/tier4_control_launch/launch/control.launch.py @@ -375,11 +375,18 @@ def launch_setup(context, *args, **kwargs): [ PushRosNamespace("control"), ComposableNodeContainer( - name="control_validator_container", + name="control_container_validator", namespace="", package="rclcpp_components", executable=LaunchConfiguration("container_executable"), - composable_node_descriptions=[control_validator_component, glog_component], + composable_node_descriptions=[ + control_validator_component, + ComposableNode( + package="glog_component", + plugin="GlogComponent", + name="glog_component_validator", + ), + ], ), ] ) From cd98d2b5cd5b275eba623575e7cc9b68e808e5f0 Mon Sep 17 00:00:00 2001 From: Mamoru Sobue Date: Mon, 19 Feb 2024 12:43:27 +0900 Subject: [PATCH 2/3] Revert "chore(tier4_control_launch): control validator name" This reverts commit 3f842fce07b5d0503de3a8a4722b988292267767. --- launch/tier4_control_launch/launch/control.launch.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/launch/tier4_control_launch/launch/control.launch.py b/launch/tier4_control_launch/launch/control.launch.py index 53ff8b8de1092..3d55fed77d034 100644 --- a/launch/tier4_control_launch/launch/control.launch.py +++ b/launch/tier4_control_launch/launch/control.launch.py @@ -375,18 +375,11 @@ def launch_setup(context, *args, **kwargs): [ PushRosNamespace("control"), ComposableNodeContainer( - name="control_container_validator", + name="control_validator_container", namespace="", package="rclcpp_components", executable=LaunchConfiguration("container_executable"), - composable_node_descriptions=[ - control_validator_component, - ComposableNode( - package="glog_component", - plugin="GlogComponent", - name="glog_component_validator", - ), - ], + composable_node_descriptions=[control_validator_component, glog_component], ), ] ) From 9102c44e4db0ad94832d23fd40e7db5bd281064c Mon Sep 17 00:00:00 2001 From: Mamoru Sobue Date: Mon, 19 Feb 2024 12:45:42 +0900 Subject: [PATCH 3/3] just rename glog component Signed-off-by: Mamoru Sobue --- launch/tier4_control_launch/launch/control.launch.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/launch/tier4_control_launch/launch/control.launch.py b/launch/tier4_control_launch/launch/control.launch.py index 3d55fed77d034..b49ff7bde2ed3 100644 --- a/launch/tier4_control_launch/launch/control.launch.py +++ b/launch/tier4_control_launch/launch/control.launch.py @@ -379,7 +379,14 @@ def launch_setup(context, *args, **kwargs): namespace="", package="rclcpp_components", executable=LaunchConfiguration("container_executable"), - composable_node_descriptions=[control_validator_component, glog_component], + composable_node_descriptions=[ + control_validator_component, + ComposableNode( + package="glog_component", + plugin="GlogComponent", + name="glog_validator_component", + ), + ], ), ] )