Skip to content

Commit

Permalink
feat(rviz): respawn rviz (#518)
Browse files Browse the repository at this point in the history
Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
  • Loading branch information
kosuke55 authored Aug 22, 2023
1 parent 58b4521 commit 9bdd7c5
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
11 changes: 10 additions & 1 deletion autoware_launch/launch/autoware.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<!-- 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"/>
<arg name="rviz_respawn" default="true"/>
<!-- Perception -->
<arg name="perception_mode" default="lidar" description="select perception mode. camera_lidar_radar_fusion, camera_lidar_fusion, lidar_radar_fusion, lidar, radar"/>
<arg name="traffic_light_recognition/enable_fine_detection" default="true" description="enable traffic light fine detection"/>
Expand Down Expand Up @@ -108,6 +109,14 @@

<!-- Tools -->
<group>
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)"/>
<node
pkg="rviz2"
exec="rviz2"
name="rviz2"
output="screen"
args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png"
if="$(var rviz)"
respawn="$(var rviz_respawn)"
/>
</group>
</launch>
9 changes: 6 additions & 3 deletions autoware_launch/launch/planning_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@
<!-- 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"/>
<!-- 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"/>
<!-- Scenario simulation -->
<arg name="initial_engage_state" default="true" description="/vehicle/engage state after starting Autoware"/>
<arg name="perception/enable_detection_failure" default="true" description="enable to simulate detection failure when using dummy perception"/>
<arg name="perception/enable_object_recognition" default="true" description="enable object recognition when using dummy perception"/>
<arg name="perception/use_base_link_z" default="true" description="dummy perception uses base_link z axis coordinate if it is true"/>
<arg name="sensing/visible_range" default="300.0" description="visible range when using dummy perception"/>
<arg name="scenario_simulation" default="false" description="use scenario simulation"/>
<!-- 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"/>
<let name="rviz_respawn" value="false" if="$(var scenario_simulation)"/>
<let name="rviz_respawn" value="true" unless="$(var scenario_simulation)"/>
<!-- Vcu emulation -->
<arg name="vehicle_simulation" default="true" description="use vehicle simulation"/>

Expand Down Expand Up @@ -53,6 +55,7 @@
<!-- Tools -->
<arg name="rviz" value="$(var rviz)"/>
<arg name="rviz_config" value="$(var rviz_config)"/>
<arg name="rviz_respawn" value="$(var rviz_respawn)"/>
</include>
</group>

Expand Down

0 comments on commit 9bdd7c5

Please sign in to comment.