Skip to content

Commit

Permalink
Merge branch 'main' into feat/add_enable_all_modules_auto_mode
Browse files Browse the repository at this point in the history
Signed-off-by: kyoichi-sugahara <[email protected]>
  • Loading branch information
kyoichi-sugahara committed Jan 19, 2024
2 parents 791d631 + 61d8ee5 commit 1ed80c9
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
roi_scale_factor: 1.1
iou_threshold: 0.65
unknown_iou_threshold: 0.1
remove_unknown: true
remove_unknown: false
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
check_lateral_acceleration_constraints: false # whether to check if the predicted path complies with lateral acceleration constraints
max_lateral_accel: 2.0 # [m/ss] max acceptable lateral acceleration for predicted vehicle paths
min_acceleration_before_curve: -2.0 # [m/ss] min acceleration a vehicle might take to decelerate before a curve
use_vehicle_acceleration: false # whether to consider current vehicle acceleration when predicting paths or not
speed_limit_multiplier: 1.5 # When using vehicle acceleration. Set vehicle's maximum predicted speed as the legal speed limit in that lanelet times this value
acceleration_exponential_half_life: 2.5 # [s] When using vehicle acceleration. The decaying acceleration model considers that the current vehicle acceleration will be halved after this many seconds
# parameter for shoulder lane prediction
prediction_time_horizon_rate_for_validate_shoulder_lane_length: 0.8

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@
motorcycle: true # [-]
pedestrian: true # [-]
# detection range
object_check_goal_distance: 20.0 # [m]
object_check_goal_distance: 20.0 # [m]
object_check_return_pose_distance: 20.0 # [m]
# filtering parking objects
threshold_distance_object_is_on_center: 1.0 # [m]
object_check_shiftable_ratio: 0.6 # [-]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

goal_planner:
enable_rtc: false
enable_simultaneous_execution_as_approved_module: false
enable_simultaneous_execution_as_approved_module: true
enable_simultaneous_execution_as_candidate_module: false
keep_last: true
priority: 1
Expand All @@ -67,7 +67,7 @@
priority: 4
max_module_size: 1

avoidance_by_lc:
avoidance_by_lane_change:
enable_rtc: false
enable_simultaneous_execution_as_approved_module: false
enable_simultaneous_execution_as_candidate_module: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
center_line_path_interval: 1.0
# shift pull out
enable_shift_pull_out: true
check_shift_path_lane_departure: false
check_shift_path_lane_departure: true
minimum_shift_pull_out_distance: 0.0
deceleration_interval: 15.0
lateral_jerk: 0.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
max_accel: -2.8
max_jerk: -5.0
delay_response_time: 0.5
enable_pass_judge_before_default_stopline: false

stuck_vehicle:
turn_direction:
Expand All @@ -36,7 +37,6 @@
consider_wrong_direction_vehicle: false
collision_detection_hold_time: 0.5
min_predicted_path_confidence: 0.05
keep_detection_velocity_threshold: 0.833
velocity_profile:
use_upstream: true
minimum_upstream_velocity: 0.01
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@
surround_check_side_distance: 0.5
surround_check_back_distance: 0.5
unknown:
enable_check: true
enable_check: false
surround_check_front_distance: 0.5
surround_check_side_distance: 0.5
surround_check_back_distance: 0.5
car:
enable_check: true
surround_check_front_distance: 0.5
surround_check_side_distance: 0.0
surround_check_back_distance: 0.5
surround_check_back_distance: 0.0
truck:
enable_check: true
surround_check_front_distance: 0.5
surround_check_side_distance: 0.0
surround_check_back_distance: 0.5
surround_check_back_distance: 0.0
bus:
enable_check: true
surround_check_front_distance: 0.5
surround_check_side_distance: 0.0
surround_check_back_distance: 0.5
surround_check_back_distance: 0.0
trailer:
enable_check: true
surround_check_front_distance: 0.5
surround_check_side_distance: 0.0
surround_check_back_distance: 0.5
surround_check_back_distance: 0.0
motorcycle:
enable_check: true
surround_check_front_distance: 0.5
Expand All @@ -49,9 +49,9 @@
surround_check_side_distance: 0.5
surround_check_back_distance: 0.5

