Skip to content

Commit

Permalink
chore: disable rviz respawn when scenario_simulation is true (autowar…
Browse files Browse the repository at this point in the history
…efoundation#597)

* chore: disable rviz respawn when scenario_simulation is true

Signed-off-by: tomoya.kimura <[email protected]>

* style(pre-commit): autofix

---------

Signed-off-by: tomoya.kimura <[email protected]>
Co-authored-by: tkimura4 <[email protected]>
  • Loading branch information
tkimura4 and tkimura4 authored Aug 9, 2023
1 parent 2dbe0d1 commit 85a4b3d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
11 changes: 10 additions & 1 deletion autoware_launch/launch/autoware.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<arg name="use_experimental_lane_change_function" default="false"/>
<!-- Others -->
<arg name="use_foa" default="false"/>
<arg name="rviz_respawn" default="true"/>

<!-- rtc settings (auto/manual) -->
<let
Expand Down Expand Up @@ -148,6 +149,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)" respawn="true"/>
<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>
4 changes: 4 additions & 0 deletions autoware_launch/launch/planning_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<!-- Others -->
<arg name="use_foa" default="$(var scenario_simulation)"/>

<let name="rviz_respawn" value="false" if="$(var scenario_simulation)"/>
<let name="rviz_respawn" value="true" unless="$(var scenario_simulation)"/>

<group scoped="false">
<!-- Vehicle -->
<let name="launch_vehicle_interface" value="false" if="$(var vehicle_simulation)"/>
Expand Down Expand Up @@ -61,6 +64,7 @@
<arg name="use_experimental_lane_change_function" value="$(var use_experimental_lane_change_function)"/>
<!-- Others -->
<arg name="use_foa" value="$(var use_foa)"/>
<arg name="rviz_respawn" value="$(var rviz_respawn)"/>
</include>
</group>

Expand Down

0 comments on commit 85a4b3d

Please sign in to comment.