X-Git-Url: https://defiant.homedns.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=launch%2Fmove_base.launch;h=88705b986a889311881e490c8ca7496b26754f96;hb=dda5759d900e10f3fb83f8f1c8a43f92cbc825bb;hp=47c23694173cc5818eb6e64947753427b95dfc14;hpb=9706b0b09528077ec0553f429fe4c4d2f5aa9f57;p=ros_wild_thumper.git

diff --git a/launch/move_base.launch b/launch/move_base.launch
index 47c2369..88705b9 100644
--- a/launch/move_base.launch
+++ b/launch/move_base.launch
@@ -2,32 +2,29 @@
 <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="base_local_planner/TrajectoryPlannerROS"/> <!-- 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)" output="screen" unless="$(arg slam_gmapping)" />
 
-	<node pkg="gmapping" type="slam_gmapping" name="slap_gmapping" output="screen" if="$(arg slam_gmapping)">
-		<param name="scan" value="scan" />
-		<param name="delta" value="0.01" />
-		<param name="map_update_interval" value="30" />
-		<param name="linearUpdate" value="0.5" />
-		<param name="angularUpdate" value="0.25" />
-		<param name="xmin" value="-1.0"/>
-		<param name="ymin" value="-1.0"/>
-		<param name="xmax" value="1.0"/>
-		<param name="ymax" value="1.0"/>
-		<param name="odom_frame" value="odom"/>
-	</node>
+		<include file="$(find amcl)/examples/amcl_diff.launch" unless="$(arg slam_gmapping)" />
+		<param name="amcl/base_frame_id" value="base_footprint" />
+	</group>
+
+	<include file="$(find wild_thumper)/launch/gmapping.launch" if="$(arg slam_gmapping)" />
 
-	<node pkg="move_base" type="move_base" respawn="false" name="move_base" output="screen" unless="$(arg slam_gmapping)">
+	<node pkg="move_base" type="move_base" respawn="false" name="move_base" output="screen">
+		<param name="base_local_planner" value="$(arg base_local_planner)"/>
+		<param name="controller_frequency" value="10.0" />
 		<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>