Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into humble-to-main
Browse files Browse the repository at this point in the history
  • Loading branch information
youtalk committed Nov 14, 2024
2 parents 1d08302 + 068a604 commit 7a03290
Show file tree
Hide file tree
Showing 33 changed files with 14,202 additions and 27 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.param.yaml
*.rviz
**/diagnostic_graph_aggregator/
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/**:
ros__parameters:
use_pointcloud: false # use pointcloud as obstacle check
use_dynamic_object: true # use dynamic object as obstacle check
collision_distance: 0.1 # Distance at which an object is determined to have collided with ego [m]
nearby_filter_radius: 5.0 # Radius to filter nearby objects [m]
keep_ignoring_time: 10.0 # Time to keep filtering objects that first appeared in the vicinity
nearby_object_type_filters: # Classes subject to filtering for objects first appearing in the vicinity
filter_car: false
filter_truck: false
filter_bus: false
filter_trailer: false
filter_bicycle: false
filter_motorcycle: false
filter_pedestrian: false
filter_unknown: true
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# state transition
drive_state_stop_dist: 0.5
drive_state_offset_stop_dist: 1.0
stopping_state_stop_dist: 0.5
stopping_state_stop_dist: 0.49
stopped_state_entry_duration_time: 0.1
stopped_state_entry_vel: 0.01
stopped_state_entry_acc: 0.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
enable_yaw_bias_estimation: true
predict_frequency: 50.0
tf_rate: 50.0
publish_tf: true
extend_state_step: 50

pose_measurement:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
timeout_ms: 70.0
match_threshold_ms: 50.0
image_buffer_size: 15
point_project_to_unrectified_image: false
debug_mode: false
filter_scope_min_x: -100.0
filter_scope_min_y: -100.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
grid_length_y: 70.0
grid_position_x: 0.0
grid_position_y: 0.0
maximum_lidar_height_thres: 0.3
minimum_lidar_height_thres: -2.2
maximum_lidar_height_thres: 2.5 # [m] when use_points is true, ignore points with a z value above this (in the vehicle_frame)
minimum_lidar_height_thres: 0.0 # [m] when use_points is true, ignore points with a z value bellow this (in the vehicle_frame)
use_wayarea: true
use_parkinglot: true
use_objects: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
maximum_jerk: 1.0
path_priority: "efficient_path" # "efficient_path" or "close_goal"
efficient_path_order: ["SHIFT", "ARC_FORWARD", "ARC_BACKWARD"] # only lane based pull over(exclude freespace parking)
lane_departure_check_expansion_margin: 0.0
lane_departure_check_expansion_margin: 0.2

# shift parking
shift_parking:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

backward_length_buffer_for_end_of_lane: 3.0 # [m]
backward_length_buffer_for_blocking_object: 3.0 # [m]
backward_length_from_intersection: 5.0 # [m]

lane_changing_lateral_jerk: 0.5 # [m/s3]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
hold_stop_margin_distance: 0.0
distance_to_judge_over_stop_line: 0.5
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.
suppress_pass_judge_when_stopping: false
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@

outside:
unknown: false
car: true
truck: true
bus: true
trailer: true
motorcycle: true
bicycle: true
pedestrian: true
car: false
truck: false
bus: false
trailer: false
motorcycle: false
bicycle: false
pedestrian: false

cruise_obstacle_type:
inside:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
files:
- { path: $(find-pkg-share system_diagnostic_monitor)/config/autoware-main.yaml }
- { path: $(find-pkg-share autoware_launch)/config/system/system_diagnostic_monitor/autoware-main.yaml }

edits:
- { type: remove, path: /autoware/system/duplicated_node_checker }
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
files:
- { path: $(find-pkg-share system_diagnostic_monitor)/config/autoware-main.yaml }
- { path: $(find-pkg-share autoware_launch)/config/system/system_diagnostic_monitor/autoware-main.yaml }

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,23 @@
/**:
ros__parameters:
required_diags:
dummy_diag_empty: default
# map
## /autoware/map/topic_rate_check/pointcloud_map
"topic_state_monitor_pointcloud_map: map_topic_status": default

# localization
## /autoware/localization/scan_matching_status
"ndt_scan_matcher: scan_matching_status": default

## /autoware/localization/accuracy
"localization_error_monitor: ellipse_error_status": default

## /autoware/localization/sensor_fusion_status
"localization: ekf_localizer": default

## /autoware/localization/topic_rate_check/pose_twist_fusion
"topic_state_monitor_pose_twist_fusion_filter_pose: localization_topic_status": default

# perception
## /autoware/perception/topic_rate_check/pointcloud
"topic_state_monitor_obstacle_segmentation_pointcloud: perception_topic_status": default
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
files:
- { path: $(dirname)/map.yaml }
- { path: $(dirname)/localization.yaml }
- { path: $(dirname)/planning.yaml }
- { path: $(dirname)/perception.yaml }
- { path: $(dirname)/control.yaml }
- { path: $(dirname)/vehicle.yaml }
- { path: $(dirname)/system.yaml }

units:
- 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/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/emergency_stop
type: and
list:
- { 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/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/debug/tools
type: and
list:
- { type: link, link: /autoware/system/service_log_checker }
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
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 }

- 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
Loading

0 comments on commit 7a03290

Please sign in to comment.