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.

Sign up for GitHub

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: remove use_pointcloud_container #806

Merged
merged 6 commits into from
Feb 8, 2024
Merged

feat: remove use_pointcloud_container #806

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
478bc6a
feat!: remove use_pointcloud_container
kminoda Jan 19, 2024
b3bd9cf
style(pre-commit): autofix
pre-commit-ci[bot] Jan 19, 2024
ebb96d7
Merge branch 'main' into feat/remove_use_pointcloud_container
kminoda Feb 1, 2024
c7395cb
Merge branch 'main' into feat/remove_use_pointcloud_container
kminoda Feb 7, 2024
f8a5688
remove unnecessary files
kminoda Feb 7, 2024
9f988d8
revert: revert change in declaration of sample vehicle and sensor_kit
kminoda Feb 7, 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
741 changes: 741 additions & 0 deletions .vscode/c_cpp_properties.json
View file
Open in desktop

Large diffs are not rendered by default.

266 changes: 266 additions & 0 deletions .vscode/settings.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions autoware_launch/launch/autoware.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<launch>
<!-- Essential parameters -->
<arg name="map_path" description="point cloud and lanelet2 map directory path"/>
<arg name="vehicle_model" default="sample_vehicle" description="vehicle model name"/>
<arg name="sensor_model" default="sample_sensor_kit" description="sensor model name"/>
miursh marked this conversation as resolved.
Show resolved Hide resolved
<arg name="vehicle_model" description="vehicle model name"/>
<arg name="sensor_model" description="sensor model name"/>
<arg name="use_pointcloud_container" default="true" description="launch pointcloud container"/>
<arg name="pointcloud_container_name" default="pointcloud_container"/>
<arg name="data_path" default="$(env HOME)/autoware_data" description="packages data and artifacts directory path"/>
Expand Down Expand Up @@ -56,12 +56,10 @@
</group>

<!-- Pointcloud container -->
<group if="$(var use_pointcloud_container)">
<include file="$(find-pkg-share autoware_launch)/launch/pointcloud_container.launch.py">
<arg name="use_multithread" value="true"/>
<arg name="container_name" value="$(var pointcloud_container_name)"/>
</include>
</group>
<include file="$(find-pkg-share autoware_launch)/launch/pointcloud_container.launch.py">
<arg name="use_multithread" value="true"/>
<arg name="container_name" value="$(var pointcloud_container_name)"/>
</include>

<!-- Vehicle -->
<group if="$(var launch_vehicle)">
Expand Down
1 change: 0 additions & 1 deletion autoware_launch/launch/components/tier4_planning_component.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

<include file="$(find-pkg-share tier4_planning_launch)/launch/planning.launch.xml">
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="enable_all_modules_auto_mode" value="$(var enable_all_modules_auto_mode)"/>

Expand Down
1 change: 0 additions & 1 deletion autoware_launch/launch/components/tier4_sensing_component.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<arg name="sensor_model" value="$(var sensor_model)"/>
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
<arg name="vehicle_mirror_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/mirror.param.yaml"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
</include>
</launch>
2 changes: 0 additions & 2 deletions autoware_launch/launch/logging_simulator.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<arg name="planning" default="true" description="launch planning"/>
<arg name="control" default="true" description="launch control"/>
<!-- Pointcloud container -->
<arg name="use_pointcloud_container" default="true" description="launch pointcloud container"/>
<arg name="pointcloud_container_name" default="pointcloud_container"/>
<!-- Vehicle -->
<arg name="launch_vehicle_interface" default="false"/>
Expand Down Expand Up @@ -55,7 +54,6 @@
<!-- Global parameters -->
<arg name="use_sim_time" value="true"/>
<!-- Pointcloud container -->
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<!-- Vehicle -->
<arg name="vehicle_id" value="$(var vehicle_id)"/>
Expand Down
2 changes: 0 additions & 2 deletions autoware_launch/launch/planning_simulator.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
<arg name="launch_sensing" value="false"/>
<arg name="launch_localization" value="false"/>
<arg name="launch_perception" value="false"/>
<!-- Pointcloud container -->
<arg name="use_pointcloud_container" value="false"/>
<!-- Vehicle -->
<arg name="launch_vehicle_interface" value="$(var launch_vehicle_interface)"/>
<!-- System -->
Expand Down
7 changes: 7 additions & 0 deletions kminoda_autoware.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
vehicle name is sample
miursh marked this conversation as resolved.
Show resolved Hide resolved
vehicle_model: sample_vehicle
sensor_model: sample_sensor_kit
map_path: /home/minoda/data/maps/sample-map-rosbag

Check warning on line 4 in kminoda_autoware.log

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (minoda)
[INFO] [launch]: All log files can be found below /home/minoda/.ros/log/2024-01-17-10-20-42-728662-dpc2108003-ubuntu-1371342

Check warning on line 5 in kminoda_autoware.log

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (minoda)
[INFO] [launch]: Default logging verbosity is set to INFO
[WARNING] [launch]: user interrupted with ctrl-c (SIGINT)
Loading