Skip to content

Commit 5783054

Browse files
committed
feat(tier4_control_launch): run control_validator out of main control container
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
1 parent 6b1a459 commit 5783054

File tree

1 file changed

+24
-18
lines changed

1 file changed

+24
-18
lines changed

launch/tier4_control_launch/launch/control.launch.py

+24-18
Original file line numberDiff line numberDiff line change
@@ -116,23 +116,6 @@ def launch_setup(context, *args, **kwargs):
116116
parameters=[nearest_search_param, lane_departure_checker_param, vehicle_info_param],
117117
extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
118118
)
119-
# control validator checker
120-
control_validator_component = ComposableNode(
121-
package="control_validator",
122-
plugin="control_validator::ControlValidator",
123-
name="control_validator",
124-
remappings=[
125-
("~/input/kinematics", "/localization/kinematic_state"),
126-
("~/input/reference_trajectory", "/planning/scenario_planning/trajectory"),
127-
(
128-
"~/input/predicted_trajectory",
129-
"/control/trajectory_follower/lateral/predicted_trajectory",
130-
),
131-
("~/output/validation_status", "~/validation_status"),
132-
],
133-
parameters=[control_validator_param],
134-
extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
135-
)
136119

137120
# shift decider
138121
shift_decider_component = ComposableNode(
@@ -206,6 +189,29 @@ def launch_setup(context, *args, **kwargs):
206189
target_container="/control/control_container",
207190
)
208191

192+
# control validator checker
193+
control_validator_component = ComposableNode(
194+
package="control_validator",
195+
plugin="control_validator::ControlValidator",
196+
name="control_validator",
197+
remappings=[
198+
("~/input/kinematics", "/localization/kinematic_state"),
199+
("~/input/reference_trajectory", "/planning/scenario_planning/trajectory"),
200+
(
201+
"~/input/predicted_trajectory",
202+
"/control/trajectory_follower/lateral/predicted_trajectory",
203+
),
204+
("~/output/validation_status", "~/validation_status"),
205+
],
206+
parameters=[control_validator_param],
207+
extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
208+
)
209+
210+
control_validator_loader = LoadComposableNodes(
211+
composable_node_descriptions=[control_validator_component],
212+
target_container="/control/control_container",
213+
)
214+
209215
# vehicle cmd gate
210216
vehicle_cmd_gate_component = ComposableNode(
211217
package="vehicle_cmd_gate",
@@ -351,7 +357,6 @@ def launch_setup(context, *args, **kwargs):
351357
executable=LaunchConfiguration("container_executable"),
352358
composable_node_descriptions=[
353359
controller_component,
354-
control_validator_component,
355360
lane_departure_component,
356361
shift_decider_component,
357362
vehicle_cmd_gate_component,
@@ -369,6 +374,7 @@ def launch_setup(context, *args, **kwargs):
369374
obstacle_collision_checker_loader,
370375
autonomous_emergency_braking_loader,
371376
predicted_path_checker_loader,
377+
control_validator_loader,
372378
]
373379
)
374380

0 commit comments

Comments
 (0)