@@ -116,23 +116,6 @@ def launch_setup(context, *args, **kwargs):
116
116
parameters = [nearest_search_param , lane_departure_checker_param , vehicle_info_param ],
117
117
extra_arguments = [{"use_intra_process_comms" : LaunchConfiguration ("use_intra_process" )}],
118
118
)
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
- )
136
119
137
120
# shift decider
138
121
shift_decider_component = ComposableNode (
@@ -206,6 +189,29 @@ def launch_setup(context, *args, **kwargs):
206
189
target_container = "/control/control_container" ,
207
190
)
208
191
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
+
209
215
# vehicle cmd gate
210
216
vehicle_cmd_gate_component = ComposableNode (
211
217
package = "vehicle_cmd_gate" ,
@@ -351,7 +357,6 @@ def launch_setup(context, *args, **kwargs):
351
357
executable = LaunchConfiguration ("container_executable" ),
352
358
composable_node_descriptions = [
353
359
controller_component ,
354
- control_validator_component ,
355
360
lane_departure_component ,
356
361
shift_decider_component ,
357
362
vehicle_cmd_gate_component ,
@@ -369,6 +374,7 @@ def launch_setup(context, *args, **kwargs):
369
374
obstacle_collision_checker_loader ,
370
375
autonomous_emergency_braking_loader ,
371
376
predicted_path_checker_loader ,
377
+ control_validator_loader ,
372
378
]
373
379
)
374
380
0 commit comments