Skip to content

Commit

Permalink
Merge pull request autowarefoundation#558 from tier4/sync-tier4-upstream
Browse files Browse the repository at this point in the history
chore: sync upstream
  • Loading branch information
tier4-autoware-private-bot[bot] authored Dec 28, 2023
2 parents 506d060 + 19f2f37 commit f7cf354
Show file tree
Hide file tree
Showing 84 changed files with 2,722 additions and 359 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ updates:
interval: daily
open-pull-requests-limit: 1
labels:
- bot
- github-actions
- tag:bot
- type:github-actions
2 changes: 1 addition & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
daysUntilClose: false

# Label to use when marking as stale
staleLabel: stale
staleLabel: status:stale

# Comment to post when marking as stale
markComment: >
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/beta-to-tier4-main-sync.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: beta-to-tier4-main-sync

on:
workflow_dispatch:
inputs:
source_branch:
description: Source branch
required: true
type: string

jobs:
sync-beta-branch:
runs-on: ubuntu-latest
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}

- name: Run sync-branches
uses: autowarefoundation/autoware-github-actions/sync-branches@v1
with:
token: ${{ steps.generate-token.outputs.token }}
base-branch: tier4/main
sync-pr-branch: beta-to-tier4-main-sync
sync-target-repository: https://github.com/tier4/autoware_launch.git
sync-target-branch: ${{ inputs.source_branch }}
pr-title: "chore: sync beta branch ${{ inputs.source_branch }} with tier4/main"
pr-labels: |
bot
sync-beta-branch
auto-merge-method: merge
8 changes: 8 additions & 0 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ jobs:
- name: Check out repository
uses: actions/checkout@v3

- name: Free disk space (Ubuntu)
uses: jlumbroso/[email protected]
with:
tool-cache: false
dotnet: false
swap-storage: false
large-packages: false

- name: Remove exec_depend
uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1

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 @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel previous runs
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
workflow_id: all
all_but_latest: true
2 changes: 1 addition & 1 deletion .github/workflows/github-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
echo "tag-name=${REF_NAME#beta/}" >> $GITHUB_OUTPUT
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ steps.set-tag-name.outputs.ref-name }}
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 @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

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 @@ -16,7 +16,7 @@ jobs:
private_key: ${{ secrets.PRIVATE_KEY }}

- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}

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 @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run spell-check
uses: autowarefoundation/autoware-github-actions/spell-check@v1
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/sync-awf-upstream.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
name: sync-awf-upstream

on:
schedule:
- cron: 0 1 * * 1-5
workflow_dispatch:
inputs:
target_branch:
description: Target branch
required: true
type: string

