Skip to content
This repository has been archived by the owner on Feb 6, 2023. It is now read-only.

Hotfix to bring the demo launch files up to date with the main uuv_si… #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Hotfix to bring the demo launch files up to date with the main uuv_si… #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions rexrov2_gazebo/launch/start_demo_mb_fl_controller.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

<arg name="teleop_on" default="false" doc="If true, the teleop node will be started"/>
<arg name="joy_id" default="0" doc="Joystick ID"/>
<arg name="use_gazebo_client" default="true" doc="If true, the gazebo visualisation client will be started"/>
<arg name="world_name" default="ocean_waves" doc="Name of world for gazebo to load. Can be from any of the launch files listed in uuv_gazebo_worlds without an extension."/>

<include file="$(find uuv_gazebo_worlds)/launch/ocean_waves.launch"/>

<include file="$(find uuv_simulation_wrapper)/launch/unpause_simulation.launch">
<arg name="timeout" value="5"/>
<include file="$(find uuv_gazebo_worlds)/launch/$(arg world_name).launch">
<arg name="gui" value="$(arg use_gazebo_client)"/>
</include>

<include file="$(find rexrov2_description)/launch/upload_rexrov2.launch">
Expand Down
8 changes: 4 additions & 4 deletions rexrov2_gazebo/launch/start_demo_nmb_sm_controller.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

<arg name="teleop_on" default="false" doc="If true, the teleop node will be started"/>
<arg name="joy_id" default="0" doc="Joystick ID"/>
<arg name="use_gazebo_client" default="true" doc="If true, the gazebo visualisation client will be started"/>
<arg name="world_name" default="empty_underwater_world" doc="Name of world for gazebo to load. Can be from any of the launch files listed in uuv_gazebo_worlds without an extension."/>

<include file="$(find uuv_gazebo_worlds)/launch/empty_underwater_world.launch"/>

<include file="$(find uuv_simulation_wrapper)/launch/unpause_simulation.launch">
<arg name="timeout" value="5"/>
<include file="$(find uuv_gazebo_worlds)/launch/$(arg world_name).launch">
<arg name="gui" value="$(arg use_gazebo_client)"/>
</include>

<include file="$(find rexrov2_description)/launch/upload_rexrov2.launch">
Expand Down
8 changes: 4 additions & 4 deletions rexrov2_gazebo/launch/start_demo_pd_grav_compensation_controller.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

<arg name="teleop_on" default="false" doc="If true, the teleop node will be started"/>
<arg name="joy_id" default="0" doc="Joystick ID"/>
<arg name="use_gazebo_client" default="true" doc="If true, the gazebo visualisation client will be started"/>
<arg name="world_name" default="ocean_waves" doc="Name of world for gazebo to load. Can be from any of the launch files listed in uuv_gazebo_worlds without an extension."/>

<include file="$(find uuv_gazebo_worlds)/launch/ocean_waves.launch"/>

<include file="$(find uuv_simulation_wrapper)/launch/unpause_simulation.launch">
<arg name="timeout" value="5"/>
<include file="$(find uuv_gazebo_worlds)/launch/$(arg world_name).launch">
<arg name="gui" value="$(arg use_gazebo_client)"/>
</include>

<include file="$(find rexrov2_description)/launch/upload_rexrov2.launch">
Expand Down
8 changes: 4 additions & 4 deletions rexrov2_gazebo/launch/start_demo_pid_controller.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

<arg name="teleop_on" default="false" doc="If true, the teleop node will be started"/>
<arg name="joy_id" default="0" doc="Joystick ID"/>
<arg name="use_gazebo_client" default="true" doc="If true, the gazebo visualisation client will be started"/>
<arg name="world_name" default="ocean_waves" doc="Name of world for gazebo to load. Can be from any of the launch files listed in uuv_gazebo_worlds without an extension."/>

<include file="$(find uuv_gazebo_worlds)/launch/ocean_waves.launch"/>

<include file="$(find uuv_simulation_wrapper)/launch/unpause_simulation.launch">
<arg name="timeout" value="5"/>
<include file="$(find uuv_gazebo_worlds)/launch/$(arg world_name).launch">
<arg name="gui" value="$(arg use_gazebo_client)"/>
</include>

<include file="$(find rexrov2_description)/launch/upload_rexrov2.launch">
Expand Down
8 changes: 4 additions & 4 deletions rexrov2_gazebo/launch/start_demo_sf_controller.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

<arg name="teleop_on" default="false" doc="If true, the teleop node will be started"/>
<arg name="joy_id" default="0" doc="Joystick ID"/>
<arg name="use_gazebo_client" default="true" doc="If true, the gazebo visualisation client will be started"/>
<arg name="world_name" default="ocean_waves" doc="Name of world for gazebo to load. Can be from any of the launch files listed in uuv_gazebo_worlds without an extension."/>

<include file="$(find uuv_gazebo_worlds)/launch/ocean_waves.launch"/>

<include file="$(find uuv_simulation_wrapper)/launch/unpause_simulation.launch">
<arg name="timeout" value="5"/>
<include file="$(find uuv_gazebo_worlds)/launch/$(arg world_name).launch">
<arg name="gui" value="$(arg use_gazebo_client)"/>
</include>

<include file="$(find rexrov2_description)/launch/upload_rexrov2.launch">
Expand Down