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

feat(e2e_simulator.launch): add argument for running the CARLA interface #924

Merged
merged 25 commits into from
May 27, 2024
Merged
Changes from 15 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3aa6f84
added line for CARLA bridge
mraditya01 Mar 15, 2024
763562f
added line for CARLA bridge
mraditya01 Mar 15, 2024
8c93748
style(pre-commit): autofix
pre-commit-ci[bot] Mar 15, 2024
278cd9f
Update autoware_launch/launch/e2e_simulator.launch.xml
mraditya01 Mar 15, 2024
76e7f22
Fixed arguments and added conditional string
mraditya01 Mar 18, 2024
33bd0d3
style(pre-commit): autofix
pre-commit-ci[bot] Mar 18, 2024
2f8f680
fix launch issue
maxime-clem Mar 19, 2024
1d73dc7
small updates following new method
mraditya01 Apr 22, 2024
cc95ae1
added map feature for carla
mraditya01 May 3, 2024
b124a8f
added automatic map load for CARLA
mraditya01 May 13, 2024
68d9df8
fixed small changes
mraditya01 May 13, 2024
a894e21
fixed small changes
mraditya01 May 13, 2024
b806134
Merge pull request #1 from mraditya01/updated_version
mraditya01 May 13, 2024
a0b08e1
fixed some issue with map loading
mraditya01 May 15, 2024
def3a97
Merge pull request #2 from mraditya01/updated_version
mraditya01 May 15, 2024
32c45c1
removed carla_map param
mraditya01 May 20, 2024
f60fe4b
Merge pull request #3 from mraditya01/updated_version
mraditya01 May 20, 2024
9c77b7b
removed carla_map param
mraditya01 May 20, 2024
d9e6407
removed carla_map param
mraditya01 May 20, 2024
8efb344
Merge pull request #4 from mraditya01/updated_version
mraditya01 May 20, 2024
151ec74
removed multiple same args
mraditya01 May 23, 2024
b506fa5
Merge pull request #5 from mraditya01/updated_version
mraditya01 May 23, 2024
ee860d7
fixed some categorization
mraditya01 May 23, 2024
0d0beed
Merge pull request #6 from mraditya01/updated_version
mraditya01 May 23, 2024
bf9dd47
Merge branch 'main' into main
maxime-clem May 23, 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
27 changes: 22 additions & 5 deletions autoware_launch/launch/e2e_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<arg name="vehicle_model" default="sample_vehicle" description="vehicle model name"/>
<arg name="sensor_model" default="sample_sensor_kit" description="sensor model name"/>
<arg name="data_path" default="$(env HOME)/autoware_data" description="packages data and artifacts directory path"/>
<arg name="simulator_type" default="awsim" description="select the simulator type ('awsim' or 'carla')"/>
<arg name="carla_map" default="Town01" description="Map used for CARLA"/>
maxime-clem marked this conversation as resolved.
Show resolved Hide resolved

<!-- launch module preset -->
<arg name="planning_module_preset" default="default" description="planning module preset"/>
Expand All @@ -31,15 +33,30 @@
<!-- System -->
<arg name="launch_system_monitor" default="false" description="launch system monitor"/>
<arg name="launch_dummy_diag_publisher" default="false" description="launch dummy diag publisher"/>
<arg
name="system_error_monitor_param_path"
default="$(find-pkg-share autoware_launch)/config/system/system_error_monitor/system_error_monitor.awsim.param.yaml"
description="system error monitor param path"
/>

<!-- Tools -->
<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">
<arg name="carla_map_name" value="$(var carla_map)"/>
</include>
maxime-clem marked this conversation as resolved.
Show resolved Hide resolved
<arg
name="system_error_monitor_param_path"
default="$(find-pkg-share autoware_launch)/config/system/system_error_monitor/system_error_monitor.awsim.param.yaml"
description="system error monitor param path"
/>
</group>

<group scoped="false" if="$(eval '\'$(var simulator_type)\' == \'awsim\'')">
<arg
name="system_error_monitor_param_path"
default="$(find-pkg-share autoware_launch)/config/system/system_error_monitor/system_error_monitor.awsim.param.yaml"
description="system error monitor param path"
/>
</group>

<group scoped="false">
<include file="$(find-pkg-share autoware_launch)/launch/autoware.launch.xml">
<!-- Common -->
Expand Down
Loading