[Personalrobots-commit] SF.net SVN: personalrobots:[23261] pkg/trunk/stacks/pr2/pr2_alpha

[<wa...@us...>]

Revision: 23261
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23261&view=rev
Author:   wattsk
Date:     2009-08-28 16:33:48 +0000 (Fri, 28 Aug 2009)

Log Message:
-----------
Removing bogus group tag from teleop files. #2635

Modified Paths:
--------------
    pkg/trunk/stacks/pr2/pr2_alpha/teleop_joystick.launch
    pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch

Modified: pkg/trunk/stacks/pr2/pr2_alpha/teleop_joystick.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/teleop_joystick.launch	2009-08-28 16:31:54 UTC (rev 23260)
+++ pkg/trunk/stacks/pr2/pr2_alpha/teleop_joystick.launch	2009-08-28 16:33:48 UTC (rev 23261)
@@ -1,37 +1,35 @@
 <launch>
   <include file="$(find pr2_alpha)/teleop_controllers.launch" />
   
-  <group name="joystick_teleop">
-    <!-- Axes -->
-    <param name="axis_vx" value="3" type="int"/>
-    <param name="axis_vy" value="2" type="int"/>
-    <param name="axis_vw" value="0" type="int"/>
-    <param name="axis_pan" value="0" type="int"/>
-    <param name="axis_tilt" value="3" type="int"/>
-    
-    <!-- Base velocities -->
-    <param name="max_vw" value="0.8" />
-    <param name="max_vx" value="0.5" />
-    <param name="max_vy" value="0.5" />
-    <param name="max_vw_run" value="1.4" />
-    <param name="max_vx_run" value="1.0" />
-    <param name="max_vy_run" value="1.0" />
-    
-    <!-- Head -->
-    <param name="max_pan" value="2.7" />
-    <param name="max_tilt" value="1.4" />
-    <param name="min_tilt" value="-0.4" />
-    <param name="tilt_step" value="0.015" />
-    <param name="pan_step" value="0.02" />
-    
-    <!-- Button maps for logitech -->
-    <param name="run_button" value="5" type="int" />
-    <param name="torso_dn_button" value="1" type="int" />
-    <param name="torso_up_button" value="3" type="int" />
-    <param name="head_button" value="6" type="int" />
-    <param name="deadman_button" value="4" type="int"/>
-    
-    <node pkg="teleop_pr2" type="teleop_pr2" output="screen"/>
-  </group>
+  <!-- Axes -->
+  <param name="axis_vx" value="3" type="int"/>
+  <param name="axis_vy" value="2" type="int"/>
+  <param name="axis_vw" value="0" type="int"/>
+  <param name="axis_pan" value="0" type="int"/>
+  <param name="axis_tilt" value="3" type="int"/>
+  
+  <!-- Base velocities -->
+  <param name="max_vw" value="0.8" />
+  <param name="max_vx" value="0.5" />
+  <param name="max_vy" value="0.5" />
+  <param name="max_vw_run" value="1.4" />
+  <param name="max_vx_run" value="1.0" />
+  <param name="max_vy_run" value="1.0" />
+  
+  <!-- Head -->
+  <param name="max_pan" value="2.7" />
+  <param name="max_tilt" value="1.4" />
+  <param name="min_tilt" value="-0.4" />
+  <param name="tilt_step" value="0.015" />
+  <param name="pan_step" value="0.02" />
+  
+  <!-- Button maps for logitech -->
+  <param name="run_button" value="5" type="int" />
+  <param name="torso_dn_button" value="1" type="int" />
+  <param name="torso_up_button" value="3" type="int" />
+  <param name="head_button" value="6" type="int" />
+  <param name="deadman_button" value="4" type="int"/>
+  
+  <node pkg="teleop_pr2" type="teleop_pr2" output="screen"/>
 </launch>
 

Modified: pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch	2009-08-28 16:31:54 UTC (rev 23260)
+++ pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch	2009-08-28 16:33:48 UTC (rev 23261)
@@ -1,37 +1,35 @@
 <launch>
   <include file="$(find pr2_alpha)/teleop_controllers.launch" />
+
+  <!-- Axes -->
+  <param name="axis_vx" value="3" type="int"/>
+  <param name="axis_vy" value="2" type="int"/>
+  <param name="axis_vw" value="0" type="int"/>
+  <param name="axis_pan" value="0" type="int"/>
+  <param name="axis_tilt" value="3" type="int"/>
   
-  <group name="ps3_teleop">
-    <!-- Axes -->
-    <param name="axis_vx" value="3" type="int"/>
-    <param name="axis_vy" value="2" type="int"/>
-    <param name="axis_vw" value="0" type="int"/>
-    <param name="axis_pan" value="0" type="int"/>
-    <param name="axis_tilt" value="3" type="int"/>
-    
-    <!-- Base velocities -->
-    <param name="max_vw" value="0.8" />
-    <param name="max_vx" value="0.5" />
-    <param name="max_vy" value="0.5" />
-    <param name="max_vw_run" value="1.4" />
-    <param name="max_vx_run" value="1.0" />
-    <param name="max_vy_run" value="1.0" />
-    
-    <!-- Head -->
-    <param name="max_pan" value="2.7" />
-    <param name="max_tilt" value="1.4" />
-    <param name="min_tilt" value="-0.4" />
-    <param name="tilt_step" value="0.015" />
-    <param name="pan_step" value="0.02" />
-    
-    <!-- Buttons have changed for PS3 controller mapping -->
-    <param name="run_button" value="11" type="int" />
-    <param name="torso_dn_button" value="14" type="int" />
-    <param name="torso_up_button" value="12" type="int" />
-    <param name="head_button" value="8" type="int" />
-    <param name="deadman_button" value="10" type="int"/>
-    
-    <node pkg="teleop_pr2" type="teleop_pr2" output="screen"/>
-  </group>
+  <!-- Base velocities -->
+  <param name="max_vw" value="0.8" />
+  <param name="max_vx" value="0.5" />
+  <param name="max_vy" value="0.5" />
+  <param name="max_vw_run" value="1.4" />
+  <param name="max_vx_run" value="1.0" />
+  <param name="max_vy_run" value="1.0" />
+  
+  <!-- Head -->
+  <param name="max_pan" value="2.7" />
+  <param name="max_tilt" value="1.4" />
+  <param name="min_tilt" value="-0.4" />
+  <param name="tilt_step" value="0.015" />
+  <param name="pan_step" value="0.02" />
+  
+  <!-- Buttons have changed for PS3 controller mapping -->
+  <param name="run_button" value="11" type="int" />
+  <param name="torso_dn_button" value="14" type="int" />
+  <param name="torso_up_button" value="12" type="int" />
+  <param name="head_button" value="8" type="int" />
+  <param name="deadman_button" value="10" type="int"/>
+  
+  <node pkg="teleop_pr2" type="teleop_pr2" output="screen"/>
 </launch>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.