Skip to content

Commit aea4c34

Browse files
committed
update launch files
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
1 parent 4f68d95 commit aea4c34

File tree

2 files changed

+26
-3
lines changed

2 files changed

+26
-3
lines changed

launch/tier4_control_launch/launch/control.launch.xml

+14-1
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,19 @@
4545
<let name="container_executable" value="component_container" unless="$(var use_multithread)"/>
4646
<let name="container_executable" value="component_container_mt" if="$(var use_multithread)"/>
4747

48+
<!-- temporary: control_command_gate migration -->
49+
<arg name="use_control_command_gate" default="false"/>
50+
4851
<group>
4952
<push-ros-namespace namespace="control"/>
5053

54+
<group if="$(var use_control_command_gate)">
55+
<include file="$(find-pkg-share autoware_control_command_gate)/launch/control_command_gate.launch.xml"/>
56+
</group>
57+
<group if="$(var use_control_command_gate)">
58+
<include file="$(find-pkg-share autoware_stop_mode_operator)/launch/stop_mode_operator.launch.xml"/>
59+
</group>
60+
5161
<group>
5262
<!-- set a control container to run all required components in the same process -->
5363
<node_container pkg="rclcpp_components" exec="$(var container_executable)" name="control_container" namespace="">
@@ -61,8 +71,9 @@
6171
<param from="$(var shift_decider_param_path)"/>
6272
<extra_arg name="use_intra_process_comms" value="$(var use_intra_process)"/>
6373
</composable_node>
74+
6475
<!-- vehicle cmd gate -->
65-
<composable_node pkg="autoware_vehicle_cmd_gate" plugin="autoware::vehicle_cmd_gate::VehicleCmdGate" name="vehicle_cmd_gate">
76+
<composable_node pkg="autoware_vehicle_cmd_gate" plugin="autoware::vehicle_cmd_gate::VehicleCmdGate" name="vehicle_cmd_gate" unless="$(var use_control_command_gate)">
6677
<remap from="input/steering" to="/vehicle/status/steering_status"/>
6778
<remap from="input/operation_mode" to="/system/operation_mode/state"/>
6879
<remap from="input/auto/control_cmd" to="/control/trajectory_follower/control_cmd"/>
@@ -101,11 +112,13 @@
101112
<param name="check_external_emergency_heartbeat" value="$(var check_external_emergency_heartbeat)"/>
102113
<extra_arg name="use_intra_process_comms" value="$(var use_intra_process)"/>
103114
</composable_node>
115+
104116
<!-- operation mode transition manager -->
105117
<composable_node
106118
pkg="autoware_operation_mode_transition_manager"
107119
plugin="autoware::operation_mode_transition_manager::OperationModeTransitionManager"
108120
name="autoware_operation_mode_transition_manager"
121+
unless="$(var use_control_command_gate)"
109122
>
110123
<!-- input -->
111124
<remap from="kinematics" to="/localization/kinematic_state"/>

launch/tier4_system_launch/launch/system.launch.xml

+12-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,19 @@
3434
<arg name="launch_rqt_robot_monitor" default="false"/>
3535
<arg name="launch_rqt_runtime_monitor_err" default="false"/>
3636

37+
<!-- temporary: control_command_gate migration -->
38+
<arg name="use_control_command_gate" default="false"/>
39+
3740
<group>
3841
<push-ros-namespace namespace="/system"/>
3942

43+
<group if="$(var use_control_command_gate)">
44+
<include file="$(find-pkg-share autoware_command_mode_switcher)/launch/switcher.launch.xml"/>
45+
</group>
46+
<group if="$(var use_control_command_gate)">
47+
<include file="$(find-pkg-share autoware_command_mode_decider)/launch/decider.launch.xml"/>
48+
</group>
49+
4050
<!-- System Monitor -->
4151
<group if="$(var launch_system_monitor)">
4252
<push-ros-namespace namespace="system_monitor"/>
@@ -80,7 +90,7 @@
8090
</group>
8191

8292
<!-- MRM Operator -->
83-
<group>
93+
<group unless="$(var use_control_command_gate)">
8494
<include file="$(find-pkg-share autoware_mrm_comfortable_stop_operator)/launch/mrm_comfortable_stop_operator.launch.py">
8595
<arg name="config_file" value="$(var mrm_comfortable_stop_operator_param_path)"/>
8696
</include>
@@ -105,7 +115,7 @@
105115
</group>
106116

107117
<!-- MRM Handler -->
108-
<group>
118+
<group unless="$(var use_control_command_gate)">
109119
<include file="$(find-pkg-share autoware_mrm_handler)/launch/mrm_handler.launch.xml">
110120
<arg name="config_file" value="$(var mrm_handler_param_path)"/>
111121
</include>

0 commit comments

Comments
 (0)