Skip to content

Commit

Permalink
Merge branch 'awf-latest' into sync-awf-latest
Browse files Browse the repository at this point in the history
  • Loading branch information
yuki-takagi-66 authored Dec 3, 2024
2 parents 6bbe983 + abcd4ea commit 14e43c3
Show file tree
Hide file tree
Showing 27 changed files with 569 additions and 41 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions autoware_launch/config/planning/preset/default_preset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ launch:
default: "true"
- arg:
name: launch_dynamic_obstacle_avoidance
default: "false"
default: "true"
- arg:
name: launch_sampling_planner_module
default: "false" # Warning, experimental module, use only in simulations
Expand Down Expand Up @@ -120,7 +120,7 @@ launch:

- arg:
name: launch_surround_obstacle_checker
default: "false"
default: "true"

# parking modules
- arg:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**:
ros__parameters:
max_vel: 4.17 # max velocity limit [m/s]
max_vel: 11.1 # max velocity limit [m/s]

# constraints param for normal driving
normal:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
object_path_base:
min_longitudinal_polygon_margin: 3.0 # [m]

lat_offset_from_obstacle: 0.3 # [m]
margin_distance_around_pedestrian: 0.8 # [m]
lat_offset_from_obstacle: 1.0 # [m]
margin_distance_around_pedestrian: 2.0 # [m]
predicted_path:
end_time_to_consider: 1.0 # [s]
end_time_to_consider: 2.0 # [s]
threshold_confidence: 0.0 # [] not probability
max_lat_offset_to_avoid: 0.5 # [m]
max_time_for_object_lat_shift: 0.0 # [s]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
th_moving_time: 2.0 # [s]
longitudinal_margin: 0.0 # [m]
lateral_margin:
soft_margin: 0.5 # [m]
soft_margin: 0.7 # [m]
hard_margin: 0.2 # [m]
hard_margin_for_parked_vehicle: 0.2 # [m]
hard_margin_for_parked_vehicle: 0.7 # [m]
max_expand_ratio: 0.0 # [-] FOR DEVELOPER
envelope_buffer_margin: 0.1 # [m] FOR DEVELOPER
th_error_eclipse_long_radius : 0.6 # [m]
Expand All @@ -34,9 +34,9 @@
th_moving_time: 2.0
longitudinal_margin: 0.0
lateral_margin:
soft_margin: 0.5
soft_margin: 0.7
hard_margin: 0.2
hard_margin_for_parked_vehicle: 0.2
hard_margin_for_parked_vehicle: 0.7
max_expand_ratio: 0.0
envelope_buffer_margin: 0.1
th_error_eclipse_long_radius : 0.6
Expand All @@ -45,9 +45,9 @@
th_moving_time: 2.0
longitudinal_margin: 0.0
lateral_margin:
soft_margin: 0.5
soft_margin: 0.7
hard_margin: 0.2
hard_margin_for_parked_vehicle: 0.2
hard_margin_for_parked_vehicle: 0.7
max_expand_ratio: 0.0
envelope_buffer_margin: 0.1
th_error_eclipse_long_radius : 0.6
Expand All @@ -56,9 +56,9 @@
th_moving_time: 2.0
longitudinal_margin: 0.0
lateral_margin:
soft_margin: 0.5
soft_margin: 0.7
hard_margin: 0.2
hard_margin_for_parked_vehicle: 0.2
hard_margin_for_parked_vehicle: 0.7
max_expand_ratio: 0.0
envelope_buffer_margin: 0.1
th_error_eclipse_long_radius : 0.6
Expand All @@ -67,7 +67,7 @@
th_moving_time: 1.0
longitudinal_margin: 0.0
lateral_margin:
soft_margin: 0.5
soft_margin: 0.7
hard_margin: -0.2
hard_margin_for_parked_vehicle: -0.2
max_expand_ratio: 0.0
Expand All @@ -76,33 +76,33 @@
bicycle:
th_moving_speed: 0.28
th_moving_time: 1.0
longitudinal_margin: 0.6
longitudinal_margin: 1.0
lateral_margin:
soft_margin: 0.7
hard_margin: 0.5
hard_margin_for_parked_vehicle: 0.2
hard_margin_for_parked_vehicle: 0.5
max_expand_ratio: 0.0
envelope_buffer_margin: 0.5
th_error_eclipse_long_radius : 0.6
motorcycle:
th_moving_speed: 1.0
th_moving_time: 1.0
longitudinal_margin: 0.6
longitudinal_margin: 1.0
lateral_margin:
soft_margin: 0.5
soft_margin: 0.7
hard_margin: 0.3
hard_margin_for_parked_vehicle: 0.2
hard_margin_for_parked_vehicle: 0.3
max_expand_ratio: 0.0
envelope_buffer_margin: 0.5
th_error_eclipse_long_radius : 0.6
pedestrian:
th_moving_speed: 0.28
th_moving_time: 1.0
longitudinal_margin: 0.6
longitudinal_margin: 1.0
lateral_margin:
soft_margin: 0.7
hard_margin: 0.5
hard_margin_for_parked_vehicle: 0.2
hard_margin_for_parked_vehicle: 0.5
max_expand_ratio: 0.0
envelope_buffer_margin: 0.5
th_error_eclipse_long_radius : 0.6
Expand Down Expand Up @@ -232,7 +232,7 @@
# avoidance distance parameters
longitudinal:
min_prepare_time: 1.0 # [s]
max_prepare_time: 2.0 # [s]
max_prepare_time: 3.0 # [s]
min_prepare_distance: 1.0 # [m]
min_slow_down_speed: 1.38 # [m/s]
buf_slow_down_speed: 0.56 # [m/s] FOR DEVELOPER
Expand Down Expand Up @@ -294,7 +294,7 @@
velocity: [1.39, 4.17, 11.1] # [m/s]
max_accel_values: [0.5, 0.5, 0.5] # [m/ss]
min_jerk_values: [0.2, 0.2, 0.2] # [m/sss]
max_jerk_values: [3.0, 3.0, 3.0] # [m/sss]
max_jerk_values: [1.0, 1.0, 1.0] # [m/sss]

