X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=launch%2Fwild_thumper.launch;h=61d2511f0f3564548fcd789187e847e703d7039f;hp=c7c88ef995a8a0adb5762b22c5930e4b84d9c05b;hb=d91b00658ab90c6a4d95b2976dbcd0663c52595f;hpb=ecd10e1d62c3f4bb6ceeec6705adf92f0b235faa

diff --git a/launch/wild_thumper.launch b/launch/wild_thumper.launch
index c7c88ef..61d2511 100644
--- a/launch/wild_thumper.launch
+++ b/launch/wild_thumper.launch
@@ -2,40 +2,51 @@
 <launch>
 	<arg name="use_imu" default="true"/>
 
+	<node pkg="nodelet" type="nodelet" name="nodelet_manager" args="manager"/>
+
 	<param name="robot_description" command="$(find xacro)/xacro.py $(find wild_thumper)/urdf/wild_thumper.urdf.xacro"/>
 
-	<node pkg="robot_state_publisher" type="robot_state_publisher" name="robot_state_publisher" output="screen"/>
+	<node pkg="robot_state_publisher" type="robot_state_publisher" name="robot_state_publisher" output="screen">
+		<param name="publish_frequency" value="20.0" />
+	</node>
+	<node pkg="joint_state_publisher" type="joint_state_publisher" name="joint_state_publisher" output="screen"/>
 
 	<node pkg="diagnostic_aggregator" type="aggregator_node" name="diagnostic_aggregator" output="screen">
-		<rosparam command="load" file="$(find wild_thumper)/cfg/analyzers.yaml"/>
+		<rosparam command="load" file="$(find wild_thumper)/config/analyzers.yaml"/>
 	</node>
 
-	<node pkg="wild_thumper" type="wt_node.py" name="wild_thumper" output="screen" respawn="true">
+	<node pkg="wild_thumper" type="wt_node.py" name="wild_thumper" output="screen" respawn="false" required="true">
 		<param name="enable_odom_tf" value="true" unless="$(arg use_imu)"/>
 		<param name="enable_odom_tf" value="false" if="$(arg use_imu)"/>
 	</node>
 
 	<node pkg="razor_imu_9dof" type="imu_node.py" name="imu_node" output="screen" if="$(arg use_imu)">
-		<rosparam file="$(find wild_thumper)/cfg/razor.yaml" command="load"/>
+		<rosparam file="$(find wild_thumper)/config/razor.yaml" command="load"/>
 	</node>
 
 	<node pkg="gpsd_client" type="gpsd_client"  name="gpsd_client" output="screen">
 		<param name="use_gps_time" value="false"/>
 	</node>
 
-	<node pkg="gps_common" type="utm_odometry_node" name="gps_conv">
-		<remap from="odom" to="odom_gps"/>
-		<param name="frame_id" value="base_footprint"/>
+	<node pkg="gps_common" type="utm_odometry_node" name="gps_conv" output="screen">
+		<remap from="odom" to="gps"/>
+		<param name="frame_id" value="odom"/>
+		<param name="child_frame_id" value="base_footprint"/>
 	</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="vo" to="odom_gps"/>
+		<remap from="vo" to="gps"/>
 		<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="true"/>
-		<param name="debug" value="true"/>
+		<param name="debug" value="false"/>
 		<param name="sensor_timeout" value="2.0"/>
 	</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>