surround_check_hysteresis_distance: 0.3
surround_check_hysteresis_distance: 0.1

state_clear_time: 2.0
state_clear_time: 0.2

# ego stop state
stop_state_ego_speed: 0.1 #[m/s]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@
<arg name="pose_source" default="ndt" description="select pose_estimator: ndt, yabloc, eagleye"/>
<arg name="twist_source" default="gyro_odom" description="select twist_estimator. gyro_odom, eagleye"/>
<arg name="input_pointcloud" default="/sensing/lidar/top/pointcloud" description="The topic will be used in the localization util module"/>
<arg
name="lidar_container_name"
default="/sensing/lidar/top/pointcloud_preprocessor/pointcloud_container"
description="The target container to which lidar preprocessing nodes in localization be attached"
/>

<group>
<include file="$(find-pkg-share tier4_localization_launch)/launch/localization.launch.xml">
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="pose_source" value="$(var pose_source)"/>
<arg name="twist_source" value="$(var twist_source)"/>
<arg name="system_run_mode" value="$(var system_run_mode)"/>
<arg name="input_pointcloud" value="$(var input_pointcloud)"/>
<arg name="lidar_container_name" value="$(var lidar_container_name)"/>

<!-- parameter paths for common -->
<arg name="crop_box_filter_measurement_range_param_path" value="$(var loc_config_path)/crop_box_filter_measurement_range.param.yaml"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<include file="$(find-pkg-share tier4_perception_launch)/launch/perception.launch.xml">
<arg name="mode" value="$(var perception_mode)"/>
<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_fine_detection" value="$(var traffic_light_recognition/enable_fine_detection)"/>
<arg name="occupancy_grid_map_method" value="$(var occupancy_grid_map_method)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<arg name="behavior_path_planner_scene_module_manager_param_path" value="$(var behavior_path_config_path)/scene_module_manager.param.yaml"/>
<arg name="behavior_path_planner_side_shift_module_param_path" value="$(var behavior_path_config_path)/side_shift/side_shift.param.yaml"/>
<arg name="behavior_path_planner_avoidance_module_param_path" value="$(var behavior_path_config_path)/avoidance/avoidance.param.yaml"/>
<arg name="behavior_path_planner_avoidance_by_lc_module_param_path" value="$(var behavior_path_config_path)/avoidance_by_lc/avoidance_by_lc.param.yaml"/>
<arg name="behavior_path_planner_avoidance_by_lc_module_param_path" value="$(var behavior_path_config_path)/avoidance_by_lane_change/avoidance_by_lane_change.param.yaml"/>
<arg name="behavior_path_planner_dynamic_avoidance_module_param_path" value="$(var behavior_path_config_path)/dynamic_avoidance/dynamic_avoidance.param.yaml"/>
<arg name="behavior_path_planner_lane_change_module_param_path" value="$(var behavior_path_config_path)/lane_change/lane_change.param.yaml"/>
<arg name="behavior_path_planner_goal_planner_module_param_path" value="$(var behavior_path_config_path)/goal_planner/goal_planner.param.yaml"/>
Expand Down
2 changes: 1 addition & 1 deletion autoware_launch/launch/pointcloud_container.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def add_launch_arg(name: str, default_value=None):
package="rclcpp_components",
executable=LaunchConfiguration("container_executable"),
composable_node_descriptions=[],
output="screen",
output="both",
)

return LaunchDescription(
Expand Down
16 changes: 16 additions & 0 deletions autoware_launch/rviz/autoware.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -3649,6 +3649,22 @@ Visualization Manager:
Value: true
Enabled: true
Name: Objects Of Interest
- Class: rviz_plugins/StringStampedOverlayDisplay
Enabled: true
Font Size: 15
Left: 1024
Max Letter Num: 100
Name: StringStampedOverlayDisplay
Text Color: 25; 255; 240
Top: 128
Topic:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/internal_state
Value: true
Value height offset: 0
Enabled: true
Name: Planning
- Class: rviz_common/Group
Expand Down

0 comments on commit 1ed80c9

Please sign in to comment.