Skip to content

Commit 034197a

Browse files
authoredMar 14, 2023
Merge pull request autowarefoundation#847 from tier4/sync-awf-upstream
chore: sync awf/autoware_launch
2 parents da9ad0e + dba73df commit 034197a

File tree

6 files changed

+136
-8
lines changed

6 files changed

+136
-8
lines changed
 

‎autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner.param.yaml

+42-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
turn_signal_shift_length_threshold: 0.3
2020
turn_signal_on_swerving: true
2121

22-
path_interval: 2.0
22+
enable_akima_spline_first: false
23+
input_path_interval: 2.0
24+
output_path_interval: 2.0
2325

2426
visualize_maximum_drivable_area: true
2527

@@ -37,14 +39,51 @@
3739

3840
# USE ONLY WHEN THE OPTION COMPILE_WITH_OLD_ARCHITECTURE IS SET TO FALSE.
3941
# https://github.com/autowarefoundation/autoware.universe/blob/main/planning/behavior_path_planner/CMakeLists.txt
42+
# NOTE: The smaller the priority number is, the higher the module priority is.
43+
ext_request_lane_change_left:
44+
enable_module: true
45+
enable_simultaneous_execution: true
46+
priority: 6
47+
max_module_size: 1
48+
49+
ext_request_lane_change_right:
50+
enable_module: true
51+
enable_simultaneous_execution: true
52+
priority: 6
53+
max_module_size: 1
54+
55+
lane_change_left:
56+
enable_module: true
57+
enable_simultaneous_execution: false
58+
priority: 5
59+
max_module_size: 1
60+
61+
lane_change_right:
62+
enable_module: true
63+
enable_simultaneous_execution: false
64+
priority: 4
65+
max_module_size: 1
66+
4067
pull_out:
4168
enable_module: true
4269
enable_simultaneous_execution: false
43-
priority: 1
70+
priority: 0
4471
max_module_size: 1
4572

4673
side_shift:
4774
enable_module: true
4875
enable_simultaneous_execution: false
49-
priority: 0
76+
priority: 2
77+
max_module_size: 1
78+
79+
pull_over:
80+
enable_module: true
81+
enable_simultaneous_execution: false
82+
priority: 1
83+
max_module_size: 1
84+
85+
avoidance:
86+
enable_module: true
87+
enable_simultaneous_execution: false
88+
priority: 3
5089
max_module_size: 1

‎autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/pull_over/pull_over.param.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
min_stop_distance: 5.0
8888
stop_time: 2.0
8989
hysteresis_buffer_distance: 2.0
90+
prediction_time_resolution: 0.5
9091
enable_collision_check_at_prepare_phase: false
9192
use_predicted_path_outside_lanelet: false
9293
use_all_predicted_path: false

‎autoware_launch/launch/autoware.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<arg name="rviz" default="true" description="launch rviz"/>
3535
<arg name="rviz_config" default="$(find-pkg-share autoware_launch)/rviz/autoware.rviz" description="rviz config"/>
3636
<!-- Perception -->
37-
<arg name="perception_mode" default="camera_lidar_fusion" description="select perception mode. camera_lidar_radar_fusion, camera_lidar_fusion, lidar_radar_fusion, lidar, radar"/>
37+
<arg name="perception_mode" default="lidar" description="select perception mode. camera_lidar_radar_fusion, camera_lidar_fusion, lidar_radar_fusion, lidar, radar"/>
3838
<arg name="traffic_light_recognition/enable_fine_detection" default="true" description="enable traffic light fine detection"/>
3939

4040
<!-- Global parameters -->

‎autoware_launch/launch/components/tier4_simulator_component.launch.xml

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<arg name="launch_dummy_perception"/>
44
<arg name="launch_dummy_vehicle"/>
55
<arg name="launch_dummy_localization"/>
6-
<arg name="launch_planning_evaluator"/>
76
<arg name="launch_diagnostic_converter"/>
87
<arg name="perception/enable_detection_failure"/>
98
<arg name="perception/enable_object_recognition"/>
@@ -16,7 +15,6 @@
1615
<arg name="launch_dummy_perception" value="$(var launch_dummy_perception)"/>
1716
<arg name="launch_dummy_vehicle" value="$(var launch_dummy_vehicle)"/>
1817
<arg name="launch_dummy_localization" value="$(var launch_dummy_localization)"/>
19-
<arg name="launch_planning_evaluator" value="$(var launch_planning_evaluator)"/>
2018
<arg name="launch_diagnostic_converter" value="$(var launch_diagnostic_converter)"/>
2119
<arg name="perception/enable_detection_failure" value="$(var perception/enable_detection_failure)"/>
2220
<arg name="perception/enable_object_recognition" value="$(var perception/enable_object_recognition)"/>

‎autoware_launch/launch/planning_simulator.launch.xml

