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.32.0 with tier4/main #530

Merged
merged 40 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
dbd69d8
feat(control_validator)!: add velocity check (#1050)
yuki-takagi-66 Jul 18, 2024
e490b47
Merge pull request #495 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 18, 2024
14946c0
feat(api): set launch_deprecated_api true (#496)
kosuke55 Jul 18, 2024
1b04604
fix(api): disable rosbridge to fix duplicated node (#497)
kosuke55 Jul 19, 2024
a8bc43e
feat(e2e_simulator.launch): renamed carla interface package in e2e_la…
mraditya01 Jul 19, 2024
08ce8da
Merge pull request #498 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 19, 2024
e07760e
feat(simple_planning_simulator): add actuation command simulator (#1078)
kosuke55 Jul 19, 2024
4e22964
feat(ndt_scan_matcher): add scale_factor to covariance_estimation (#1…
SakodaShintaro Jul 19, 2024
244285f
chore: add p/c maintainers (#1079)
danielsanchezaran Jul 19, 2024
353bb13
Merge pull request #499 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 19, 2024
b12fdff
feat(vehicle_cmd_gate): change param to relax pedal rate limit when t…
yuki-takagi-66 Jul 22, 2024
4976fad
Merge pull request #500 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 22, 2024
f208ab2
feat(start_planner): add end_pose_curvature_threshold (#1059)
kosuke55 Jul 22, 2024
e01a543
Merge pull request #502 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 22, 2024
f3e4c8b
feat(out_of_lane): add parameter to ignore objects behind ego (#1062)
maxime-clem Jul 22, 2024
fdc2f22
Merge pull request #503 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 22, 2024
679fa87
feat(start_planner): set end_pose_curvature_threshold 0.1 (#1088)
kosuke55 Jul 23, 2024
1c00568
Merge pull request #504 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 23, 2024
b99303c
feat(pid_longitudinal_controller): re-organize diff limit structure (…
yuki-takagi-66 Jul 24, 2024
07bfd0d
Merge pull request #506 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 24, 2024
9a9acaa
feat(dynamic_drivable_area_expansion): min_bound_interval parameter (…
maxime-clem Jul 25, 2024
9658e19
Merge pull request #507 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 25, 2024
bf6e342
feat(freespace_planning_algorithm): update freespace planner params (…
mkquda Jul 29, 2024
b58f276
Merge pull request #509 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 29, 2024
1854a75
feat(out_of_lane): add lateral buffer between the lane and stop pose …
maxime-clem Jul 30, 2024
886ed11
Merge pull request #512 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 30, 2024
765ace6
perf(ndt_scan_matcher): change the temperature of multi_ndt_score to …
SakodaShintaro Jul 30, 2024
bd3eadf
Merge pull request #513 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 30, 2024
edb9558
feat(crosswalk): more conservative when the ego pass first (#1085)
takayuki5168 Jul 30, 2024
7477f9a
Merge pull request #514 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 30, 2024
a84f014
feat(dynamic_obstacle_avoidance): shorter predicted path for pedestri…
takayuki5168 Jul 30, 2024
a5a541c
Merge pull request #515 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 30, 2024
86c262e
perf(freespace_planning_algorithms): tune freespace planner parameter…
mkquda Jul 31, 2024
e4b8f83
Merge pull request #516 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 31, 2024
473e7e9
feat(static_obstacle_avoidance): add force deactivation duration time…
go-sakayori Jul 31, 2024
c713dc0
Merge pull request #518 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 31, 2024
b947098
feat(autonomous_emergency_braking): enable AEB stop in vehicle_cmd_ga…
danielsanchezaran Jul 31, 2024
595d630
Merge pull request #519 from tier4/sync-awf-latest
tier4-autoware-public-bot[bot] Jul 31, 2024
6e6cfdb
Revert "fix(api): disable rosbridge to fix duplicated node (#497)"
kosuke55 Aug 1, 2024
9e4c30c
Merge pull request #520 from tier4/sync-awf-upstream
rej55 Aug 1, 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
10 changes: 5 additions & 5 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ autoware_launch/** mfc@leodrive.ai ryohsuke.mitsudome@tier4.jp yukihiro.saito@ti
# /**
# .github/**
autoware_launch/** yukihiro.saito@tier4.jp ryohsuke.mitsudome@tier4.jp mfc@leodrive.ai
autoware_launch/config/control/** takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
autoware_launch/config/control/** takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp daniel.sanchez@tier4.jp kyoichi.sugahara@tier4.jp zulfaqar.azmi@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp alqudah.mohammad@tier4.jp maxime.clement@tier4.jp mamoru.sobue@tier4.jp yukinari.hisaki.2@tier4.jp
autoware_launch/config/localization/** masahiro.sakamoto@tier4.jp yamato.ando@tier4.jp ryu.yamamoto@tier4.jp kento.yabuuchi.2@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp anh.nguyen.2@tier4.jp
autoware_launch/config/map/** masahiro.sakamoto@tier4.jp yamato.ando@tier4.jp ryu.yamamoto@tier4.jp kento.yabuuchi.2@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp anh.nguyen.2@tier4.jp
autoware_launch/config/perception/** shunsuke.miura@tier4.jp yoshi.ri@tier4.jp koji.minoda@tier4.jp
autoware_launch/config/planning/** takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
autoware_launch/config/planning/** takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp daniel.sanchez@tier4.jp kyoichi.sugahara@tier4.jp zulfaqar.azmi@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp alqudah.mohammad@tier4.jp maxime.clement@tier4.jp mamoru.sobue@tier4.jp yukinari.hisaki.2@tier4.jp
autoware_launch/config/simulator/** takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
autoware_launch/config/system/** fumihito.ito@tier4.jp isamu.takagi@tier4.jp
autoware_launch/config/vehicle/** takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
autoware_launch/config/vehicle/** takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp mamoru.sobue@tier4.jp
autoware_launch/launch/components/tier4_autoware_api_component.launch.xml isamu.takagi@tier4.jp
autoware_launch/launch/components/tier4_control_component.launch.xml takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
autoware_launch/launch/components/tier4_control_component.launch.xml takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp daniel.sanchez@tier4.jp kyoichi.sugahara@tier4.jp zulfaqar.azmi@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp alqudah.mohammad@tier4.jp maxime.clement@tier4.jp mamoru.sobue@tier4.jp yukinari.hisaki.2@tier4.jp
autoware_launch/launch/components/tier4_localization_component.launch.xml masahiro.sakamoto@tier4.jp yamato.ando@tier4.jp ryu.yamamoto@tier4.jp kento.yabuuchi.2@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp anh.nguyen.2@tier4.jp
autoware_launch/launch/components/tier4_map_component.launch.xml masahiro.sakamoto@tier4.jp yamato.ando@tier4.jp ryu.yamamoto@tier4.jp kento.yabuuchi.2@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp anh.nguyen.2@tier4.jp
autoware_launch/launch/components/tier4_perception_component.launch.xml shunsuke.miura@tier4.jp yoshi.ri@tier4.jp koji.minoda@tier4.jp
autoware_launch/launch/components/tier4_planning_component.launch.xml takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
autoware_launch/launch/components/tier4_planning_component.launch.xml takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp daniel.sanchez@tier4.jp kyoichi.sugahara@tier4.jp zulfaqar.azmi@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp alqudah.mohammad@tier4.jp maxime.clement@tier4.jp mamoru.sobue@tier4.jp yukinari.hisaki.2@tier4.jp
autoware_launch/launch/components/tier4_sensing_component.launch.xml shunsuke.miura@tier4.jp yoshi.ri@tier4.jp koji.minoda@tier4.jp
autoware_launch/launch/components/tier4_simulator_component.launch.xml takayuki.murooka@tier4.jp fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
autoware_launch/launch/components/tier4_system_component.launch.xml fumihito.ito@tier4.jp isamu.takagi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
ros__parameters:
# Ego path calculation
use_predicted_trajectory: true
use_imu_path: false
use_imu_path: true
use_pointcloud_data: true
use_predicted_object_data: false
use_object_velocity_calculation: true
min_generated_path_length: 0.5
imu_prediction_time_horizon: 1.5
imu_prediction_time_interval: 0.1
mpc_prediction_time_horizon: 1.5
mpc_prediction_time_horizon: 4.5
mpc_prediction_time_interval: 0.1

# Debug
Expand All @@ -29,7 +29,7 @@

# Point cloud clustering
cluster_tolerance: 0.15 #[m]
cluster_minimum_height: 0.0
cluster_minimum_height: 0.1
minimum_cluster_size: 10
maximum_cluster_size: 10000

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/**:
ros__parameters:

# 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.)
Expand All @@ -10,3 +9,5 @@

thresholds:
max_distance_deviation: 1.0
max_reverse_velocity: 0.2
max_over_velocity_ratio: 0.1
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@

# stopped state
stopped_vel: 0.0
stopped_acc: -3.4
stopped_jerk: -5.0
stopped_acc: -3.4 # denotes pedal position

# emergency state
emergency_vel: 0.0
emergency_acc: -5.0
emergency_acc: -5.0 # denotes acceleration
emergency_jerk: -3.0

# acceleration limit
Expand All @@ -68,6 +67,7 @@
# jerk limit
max_jerk: 2.0
min_jerk: -5.0
max_acc_cmd_diff: 50.0 # [m/s^2 * s^-1]

# slope compensation
lpf_pitch_gain: 0.95
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ros__parameters:
update_rate: 10.0
system_emergency_heartbeat_timeout: 0.5
use_emergency_handling: false
use_emergency_handling: true
check_external_emergency_heartbeat: $(var check_external_emergency_heartbeat)
use_start_request: false
enable_cmd_limit_filter: true
Expand All @@ -16,14 +16,14 @@
stop_check_duration: 1.0
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]
lat_jerk_lim: [7.0, 6.0]
actual_steer_diff_lim: [1.0, 0.8]
reference_speed_points: [0.1, 0.3, 20.0, 30.0]
steer_lim: [1.0, 1.0, 1.0, 0.8]
steer_rate_lim: [1.0, 1.0, 1.0, 0.8]
lon_acc_lim: [5.0, 5.0, 5.0, 4.0]
lon_jerk_lim: [80.0, 5.0, 5.0, 4.0] # The first element is required for quick pedal changes when stopping and starting.
lat_acc_lim: [5.0, 5.0, 5.0, 4.0]
lat_jerk_lim: [7.0, 7.0, 7.0, 6.0]
actual_steer_diff_lim: [1.0, 1.0, 1.0, 0.8]
on_transition:
vel_lim: 50.0
reference_speed_points: [20.0, 30.0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@
initial_pose_offset_model_y: [0.5, -0.5, 0.0, 0.0, 0.0, 0.0]

# In MULTI_NDT_SCORE, the parameter that adjusts the estimated 2D covariance
temperature: 0.1
temperature: 0.05

# Scale value for adjusting the estimated covariance by a constant multiplication
scale_factor: 1.0


dynamic_map_loading:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
activate_by_scenario: False
grid_min_value: 0.0
grid_max_value: 1.0
grid_resolution: 0.2
grid_resolution: 0.3
grid_length_x: 70.0
grid_length_y: 70.0
grid_position_x: 0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
lat_offset_from_obstacle: 1.0 # [m]
margin_distance_around_pedestrian: 2.0 # [m]
predicted_path:
end_time_to_consider: 3.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 @@ -243,6 +243,8 @@
# For cancel maneuver
cancel:
enable: true # [-]
force:
duration_time: 2.0 # [s]

# For yield maneuver
yield:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
enabled: true
print_runtime: false
max_expansion_distance: 0.0 # [m] maximum distance by which the drivable area can be expended (0.0 means no limit)
min_bound_interval: 1.0 # [m] minimum interval between two consecutive bound points (before expansion)
smoothing:
curvature_average_window: 3 # window size used for smoothing the curvatures using a moving window average
max_bound_rate: 1.0 # [m/m] maximum rate of change of the bound lateral distance over its arc length
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,25 +91,30 @@
velocity: 1.0
vehicle_shape_margin: 1.0
time_limit: 3000.0
minimum_turning_radius: 5.0
maximum_turning_radius: 5.0
turning_radius_size: 1
max_turning_ratio: 0.5
turning_steps: 1
# search configs
search_configs:
theta_size: 144
theta_size: 120
angle_goal_range: 6.0
curve_weight: 1.2
reverse_weight: 1.0
lateral_goal_range: 0.5
longitudinal_goal_range: 2.0
curve_weight: 0.5
reverse_weight: 1.0
direction_change_weight: 1.5
# costmap configs
costmap_configs:
obstacle_threshold: 30
# -- A* search Configurations --
astar:
search_method: "forward" # options: forward, backward
only_behind_solutions: false
use_back: false
distance_heuristic_weight: 1.0
use_back: true
adapt_expansion_distance: true
expansion_distance: 0.5
distance_heuristic_weight: 2.0
smoothness_weight: 0.5
obstacle_distance_weight: 1.75
# -- RRT* search Configurations --
rrtstar:
enable_update: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
minimum_lateral_acc: 0.15
maximum_lateral_acc: 0.5
maximum_curvature: 0.07
end_pose_curvature_threshold: 0.1
# geometric pull out
enable_geometric_pull_out: true
geometric_collision_check_distance_from_end: 0.0
Expand Down Expand Up @@ -61,25 +62,30 @@
velocity: 1.0
vehicle_shape_margin: 1.0
time_limit: 3000.0
minimum_turning_radius: 5.0
maximum_turning_radius: 5.0
turning_radius_size: 1
max_turning_ratio: 0.7
turning_steps: 1
# search configs
search_configs:
theta_size: 144
theta_size: 120
angle_goal_range: 6.0
curve_weight: 1.2
reverse_weight: 1.0
lateral_goal_range: 0.5
longitudinal_goal_range: 2.0
curve_weight: 0.5
reverse_weight: 1.0
direction_change_weight: 1.5
# costmap configs
costmap_configs:
obstacle_threshold: 30
# -- A* search Configurations --
astar:
search_method: "forward" # options: forward, backward
only_behind_solutions: false
use_back: false
distance_heuristic_weight: 1.0
use_back: true
adapt_expansion_distance: true
expansion_distance: 0.5
distance_heuristic_weight: 2.0
smoothness_weight: 0.5
obstacle_distance_weight: 1.75
# -- RRT* search Configurations --
rrtstar:
enable_update: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# params for the pass judge logic against the crosswalk users such as pedestrians or bicycles
pass_judge:
ego_pass_first_margin_x: [0.0] # [[s]] time to collision margin vector for ego pass first situation (the module judges that ego don't have to stop at TTC + MARGIN < TTV condition)
ego_pass_first_margin_y: [3.0] # [[s]] time to vehicle margin vector for ego pass first situation (the module judges that ego don't have to stop at TTC + MARGIN < TTV condition)
ego_pass_first_margin_y: [4.0] # [[s]] time to vehicle margin vector for ego pass first situation (the module judges that ego don't have to stop at TTC + MARGIN < TTV condition)
ego_pass_first_additional_margin: 0.5 # [s] additional time margin for ego pass first situation to suppress chattering
ego_pass_later_margin_x: [0.0] # [[s]] time to vehicle margin vector for object pass first situation (the module judges that ego don't have to stop at TTV + MARGIN < TTC condition)
ego_pass_later_margin_y: [13.0] # [[s]] time to collision margin vector for object pass first situation (the module judges that ego don't have to stop at TTV + MARGIN < TTC condition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
predicted_path_min_confidence : 0.1 # when using predicted paths, ignore the ones whose confidence is lower than this value.
distance_buffer: 1.0 # [m] distance buffer used to determine if a collision will occur in the other lane
cut_predicted_paths_beyond_red_lights: true # if true, predicted paths are cut beyond the stop line of red traffic lights
ignore_behind_ego: false # if true, objects behind the ego vehicle are ignored

overlap:
minimum_distance: 0.0 # [m] minimum distance inside a lanelet for an overlap to be considered
Expand All @@ -28,7 +29,8 @@
action: # action to insert in the path if an object causes a conflict at an overlap
skip_if_over_max_decel: true # if true, do not take an action that would cause more deceleration than the maximum allowed
precision: 0.1 # [m] precision when inserting a stop pose in the path
distance_buffer: 1.5 # [m] buffer distance to try to keep between the ego footprint and lane
longitudinal_distance_buffer: 1.5 # [m] safety distance buffer to keep in front of the ego vehicle
lateral_distance_buffer: 1.0 # [m] safety distance buffer to keep on the side of the ego vehicle
min_duration: 1.0 # [s] minimum duration needed before a decision can be canceled
slowdown:
distance_threshold: 30.0 # [m] insert a slowdown when closer than this distance from an overlap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,29 @@
# base configs
time_limit: 30000.0
# robot configs # TODO replace by vehicle_info
robot_length: 4.5
robot_width: 1.75
robot_base2back: 1.0
minimum_turning_radius: 9.0
maximum_turning_radius: 9.0
turning_radius_size: 1
max_turning_ratio: 0.5 # ratio of actual turning limit of vehicle
turning_steps: 1
# search configs
theta_size: 144
theta_size: 120
angle_goal_range: 6.0
curve_weight: 1.2
reverse_weight: 2.0
lateral_goal_range: 0.5
longitudinal_goal_range: 2.0
longitudinal_goal_range: 1.0
curve_weight: 0.5
reverse_weight: 0.7
direction_change_weight: 2.0
# costmap configs
obstacle_threshold: 100

# -- A* search Configurations --
astar:
search_method: "forward" # options: forward, backward
only_behind_solutions: false
use_back: true
distance_heuristic_weight: 1.0
adapt_expansion_distance: true
expansion_distance: 0.5
distance_heuristic_weight: 2.0
smoothness_weight: 0.5
obstacle_distance_weight: 1.75

# -- RRT* search Configurations --
rrtstar:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**:
ros__parameters:
update_rate: 30
target_acceleration: -2.5
target_jerk: -1.5
target_acceleration: -3.0
target_jerk: -3.0
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<arg name="vehicle_model"/>
<arg name="initial_engage_state"/>
<arg name="vehicle_info_param_file"/>
<arg name="raw_vehicle_cmd_converter_param_path"/>
<arg name="occupancy_grid_map_updater" default="binary_bayes_filter" description="options: binary_bayes_filter"/>

<include file="$(find-pkg-share tier4_simulator_launch)/launch/simulator.launch.xml">
Expand All @@ -27,6 +28,7 @@
<arg name="vehicle_model" value="$(var vehicle_model)"/>
<arg name="initial_engage_state" value="$(var initial_engage_state)"/>
<arg name="vehicle_info_param_file" value="$(var vehicle_info_param_file)"/>
<arg name="raw_vehicle_cmd_converter_param_path" value="$(var raw_vehicle_cmd_converter_param_path)"/>

<arg name="fault_injection_param_path" value="$(find-pkg-share autoware_launch)/config/simulator/fault_injection.param.yaml"/>
<arg
Expand Down
2 changes: 1 addition & 1 deletion autoware_launch/launch/e2e_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<arg name="rviz" default="true" description="launch rviz"/>
<arg name="rviz_config" default="$(find-pkg-share autoware_launch)/rviz/autoware.rviz" description="rviz config"/>
<group scoped="false" if="$(eval '\'$(var simulator_type)\' == \'carla\'')">
<include file="$(find-pkg-share carla_autoware)/carla_autoware.launch.xml"/>
<include file="$(find-pkg-share autoware_carla_interface)/autoware_carla_interface.launch.xml"/>
</group>

<group scoped="false">
Expand Down
1 change: 1 addition & 0 deletions autoware_launch/launch/planning_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
<arg name="vehicle_model" value="$(var vehicle_model)"/>
<arg name="initial_engage_state" value="$(var initial_engage_state)"/>
<arg name="vehicle_info_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
<arg name="raw_vehicle_cmd_converter_param_path" value="$(find-pkg-share autoware_launch)/config/vehicle/raw_vehicle_cmd_converter/raw_vehicle_cmd_converter.param.yaml"/>
</include>
</group>
</launch>
Loading