X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=launch%2Fgazebo.launch;h=5be2fd6bc31e4583c135480f400013f7ee266e63;hp=da5f559469bc5dc51e0885ac6d03c1d5cc312b29;hb=b7f9609e60bd234f15b253901eaa1c3e462cc5b1;hpb=6925d3469d5f22b6271ece74540c0a30a51942db

diff --git a/launch/gazebo.launch b/launch/gazebo.launch
index da5f559..5be2fd6 100644
--- a/launch/gazebo.launch
+++ b/launch/gazebo.launch
@@ -2,6 +2,8 @@
 <launch>
 	<arg name="use_imu" default="true"/>
 
+	<node pkg="nodelet" type="nodelet" name="nodelet_manager" args="manager"/>
+
 	<!-- Load joint controller configurations from YAML file to parameter server -->
 	<rosparam file="$(find wild_thumper)/config/control.yaml" command="load" />
 	<rosparam param="/diff_drive_controller/enable_odom_tf" unless="$(arg use_imu)">true</rosparam>
@@ -21,20 +23,20 @@
 	<!-- load the controllers -->
 	<node name="controller_spawner" pkg="controller_manager" type="spawner" output="screen" ns="/" args="joint_state_controller diff_drive_controller"/>
 
-	<node name="relay_cmd_vel" pkg="topic_tools" type="relay" output="screen" args="/cmd_vel /diff_drive_controller/cmd_vel" />
+	<node name="relay_cmd_vel" pkg="topic_tools" type="relay" output="screen" args="/cmd_vel_out /diff_drive_controller/cmd_vel" />
 	<node name="relay_odom" pkg="topic_tools" type="relay" output="screen" args="/diff_drive_controller/odom /odom" />
 
 	<node pkg="depthimage_to_laserscan" type="depthimage_to_laserscan" name="depthimage_to_laserscan" output="screen">
 		<remap from="/image" to="/camera/depth/image_raw"/>
         </node>
 
-	<node pkg="robot_pose_ekf" type="robot_pose_ekf" name="robot_pose_ekf" output="screen" if="$(arg use_imu)">
-		<remap from="imu_data" to="imu"/>
-		<remap from="robot_pose_ekf/odom_combined" to="odom_combined"/>
-		<param name="output_frame" value="odom"/>
-		<param name="freq" value="20.0"/>
-		<param name="vo_used" value="false"/>
-		<param name="debug" value="true"/>
-		<param name="sensor_timeout" value="2.0"/>
+	<node pkg="robot_localization" type="ekf_localization_node" name="ekf" clear_params="true" output="screen" if="$(arg use_imu)">
+		<rosparam command="load" file="$(find wild_thumper)/config/robot_localization.yaml"/>
+		<remap from="odometry/filtered" to="odom_combined"/>
 	</node>
+
+	<include file="$(find yocs_cmd_vel_mux)/launch/cmd_vel_mux.launch">
+		<arg name="config_file" value="$(find wild_thumper)/config/cmd_vel_mux.yaml" />
+		<arg name="nodelet_manager_name" value="nodelet_manager" />
+	</include>
 </launch>