Skip to content

Commit

Permalink
Merge pull request #635 from tier4/beta-to-tier4-main-sync
Browse files Browse the repository at this point in the history
chore: sync beta branch beta/v0.37 with tier4/main
  • Loading branch information
tier4-autoware-public-bot[bot] authored Oct 23, 2024
2 parents fdec55d + 976e644 commit 1e6dde7
Show file tree
Hide file tree
Showing 17 changed files with 69 additions and 45 deletions.
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

0 comments on commit 1e6dde7

Please sign in to comment.