Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync beta branch beta/v0.37 with tier4/main #635

Merged
merged 17 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
80a387e
feat(obstacle_cruise_planner): improve stop and cruise behavior for c…
brkay54 Oct 8, 2024
c4762e9
Merge pull request #620 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Oct 8, 2024
53cd6f3
revert(obstacle_cruise): reduce using predicted paths to maintain con…
yuki-takagi-66 Oct 10, 2024
a68a267
revert(obstacle_cruisse): revert "fix(obstacle_cruise_planner): guara…
yuki-takagi-66 Oct 10, 2024
3984bd4
Merge pull request #623 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Oct 10, 2024
39b5136
Remove emergency braking from autoware-psim.yaml and enable autonomou…
kyoichi-sugahara Oct 10, 2024
b7d1568
refactor(rviz): add VirtualWall display for Autonomous Emergency Brak…
kyoichi-sugahara Oct 11, 2024
f2bf96e
Merge pull request #627 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Oct 11, 2024
ca51a25
Merge pull request #624 from tier4/feat/enable_AEB
kyoichi-sugahara Oct 11, 2024
8de3a9f
chore: sync files (#1188)
awf-autoware-bot[bot] Oct 11, 2024
33d6323
Merge pull request #628 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Oct 11, 2024
565568d
fix(.github): change runs-on value to to ubuntu-22.04 (#1189)
go-sakayori Oct 11, 2024
a4037f0
Merge pull request #629 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Oct 11, 2024
c9022ac
fix(pointcloud_map_filter): add threshold for split map grid size (#…
badai-nguyen Oct 17, 2024
87c0f90
Merge pull request #631 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Oct 17, 2024
4519ddf
Merge branch 'beta/v0.37' into sync-awf-upstream
hayato-m126 Oct 17, 2024
976e644
Merge pull request #630 from tier4/sync-awf-upstream
rej55 Oct 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
build-and-test-differential:
needs: make-sure-label-is-present
if: ${{ needs.make-sure-label-is-present.outputs.result == 'true' }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ${{ matrix.container }}
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build-and-test:
if: ${{ github.event_name != 'push' || github.ref_name == github.event.repository.default_branch }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ${{ matrix.container }}
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cancel-previous-workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
cancel-previous-workflows:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Cancel previous runs
uses: styfle/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
github-release:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Set tag name
id: set-tag-name
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-labeler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
label:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/labeler@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-autoupdate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
pre-commit-autoupdate:
needs: check-secret
if: ${{ needs.check-secret.outputs.set == 'true' }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Generate token
id: generate-token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-optional.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
pre-commit-optional:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
pre-commit:
if: ${{ github.event.repository.private }} # Use pre-commit.ci for public repositories
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Generate token
id: generate-token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spell-check-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
spell-check-differential:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
sync-files:
needs: check-secret
if: ${{ needs.check-secret.outputs.set == 'true' }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Generate token
id: generate-token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-codeowners-from-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
update-codeowners-from-packages:
needs: check-secret
if: ${{ needs.check-secret.outputs.set == 'true' }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Generate token
id: generate-token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-sync-param-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
update-sync-param-files:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Generate token
id: generate-token
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
publish_debug_pcd: False

# use dynamic map loading
use_dynamic_map_loading: True
use_dynamic_map_loading: False

# time interval to check dynamic map loading
timer_interval_ms: 100
Expand All @@ -24,3 +24,6 @@

# radius map for dynamic map loading
map_loader_radius: 150.0

# Threshold of grid size to split map pointcloud
max_map_grid_size: 100.0
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,29 @@
enable_approaching: false
additional_safe_distance_margin: 3.0 # [m]
min_safe_distance_margin: 3.0 # [m]
suppress_sudden_obstacle_stop: false
suppress_sudden_obstacle_stop: true

stop_obstacle_type:
unknown: true
car: true
truck: true
bus: true
trailer: true
motorcycle: true
bicycle: true
pedestrian: true
pointcloud: false
inside:
unknown: true
car: true
truck: true
bus: true
trailer: true
motorcycle: true
bicycle: true
pedestrian: true

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

cruise_obstacle_type:
inside:
Expand Down Expand Up @@ -93,21 +104,29 @@

# if crossing vehicle is determined as target obstacles or not
crossing_obstacle:
obstacle_velocity_threshold : 3.0 # velocity threshold for crossing obstacle for cruise or stop [m/s]
obstacle_traj_angle_threshold : 1.22 # [rad] = 70 [deg], yaw threshold of crossing obstacle against the nearest trajectory point for cruise or stop
obstacle_velocity_threshold : 1.0 # velocity threshold for crossing obstacle for cruise or stop [m/s]
obstacle_traj_angle_threshold : 0.523599 # [rad] = 30 [deg], yaw threshold of crossing obstacle against the nearest trajectory point for cruise or stop

stop:
max_lat_margin: 0.3 # lateral margin between the obstacles and ego's footprint
max_lat_margin_against_unknown: 0.3 # lateral margin between the unknown obstacles and ego's footprint
min_velocity_to_reach_collision_point: 2.0 # minimum velocity margin to calculate time to reach collision [m/s]
outside_obstacle:
max_lateral_time_margin: 4.5 # time threshold of lateral margin between the obstacles and ego's footprint [s]
num_of_predicted_paths: 1 # number of the highest confidence predicted path to check collision between obstacle and ego
pedestrian_deceleration_rate: 0.5 # planner perceives pedestrians will stop with this rate to avoid unnecessary stops [m/ss]
bicycle_deceleration_rate: 0.5 # planner perceives bicycles will stop with this rate to avoid unnecessary stops [m/ss]
crossing_obstacle:
collision_time_margin : 4.0 # time threshold of collision between obstacle adn ego for cruise or stop [s]
collision_time_margin : 1.0 # time threshold of collision between obstacle adn ego for cruise or stop [s]

cruise:
max_lat_margin: 1.0 # lateral margin between obstacle and trajectory band with ego's width
outside_obstacle:
obstacle_velocity_threshold : 3.5 # minimum velocity threshold of obstacles outside the trajectory to cruise or stop [m/s]
ego_obstacle_overlap_time_threshold : 2.0 # time threshold to decide cut-in obstacle for cruise or stop [s]
max_prediction_time_for_collision_check : 20.0 # prediction time to check collision between obstacle and ego
obstacle_velocity_threshold : 1.5 # minimum velocity threshold of obstacles outside the trajectory to cruise or stop [m/s]
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: 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
files:
- { path: $(find-pkg-share system_diagnostic_monitor)/config/autoware-psim.yaml }

edits:
- { type: remove, path: /autoware/control/emergency_braking }
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<arg name="lateral_controller_mode" default="mpc"/>
<arg name="longitudinal_controller_mode" default="pid"/>
<arg name="use_individual_control_param" default="false"/>
<arg name="enable_autonomous_emergency_braking" default="false"/>
<arg name="enable_autonomous_emergency_braking" default="true"/>
<arg name="enable_predicted_path_checker" default="false"/>

<let name="latlon_controller_param_path_dir" value="$(var vehicle_id)" if="$(var use_individual_control_param)"/>
Expand Down
31 changes: 18 additions & 13 deletions autoware_launch/rviz/autoware.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -2450,6 +2450,22 @@ Visualization Manager:
Offset: 0
Radius: 0.10000000149011612
Value: true
- Class: rviz_common/Group
Displays:
- Class: rviz_default_plugins/MarkerArray
Enabled: true
Name: VirtualWall (AEB)
Namespaces:
{}
Topic:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Value: /control/autonomous_emergency_braking/virtual_wall
Value: true
Enabled: true
Name: VirtualWall
- Class: rviz_default_plugins/Marker
Enabled: false
Name: Stop Reason
Expand Down Expand Up @@ -2500,19 +2516,6 @@ Visualization Manager:
Reliability Policy: Reliable
Value: /control/autonomous_emergency_braking/debug/markers
Value: false
- Class: rviz_default_plugins/MarkerArray
Enabled: true
Name: Info/AEB
Namespaces:
stop_factor_text: true
stop_virtual_wall: true
Topic:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Value: /control/autonomous_emergency_braking/info/markers
Value: true
Enabled: true
Name: Control
- Class: rviz_common/Group
Expand Down Expand Up @@ -2542,6 +2545,8 @@ Visualization Manager:
Debug/MPC: true
Debug/PurePursuit: true
Predicted Trajectory: true
VirtualWall:
VirtualWall (AEB): true
Value: false
Debug:
Control: true
Expand Down
Loading