X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=launch%2Fmove_base.launch;h=a046e6eaf60522b917730cf8d03bd001e3461702;hp=b6924bd364480ab432a1b215be34584ce336c4ea;hb=0bf5df6648a8d2ad791e2c0f95b83524eaded03a;hpb=b59f8ce49da71575d76c2da8f8bb5ba3e4c7977f

diff --git a/launch/move_base.launch b/launch/move_base.launch
index b6924bd..a046e6e 100644
--- a/launch/move_base.launch
+++ b/launch/move_base.launch
@@ -2,13 +2,17 @@
 <launch>
 	<arg name="slam_gmapping" default="false" />
 	<arg name="map_file" default="$(find wild_thumper)/data/map.yaml" />
-
-	<!-- Run the map server -->
-	<node name="map_server" pkg="map_server" type="map_server" args="$(arg map_file)" unless="$(arg slam_gmapping)" />
+	<arg name="nomap" default="false" />
+	<arg name="base_local_planner" default="dwa_local_planner/DWAPlannerROS"/> <!-- base_local_planner/TrajectoryPlannerROS || dwa_local_planner/DWAPlannerROS -->
 
 	<!-- Run AMCL -->
-	<include file="$(find amcl)/examples/amcl_diff.launch" unless="$(arg slam_gmapping)" />
-	<param name="amcl/base_frame_id" value="base_footprint" />
+	<group unless="$(arg nomap)">
+		<!-- Run the map server -->
+		<node name="map_server" pkg="map_server" type="map_server" args="$(arg map_file)" unless="$(arg slam_gmapping)" />
+
+		<include file="$(find amcl)/examples/amcl_diff.launch" unless="$(arg slam_gmapping)" />
+		<param name="amcl/base_frame_id" value="base_footprint" />
+	</group>
 
 	<node pkg="gmapping" type="slam_gmapping" name="slap_gmapping" output="screen" if="$(arg slam_gmapping)">
 		<param name="scan" value="scan" />
@@ -24,10 +28,13 @@
 	</node>
 
 	<node pkg="move_base" type="move_base" respawn="false" name="move_base" output="screen">
+		<param name="base_local_planner" value="$(arg base_local_planner)"/>
 		<rosparam file="$(find wild_thumper)/config/costmap_common_params.yaml" command="load" ns="global_costmap" />
 		<rosparam file="$(find wild_thumper)/config/costmap_common_params.yaml" command="load" ns="local_costmap" />
-		<rosparam file="$(find wild_thumper)/config/global_costmap_params.yaml" command="load" />
+		<rosparam file="$(find wild_thumper)/config/global_costmap_params.yaml" command="load" unless="$(arg nomap)" />
+		<rosparam file="$(find wild_thumper)/config/global_costmap_params_odom.yaml" command="load" if="$(arg nomap)" />
 		<rosparam file="$(find wild_thumper)/config/local_costmap_params.yaml" command="load" />
 		<rosparam file="$(find wild_thumper)/config/base_local_planner_params.yaml" command="load" />
+		<remap from="/cmd_vel" to="move_base/cmd_vel"/>
 	</node>
 </launch>