Skip to content

Commit

Permalink
Merge pull request autowarefoundation#747 from tier4/feat/add_enable_…
Browse files Browse the repository at this point in the history
…all_auto_mode

feat: add enable_all_modules_auto_mode argument to launch files for behavior modules
  • Loading branch information
tkimura4 authored Jan 23, 2024
2 parents 549bb62 + f4b128a commit d662cc5
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
show_processing_time: false # [-] whether to show processing time
# param for input data
traffic_light_state_timeout: 3.0 # [s] timeout threshold for traffic light signal
enable_rtc: false # if true, the scene modules should be approved by (request to cooperate)rtc function. if false, the module can be run without approval from rtc.
enable_rtc: true # if true, the scene modules should be approved by (request to cooperate)rtc function. if false, the module can be run without approval from rtc.

# param for stop position
stop_position:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
ttc: [0]

enable_rtc:
intersection: false
intersection_to_occlusion: false
intersection: true
intersection_to_occlusion: true

merge_from_private:
stopline_margin: 3.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
stop_time_hysteresis: 0.1
yellow_lamp_period: 2.75
enable_pass_judge: true
enable_rtc: false # If set to true, the scene modules require approval from the rtc (request to cooperate) function. If set to false, the modules can be executed without requiring rtc approval
enable_rtc: true # If set to true, the scene modules require approval from the rtc (request to cooperate) function. If set to false, the modules can be executed without requiring rtc approval
3 changes: 3 additions & 0 deletions autoware_launch/launch/autoware.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@
value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager_foa.param.yaml"
if="$(var use_foa)"
/>
<!-- Auto mode setting-->
<arg name="enable_all_modules_auto_mode" default="false" description="enable all module's auto mode"/>

<!-- Global parameters -->
<group scoped="false">
Expand Down Expand Up @@ -142,6 +144,7 @@
<arg name="use_experimental_lane_change_function" value="$(var use_experimental_lane_change_function)"/>
<arg name="rtc_auto_mode_manager_param_path" value="$(var rtc_auto_mode_manager_param_path)"/>
<arg name="scene_module_manager_param_path" value="$(var scene_module_manager_param_path)"/>
<arg name="enable_all_modules_auto_mode" value="$(var enable_all_modules_auto_mode)"/>
</include>
</group>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
<arg name="rtc_auto_mode_manager_param_path"/>
<arg name="scene_module_manager_param_path"/>
<arg name="module_preset" default="default"/>
<arg name="enable_all_modules_auto_mode" default="false"/>
<include file="$(find-pkg-share autoware_launch)/config/planning/preset/$(var module_preset)_preset.yaml"/>

<include file="$(find-pkg-share tier4_planning_launch)/launch/planning.launch.xml">
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="enable_all_modules_auto_mode" value="$(var enable_all_modules_auto_mode)"/>

<!-- common -->
<arg name="common_config_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/common"/>
Expand Down
4 changes: 4 additions & 0 deletions autoware_launch/launch/planning_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@

<let name="rviz_respawn" value="false" if="$(var scenario_simulation)"/>
<let name="rviz_respawn" value="true" unless="$(var scenario_simulation)"/>
<!-- Auto mode setting-->
<arg name="enable_all_modules_auto_mode" default="$(var scenario_simulation)" description="enable all module's auto mode"/>

<group scoped="false">
<!-- Vehicle -->
Expand Down Expand Up @@ -74,6 +76,8 @@
<!-- Others -->
<arg name="use_foa" value="$(var use_foa)"/>
<arg name="rviz_respawn" value="$(var rviz_respawn)"/>
<!-- Auto mode setting-->
<arg name="enable_all_modules_auto_mode" value="$(var enable_all_modules_auto_mode)"/>
</include>
</group>

Expand Down

0 comments on commit d662cc5

Please sign in to comment.