# longitudinal constraints
longitudinal:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
object_time_margin_to_collision_point: 4.0

occlusion:
enable: false
enable: true
occlusion_attention_area_length: 70.0
free_space_max: 43
occupied_min: 58
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
option:
enable_skip_optimization: false # skip elastic band and model predictive trajectory
enable_reset_prev_optimization: false # If true, optimization has no fix constraint to the previous result.
enable_outside_drivable_area_stop: true # stop if the ego's trajectory footprint is outside the drivable area
enable_outside_drivable_area_stop: false # stop if the ego's trajectory footprint is outside the drivable area
use_footprint_polygon_for_outside_drivable_area_check: false # If false, only the footprint's corner points are considered.

debug:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
idling_time: 2.0 # idling time to detect front vehicle starting deceleration [s]
min_ego_accel_for_rss: -1.0 # ego's acceleration to calculate RSS distance [m/ss]
min_object_accel_for_rss: -1.0 # front obstacle's acceleration to calculate RSS distance [m/ss]
safe_distance_margin : 4.0 # This is also used as a stop margin [m]
safe_distance_margin : 5.0 # This is also used as a stop margin [m]
terminal_safe_distance_margin : 3.0 # Stop margin at the goal. This value cannot exceed safe distance margin. [m]
hold_stop_velocity_threshold: 0.01 # The maximum ego velocity to hold stopping [m/s]
hold_stop_distance_threshold: 0.3 # The ego keeps stopping if the distance to stop changes within the threshold [m]
Expand Down Expand Up @@ -99,8 +99,8 @@
stop_obstacle_hold_time_threshold : 1.0 # maximum time for holding closest stop obstacle

# hysteresis for cruise and stop
obstacle_velocity_threshold_from_cruise_to_stop : 1.0 # stop planning is executed to the obstacle whose velocity is less than this value [m/s]
obstacle_velocity_threshold_from_stop_to_cruise : 1.5 # stop planning is executed to the obstacle whose velocity is less than this value [m/s]
obstacle_velocity_threshold_from_cruise_to_stop : 3.0 # stop planning is executed to the obstacle whose velocity is less than this value [m/s]
obstacle_velocity_threshold_from_stop_to_cruise : 3.5 # stop planning is executed to the obstacle whose velocity is less than this value [m/s]

# if crossing vehicle is determined as target obstacles or not
crossing_obstacle:
Expand All @@ -126,7 +126,7 @@
ego_obstacle_overlap_time_threshold : 0.2 # time threshold to decide cut-in obstacle for cruise or stop [s]
max_prediction_time_for_collision_check : 10.0 # prediction time to check collision between obstacle and ego
max_lateral_time_margin: 5.0 # time threshold of lateral margin between obstacle and trajectory band with ego's width [s]
num_of_predicted_paths: 3 # number of the highest confidence predicted path to check collision between obstacle and ego
num_of_predicted_paths: 1 # number of the highest confidence predicted path to check collision between obstacle and ego
yield:
enable_yield: true
lat_distance_threshold: 5.0 # lateral margin between obstacle in neighbor lanes and trajectory band with ego's width for yielding
Expand Down
6 changes: 6 additions & 0 deletions autoware_launch/config/system/diagnostics/control.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ units:
- { type: link, link: /autoware/control/performance_monitoring/lane_departure }
- { type: link, link: /autoware/control/performance_monitoring/trajectory_deviation }
- { type: link, link: /autoware/control/performance_monitoring/control_state }
- { type: link, link: /autoware/control/collision_detector }

- path: /autoware/control/local
type: and
Expand Down Expand Up @@ -66,3 +67,8 @@ units:
type: diag
node: external_cmd_converter
name: remote_control_topic_status