-2
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,12 @@
6262
<let name="launch_dummy_vehicle" value="false" if="$(var scenario_simulation)"/>
6363
<let name="launch_dummy_vehicle" value="true" unless="$(var scenario_simulation)"/>
6464
<let name="launch_dummy_localization" value="true"/>
65-
<let name="launch_planning_evaluator" value="$(var scenario_simulation)"/>
6665
<let name="launch_diagnostic_converter" value="$(var scenario_simulation)"/>
6766

6867
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_simulator_component.launch.xml">
6968
<arg name="launch_dummy_perception" value="$(var launch_dummy_perception)"/>
7069
<arg name="launch_dummy_vehicle" value="$(var launch_dummy_vehicle)"/>
7170
<arg name="launch_dummy_localization" value="$(var launch_dummy_localization)"/>
72-
<arg name="launch_planning_evaluator" value="$(var launch_planning_evaluator)"/>
7371
<arg name="launch_diagnostic_converter" value="$(var launch_diagnostic_converter)"/>
7472
<arg name="perception/enable_detection_failure" value="$(var perception/enable_detection_failure)"/>
7573
<arg name="perception/enable_object_recognition" value="$(var perception/enable_object_recognition)"/>

‎autoware_launch/rviz/autoware.rviz

+92
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,98 @@ Visualization Manager:
10111011
Constant Color: false
10121012
Scale: 0.30000001192092896
10131013
Value: true
1014+
- Class: rviz_plugins/Path
1015+
Color Border Vel Max: 3
1016+
Enabled: false
1017+
Name: PathReference_Avoidance
1018+
Topic:
1019+
Depth: 5
1020+
Durability Policy: Volatile
1021+
History Policy: Keep Last
1022+
Reliability Policy: Reliable
1023+
Value: /planning/path_reference/avoidance
1024+
Value: true
1025+
View Path:
1026+
Alpha: 0.3
1027+
Color: 210; 110; 210
1028+
Constant Color: true
1029+
Value: true
1030+
Width: 2
1031+
View Velocity:
1032+
Alpha: 0.30000001192092896
1033+
Color: 0; 0; 0
1034+
Constant Color: false
1035+
Scale: 0.30000001192092896
1036+
Value: false
1037+
- Class: rviz_plugins/Path
1038+
Color Border Vel Max: 3
1039+
Enabled: false
1040+
Name: PathReference_LaneChange
1041+
Topic:
1042+
Depth: 5
1043+
Durability Policy: Volatile
1044+
History Policy: Keep Last
1045+
Reliability Policy: Reliable
1046+
Value: /planning/path_reference/lane_change
1047+
Value: true
1048+
View Path:
1049+
Alpha: 0.3
1050+
Color: 210; 210; 110
1051+
Constant Color: true
1052+
Value: true
1053+
Width: 2
1054+
View Velocity:
1055+
Alpha: 0.30000001192092896
1056+
Color: 0; 0; 0
1057+
Constant Color: false
1058+
Scale: 0.30000001192092896
1059+
Value: false
1060+
- Class: rviz_plugins/Path
1061+
Color Border Vel Max: 3
1062+
Enabled: false
1063+
Name: PathReference_PullOver
1064+
Topic:
1065+
Depth: 5
1066+
Durability Policy: Volatile
1067+
History Policy: Keep Last
1068+
Reliability Policy: Reliable
1069+
Value: /planning/path_reference/pull_over
1070+
Value: true
1071+
View Path:
1072+
Alpha: 0.3
1073+
Color: 110; 110; 210
1074+
Constant Color: true
1075+
Value: true
1076+
Width: 2
1077+
View Velocity:
1078+
Alpha: 0.30000001192092896
1079+
Color: 0; 0; 0
1080+
Constant Color: false
1081+
Scale: 0.30000001192092896
1082+
Value: false
1083+
- Class: rviz_plugins/Path
1084+
Color Border Vel Max: 3
1085+
Enabled: false
1086+
Name: PathReference_PullOut
1087+
Topic:
1088+
Depth: 5
1089+
Durability Policy: Volatile
1090+
History Policy: Keep Last
1091+
Reliability Policy: Reliable
1092+
Value: /planning/path_reference/pull_out
1093+
Value: true
1094+
View Path:
1095+
Alpha: 0.3
1096+
Color: 210; 110; 110
1097+
Constant Color: true
1098+
Value: true
1099+
Width: 2
1100+
View Velocity:
1101+
Alpha: 0.30000001192092896
1102+
Color: 0; 0; 0
1103+
Constant Color: false
1104+
Scale: 0.30000001192092896
1105+
Value: false
10141106
- Class: rviz_plugins/Path
10151107
Color Border Vel Max: 3
10161108
Enabled: true

0 commit comments

Comments
 (0)
Please sign in to comment.