Skip to content

Commit

Permalink
refactored launch files
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Aug 14, 2023
1 parent 3a256d4 commit f470de8
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions launch/common.launch
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

<arg name="uav_name" default="$(optenv UAV_NAME uav)"/>
<arg name="mode" />
<arg name="path" default="$(find trajectory_loader)"/>
<arg name="config" default="$(find trajectory_loader)/config/example_params.yaml"/>
<arg name="path" default="$(find mrs_uav_trajectory_loader)"/>
<arg name="config" default="$(find mrs_uav_trajectory_loader)/config/example_params.yaml"/>

<arg name="debug" default="false" />
<arg unless="$(arg debug)" name="launch_prefix" value=""/>
<arg if="$(arg debug)" name="launch_prefix" value="debug_roslaunch"/>

<group ns="$(arg uav_name)">

<node name="trajectory_loader" pkg="trajectory_loader" type="trajectory_loader" output="screen" launch-prefix="$(arg launch_prefix)" >
<rosparam file="$(find trajectory_loader)/config/defaults.yaml" />
<node name="trajectory_loader" pkg="mrs_uav_trajectory_loader" type="trajectory_loader" output="screen" launch-prefix="$(arg launch_prefix)" >
<rosparam file="$(find mrs_uav_trajectory_loader)/config/defaults.yaml" />
<param name="uav_name" type="string" value="$(arg uav_name)" />
<param name="mode" type="string" value="$(arg mode)" />

Expand Down
6 changes: 3 additions & 3 deletions launch/goto_start.launch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<launch>

<arg name="uav_name" default="$(optenv UAV_NAME uav)"/>
<arg name="config" default="$(find trajectory_loader)/config/example_params.yaml"/>
<arg name="path" default="$(find trajectory_loader)"/>
<arg name="config" default="$(find mrs_uav_trajectory_loader)/config/example_params.yaml"/>
<arg name="path" default="$(find mrs_uav_trajectory_loader)"/>

<arg name="debug" default="false" />
<arg unless="$(arg debug)" name="launch_prefix" value=""/>
<arg if="$(arg debug)" name="launch_prefix" value="debug_roslaunch"/>

<arg name="mode" value="goto"/>
<include file="$(find trajectory_loader)/launch/common.launch" pass_all_args="true" />
<include file="$(find mrs_uav_trajectory_loader)/launch/common.launch" pass_all_args="true" />

</launch>
6 changes: 3 additions & 3 deletions launch/load.launch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<launch>

<arg name="uav_name" default="$(optenv UAV_NAME uav)"/>
<arg name="config" default="$(find trajectory_loader)/config/example_params.yaml"/>
<arg name="path" default="$(find trajectory_loader)"/>
<arg name="config" default="$(find mrs_uav_trajectory_loader)/config/example_params.yaml"/>
<arg name="path" default="$(find mrs_uav_trajectory_loader)"/>

<arg name="debug" default="false" />
<arg unless="$(arg debug)" name="launch_prefix" value=""/>
<arg if="$(arg debug)" name="launch_prefix" value="debug_roslaunch"/>

<arg name="mode" value="load"/>
<include file="$(find trajectory_loader)/launch/common.launch" pass_all_args="true" />
<include file="$(find mrs_uav_trajectory_loader)/launch/common.launch" pass_all_args="true" />

</launch>
6 changes: 3 additions & 3 deletions launch/loading_examples/single_uav.launch
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<arg name="uav_name" default="$(optenv UAV_NAME uav)"/>
<arg name="mode" default="load"/>
<arg name="path" default="$(find trajectory_loader)"/>
<arg name="path" default="$(find mrs_uav_trajectory_loader)"/>
<arg name="file" default="sample_trajectories/trajectory1.txt"/>

<group ns="$(arg uav_name)">
<node name="trajectory_loader" pkg="trajectory_loader" type="trajectory_loader" output="screen" >
<rosparam file="$(find trajectory_loader)/config/defaults.yaml" />
<node name="trajectory_loader" pkg="mrs_uav_trajectory_loader" type="trajectory_loader" output="screen" >
<rosparam file="$(find mrs_uav_trajectory_loader)/config/defaults.yaml" />
<param name="uav_name" type="string" value="$(arg uav_name)" />
<param name="mode" type="string" value="$(arg mode)" />

Expand Down
6 changes: 3 additions & 3 deletions launch/start_tracking.launch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<launch>

<arg name="uav_name" default="$(optenv UAV_NAME uav)"/>
<arg name="config" default="$(find trajectory_loader)/config/example_params.yaml"/>
<arg name="path" default="$(find trajectory_loader)"/>
<arg name="config" default="$(find mrs_uav_trajectory_loader)/config/example_params.yaml"/>
<arg name="path" default="$(find mrs_uav_trajectory_loader)"/>

<arg name="debug" default="false" />
<arg unless="$(arg debug)" name="launch_prefix" value=""/>
<arg if="$(arg debug)" name="launch_prefix" value="debug_roslaunch"/>

<arg name="mode" value="track"/>
<include file="$(find trajectory_loader)/launch/common.launch" pass_all_args="true" />
<include file="$(find mrs_uav_trajectory_loader)/launch/common.launch" pass_all_args="true" />

</launch>

0 comments on commit f470de8

Please sign in to comment.