- path: /autoware/control/collision_detector
type: diag
node: collision_detector
name: collision_detect
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
files:
- { path: $(dirname)/autoware-main.yaml }

edits:
- { type: remove, path: /autoware/system/duplicated_node_checker }
70 changes: 70 additions & 0 deletions autoware_launch/config/system/tier4_diagnostics/autoware-main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
files:
- { path: $(dirname)/control.yaml }
- { path: $(dirname)/localization.yaml }
- { path: $(dirname)/map.yaml }
- { path: $(dirname)/perception.yaml }
- { path: $(dirname)/planning.yaml }
- { path: $(dirname)/system.yaml }
- { path: $(dirname)/vehicle.yaml }

units:
- path: /autoware/modes/local
type: and
list:
- { type: link, link: /autoware/vehicle }
- { type: link, link: /autoware/system }
- { type: link, link: /autoware/control/local }

- path: /autoware/modes/remote
type: and
list:
- { type: link, link: /autoware/vehicle }
- { type: link, link: /autoware/system }
- { type: link, link: /autoware/control/remote }

- path: /autoware/modes/stop
type: ok

- path: /autoware/modes/autonomous
type: and
list:
- { type: link, link: /autoware/map }
- { type: link, link: /autoware/localization }
- { type: link, link: /autoware/planning }
- { type: link, link: /autoware/perception }
- { type: link, link: /autoware/control }
- { type: link, link: /autoware/vehicle }
- { type: link, link: /autoware/system }

- path: /autoware/modes/pull_over
type: and
list:
- { type: link, link: /autoware/map }
- { type: link, link: /autoware/localization }
- { type: link, link: /autoware/planning }
- { type: link, link: /autoware/perception }
- { type: link, link: /autoware/control }
- { type: link, link: /autoware/vehicle }
- { type: link, link: /autoware/system }

- path: /autoware/modes/comfortable_stop
type: and
list:
- { type: link, link: /autoware/map }
- { type: link, link: /autoware/localization }
- { type: link, link: /autoware/planning }
- { type: link, link: /autoware/perception }
- { type: link, link: /autoware/control }
- { type: link, link: /autoware/vehicle }
- { type: link, link: /autoware/system }

- path: /autoware/modes/emergency_stop
type: and
list:
- { type: link, link: /autoware/vehicle }
- { type: link, link: /autoware/system }

- path: /autoware/debug/tools
type: and
list:
- { type: link, link: /autoware/system/service_log_checker }
74 changes: 74 additions & 0 deletions autoware_launch/config/system/tier4_diagnostics/control.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
units:
- path: /autoware/control
type: and
list:
- { type: link, link: /autoware/control/topic_rate_check/trajectory_follower }
- { type: link, link: /autoware/control/topic_rate_check/control_command }
- { type: link, link: /autoware/control/node_alive_monitoring/vehicle_cmd_gate }
- { type: link, link: /autoware/control/emergency_braking }
- { type: link, link: /autoware/control/performance_monitoring/lane_departure }
- { type: link, link: /autoware/control/performance_monitoring/trajectory_deviation }
- { type: link, link: /autoware/control/performance_monitoring/control_state }
- { type: link, link: /autoware/control/collision_detector }

- path: /autoware/control/local
type: and
list:
- { type: link, link: /autoware/control/topic_rate_check/external_cmd_selector }
- { type: link, link: /autoware/control/topic_rate_check/external_cmd_converter }

- path: /autoware/control/remote
type: and
list:
- { type: link, link: /autoware/control/topic_rate_check/external_cmd_selector }
- { type: link, link: /autoware/control/topic_rate_check/external_cmd_converter }

- path: /autoware/control/topic_rate_check/trajectory_follower
type: diag
node: topic_state_monitor_trajectory_follower_control_cmd
name: control_topic_status

- path: /autoware/control/topic_rate_check/control_command
type: diag
node: topic_state_monitor_control_command_control_cmd
name: control_topic_status

- path: /autoware/control/node_alive_monitoring/vehicle_cmd_gate
type: diag
node: vehicle_cmd_gate
name: heartbeat

- path: /autoware/control/emergency_braking
type: diag
node: autonomous_emergency_braking
name: aeb_emergency_stop

- path: /autoware/control/performance_monitoring/lane_departure
type: diag
node: lane_departure_checker_node
name: lane_departure

- path: /autoware/control/performance_monitoring/trajectory_deviation
type: diag
node: lane_departure_checker_node
name: trajectory_deviation

- path: /autoware/control/performance_monitoring/control_state
type: diag
node: controller_node_exe
name: control_state

- path: /autoware/control/topic_rate_check/external_cmd_selector
type: diag
node: external_cmd_selector
name: heartbeat

- path: /autoware/control/topic_rate_check/external_cmd_converter
type: diag
node: external_cmd_converter
name: remote_control_topic_status

- path: /autoware/control/collision_detector
type: diag
node: collision_detector
name: collision_detect
Loading

0 comments on commit 14e43c3

Please sign in to comment.