jobs:
sync-awf-upstream:
Expand All @@ -29,12 +32,17 @@ jobs:
const holiday_jp = require(`${process.env.GITHUB_WORKSPACE}/node_modules/@holiday-jp/holiday_jp`)
core.setOutput('holiday', holiday_jp.isHoliday(new Date()));
- name: Print warning for invalid branch name
if: ${{ inputs.target_branch == 'tier4/main' }}
run: |
echo This action cannot be performed on 'tier4/main' branch
- name: Run sync-branches
uses: autowarefoundation/autoware-github-actions/sync-branches@v1
if: ${{ steps.is-holiday.outputs.holiday != 'true' || github.event_name == 'workflow_dispatch' }}
if: ${{ inputs.target_branch != 'tier4/main' }}
with:
token: ${{ steps.generate-token.outputs.token }}
base-branch: tier4/main
base-branch: ${{ inputs.target_branch }}
sync-pr-branch: sync-awf-upstream
sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git
sync-target-branch: main
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:
with:
token: ${{ steps.generate-token.outputs.token }}
pr-labels: |
bot
sync-files
tag:bot
tag:sync-files
auto-merge-method: squash
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**:
ros__parameters:
publish_debug_pointcloud: false
use_predicted_trajectory: true
use_imu_path: true
voxel_grid_x: 0.05
Expand All @@ -11,7 +12,9 @@
t_response: 1.0
a_ego_min: -3.0
a_obj_min: -1.0
prediction_time_horizon: 1.5
prediction_time_interval: 0.1
imu_prediction_time_horizon: 1.5
imu_prediction_time_interval: 0.1
mpc_prediction_time_horizon: 1.5
mpc_prediction_time_interval: 0.1
collision_keeping_sec: 0.0
aeb_hz: 10.0
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/**:
ros__parameters:

publish_diag: true # if true, diagnostic msg is published
publish_diag: false # if true, diagnostic msg is published

# If the number of consecutive invalid predicted_path exceeds this threshold, the Diag will be set to ERROR.
# (For example, threshold = 1 means, even if the predicted_path is invalid, Diag will not be ERROR if
# the next predicted_path is valid.)
diag_error_count_threshold: 0

display_on_terminal: true # show error msg on terminal
display_on_terminal: false # show error msg on terminal

thresholds:
max_distance_deviation: 1.0
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
/**:
ros__parameters:
# Enable feature
will_out_of_lane_checker: false
out_of_lane_checker: false
boundary_departure_checker: true

# Node
update_rate: 10.0
visualize_lanelet: false
include_right_lanes: true
include_left_lanes: true
include_opposite_lanes: true
include_conflicting_lanes: true
road_border_departure_checker: false
boundary_types_to_detect: [curbstone]

# Core
footprint_margin_scale: 1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
ros__parameters:
transition_timeout: 10.0
frequency_hz: 10.0

# set true if you want to engage the autonomous driving mode while the vehicle is driving. If set to false, it will deny Engage in any situation where the vehicle speed is not zero. Note that if you use this feature without adjusting the parameters, it may cause issues like sudden deceleration. Before using, please ensure the engage condition and the vehicle_cmd_gate transition filter are appropriately adjusted.
enable_engage_on_driving: false

check_engage_condition: false # set false if you do not want to care about the engage condition.
nearest_dist_deviation_threshold: 3.0 # [m] for finding nearest index
nearest_yaw_deviation_threshold: 1.57 # [rad] for finding nearest index
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/**:
ros__parameters:
# Node
update_rate: 10.0
delay_time: 0.17
max_deceleration: 1.5
resample_interval: 0.5
stop_margin: 0.5 # [m]
ego_nearest_dist_threshold: 3.0 # [m]
ego_nearest_yaw_threshold: 1.046 # [rad] = 60 [deg]
min_trajectory_check_length: 1.5 # [m]
trajectory_check_time: 3.0
distinct_point_distance_threshold: 0.3
distinct_point_yaw_threshold: 5.0 # [deg]
filtering_distance_threshold: 1.5 # [m]
use_object_prediction: true

collision_checker_params:
width_margin: 0.2
chattering_threshold: 0.2
z_axis_filtering_buffer: 0.3
enable_z_axis_obstacle_filtering: false
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
max_d_effort: 0.0
min_d_effort: 0.0
lpf_vel_error_gain: 0.9
enable_integration_at_low_speed: false
current_vel_threshold_pid_integration: 0.5
time_threshold_before_pid_integration: 2.0
enable_brake_keeping_before_stop: false
brake_keeping_acc: -0.2

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
check_external_emergency_heartbeat: false
use_start_request: true
enable_cmd_limit_filter: true
filter_activated_count_threshold: 5
filter_activated_velocity_threshold: 1.0
external_emergency_stop_heartbeat_timeout: 0.0
stop_hold_acceleration: -1.5
emergency_acceleration: -2.4
Expand All @@ -15,6 +17,8 @@
nominal:
vel_lim: 25.0
reference_speed_points: [20.0, 30.0]
steer_lim: [1.0, 0.8]
steer_rate_lim: [1.0, 0.8]
lon_acc_lim: [5.0, 4.0]
lon_jerk_lim: [5.0, 4.0]
lat_acc_lim: [5.0, 4.0]
Expand All @@ -23,6 +27,8 @@
on_transition:
vel_lim: 50.0
reference_speed_points: [20.0, 30.0]
steer_lim: [1.0, 0.8]
steer_rate_lim: [1.0, 0.8]
lon_acc_lim: [1.0, 0.9]
lon_jerk_lim: [0.5, 0.4]
lat_acc_lim: [2.0, 1.8]
Expand Down
9 changes: 9 additions & 0 deletions autoware_launch/config/localization/ekf_localizer.param.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,12 @@
proc_stddev_yaw_c: 0.005
proc_stddev_vx_c: 10.0
proc_stddev_wz_c: 5.0

# for diagnostics
pose_no_update_count_threshold_warn: 50
pose_no_update_count_threshold_error: 100
twist_no_update_count_threshold_warn: 50
twist_no_update_count_threshold_error: 100

# for velocity measurement limitation (Set 0.0 if you want to ignore)
threshold_observable_velocity_mps: 0.0 # [m/s]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**:
ros__parameters:
scale: 3.0
error_ellipse_size: 1.0
warn_ellipse_size: 0.8
error_ellipse_size: 1.5
warn_ellipse_size: 1.2
error_ellipse_size_lateral_direction: 0.3
warn_ellipse_size_lateral_direction: 0.2
warn_ellipse_size_lateral_direction: 0.25
34 changes: 28 additions & 6 deletions autoware_launch/config/localization/ndt_scan_matcher.param.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
# Vehicle reference frame
base_frame: "base_link"

# NDT reference frame
ndt_base_frame: "ndt_base_link"

# map frame
map_frame: "map"

# Subscriber queue size
input_sensor_points_queue_size: 1

Expand Down Expand Up @@ -35,23 +41,27 @@
converged_param_nearest_voxel_transformation_likelihood: 2.3

# The number of particles to estimate initial pose
initial_estimate_particles_num: 100
initial_estimate_particles_num: 200

# The number of initial random trials in the TPE (Tree-Structured Parzen Estimator).
# This value should be equal to or less than 'initial_estimate_particles_num' and more than 0.
# If it is equal to 'initial_estimate_particles_num', the search will be the same as a full random search.
n_startup_trials: 20

# Tolerance of timestamp difference between current time and sensor pointcloud. [sec]
lidar_topic_timeout_sec: 1.0

# Tolerance of timestamp difference between initial_pose and sensor pointcloud. [sec]
initial_pose_timeout_sec: 1.0

# Tolerance of distance difference between two initial poses used for linear interpolation. [m]
initial_pose_distance_tolerance_m: 10.0

# neighborhood search method
# 0=KDTREE, 1=DIRECT26, 2=DIRECT7, 3=DIRECT1
neighborhood_search_method: 0

# Number of threads used for parallel computing
num_threads: 4

# The covariance of output pose
# Do note that this covariance matrix is empirically derived
# Note that this covariance matrix is empirically derived
output_pose_covariance:
[
0.0225, 0.0, 0.0, 0.0, 0.0, 0.0,
Expand All @@ -62,6 +72,14 @@
0.0, 0.0, 0.0, 0.0, 0.0, 0.000625,
]

# 2D Real-time covariance estimation with multiple searches (output_pose_covariance is the minimum value)
use_covariance_estimation: false

# Offset arrangement in covariance estimation [m]
# initial_pose_offset_model_x & initial_pose_offset_model_y must have the same number of elements.
initial_pose_offset_model_x: [0.0, 0.0, 0.5, -0.5, 1.0, -1.0]
initial_pose_offset_model_y: [0.5, -0.5, 0.0, 0.0, 0.0, 0.0]

# Regularization switch
regularization_enabled: false

Expand All @@ -77,8 +95,12 @@
# Radius of input LiDAR range (used for diagnostics of dynamic map loading)
lidar_radius: 100.0

# cspell: ignore degrounded
# A flag for using scan matching score based on de-grounded LiDAR scan
estimate_scores_for_degrounded_scan: false

# If lidar_point.z - base_link.z <= this threshold , the point will be removed
z_margin_for_ground_removal: 0.8

# The execution time which means probably NDT cannot matches scans properly. [ms]
critical_upper_bound_exe_time_ms: 100
Loading

0 comments on commit f7cf354

Please sign in to comment.