[Personalrobots-commit] SF.net SVN: personalrobots:[22755] pkg/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 22755
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22755&view=rev
Author:   eitanme
Date:     2009-08-24 21:24:05 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
Updating references to tuckarm in the system to correspond with its new location

Modified Paths:
--------------
    pkg/trunk/applications/2dmapping_pr2_app/2dmapping_pr2/launch/gather_data.launch
    pkg/trunk/demos/2dnav_gazebo/pr2-empty-amcl.launch
    pkg/trunk/demos/2dnav_gazebo/pr2-empty-fake_localization.launch
    pkg/trunk/demos/2dnav_gazebo/pr2-simple-fake_localization.launch
    pkg/trunk/demos/2dnav_gazebo/pr2-wg-amcl.launch
    pkg/trunk/demos/door_demos_gazebo/launch/pr2_and_door.launch
    pkg/trunk/demos/handhold/run.launch
    pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_arm.launch
    pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_camera.launch
    pkg/trunk/nav/visual_nav/launch/robot.launch
    pkg/trunk/sandbox/person_data/person_data.launch
    pkg/trunk/sandbox/webteleop/launch/gazebo.launch

Modified: pkg/trunk/applications/2dmapping_pr2_app/2dmapping_pr2/launch/gather_data.launch
===================================================================

--- pkg/trunk/applications/2dmapping_pr2_app/2dmapping_pr2/launch/gather_data.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/applications/2dmapping_pr2_app/2dmapping_pr2/launch/gather_data.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -1,6 +1,6 @@
 <launch>
   <include file="$(find pr2_alpha)/$(env ROBOT).launch"/>
   <include file="$(find pr2_alpha)/teleop_joystick.launch"/>
-  <node pkg="pr2_default_controllers" type="tuckarm.py" args="r"/>
+  <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="r"/>
   <node pkg="rosrecord" type="rosrecord" args="-f /bags/2dmapping_pr2 base_scan tf_message"/>
 </launch>

Modified: pkg/trunk/demos/2dnav_gazebo/pr2-empty-amcl.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/pr2-empty-amcl.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/demos/2dnav_gazebo/pr2-empty-amcl.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -7,7 +7,7 @@
   <include file="$(find pr2_gazebo)/pr2.launch"/>
 
   <!-- Tug Arms For Navigation -->
-  <node pkg="pr2_default_controllers" type="tuckarm.py" args="b" output="screen" />
+  <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="b" output="screen" />
 
   <!-- load map -->
   <node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/map_blank.png 0.1" respawn="true" machine="three" />

Modified: pkg/trunk/demos/2dnav_gazebo/pr2-empty-fake_localization.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/pr2-empty-fake_localization.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/demos/2dnav_gazebo/pr2-empty-fake_localization.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -7,7 +7,7 @@
   <include file="$(find pr2_gazebo)/pr2.launch"/>
 
   <!-- Tug Arms For Navigation -->
-  <node pkg="pr2_default_controllers" type="tuckarm.py" args="b" output="screen" />
+  <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="b" output="screen" />
 
   <!-- load map -->
   <node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/map_blank.png 0.1" respawn="true" machine="three" />

Modified: pkg/trunk/demos/2dnav_gazebo/pr2-simple-fake_localization.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/pr2-simple-fake_localization.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/demos/2dnav_gazebo/pr2-simple-fake_localization.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -7,7 +7,7 @@
   <include file="$(find pr2_gazebo)/pr2.launch"/>
 
   <!-- Tug Arms For Navigation -->
-  <node pkg="pr2_default_controllers" type="tuckarm.py" args="b" output="screen" />
+  <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="b" output="screen" />
 
   <!-- load map -->
   <node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/map3.png 0.1" respawn="true" machine="three" />

Modified: pkg/trunk/demos/2dnav_gazebo/pr2-wg-amcl.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/pr2-wg-amcl.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/demos/2dnav_gazebo/pr2-wg-amcl.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -10,7 +10,7 @@
   <node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/willowMap.png 0.1" respawn="true" machine="three" />
 
   <!-- Tug Arms For Navigation -->
-  <node pkg="pr2_default_controllers" type="tuckarm.py" args="b" output="screen" />
+  <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="b" output="screen" />
 
   <!-- nav-stack -->
   <include file="$(find 2dnav_gazebo)/2dnav-stack-amcl.launch"/>

Modified: pkg/trunk/demos/door_demos_gazebo/launch/pr2_and_door.launch
===================================================================
--- pkg/trunk/demos/door_demos_gazebo/launch/pr2_and_door.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/demos/door_demos_gazebo/launch/pr2_and_door.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -12,7 +12,7 @@
     <param name="publish_frequency" type="double" value="50.0" />
     <param name="tf_prefix" type="string" value="" />
   </node>
-  <!--<node pkg="pr2_default_controllers" type="tuckarm.py" args="l" respawn="false" />-->
+  <!--<node pkg="pr2_experimental_controllers" type="tuckarm.py" args="l" respawn="false" />-->
 
   <!-- load door -->
   <param name="door_description" command="$(find xacro)/xacro.py '$(find door_demos_gazebo)/door_defs/door_defs.xml'" />

Modified: pkg/trunk/demos/handhold/run.launch
===================================================================
--- pkg/trunk/demos/handhold/run.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/demos/handhold/run.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -6,7 +6,7 @@
   <node pkg="mechanism_control" type="spawner.py" args="r_arm_cartesian_pose_controller" />
 
   <!--
-      <node pkg="pr2_default_controllers" type="tuckarm.py" args="l" />
+      <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="l" />
       -->
 
   <node pkg="handhold" type="handhold" />

Modified: pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_arm.launch
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_arm.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_arm.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -5,7 +5,7 @@
   <!-- send single_link.xml to param server -->
   <include file="$(find arm_gazebo)/l_arm.launch" />
 
-  <node pkg="pr2_default_controllers" type="tuckarm.py" args="l" respawn="true" />
+  <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="l" respawn="true" />
   <include file="$(find arm_gazebo)/controllers/l_gripper_controller.launch" />
 
   <test test-name="test_pr2_mechanism_gazebo_test_arm" pkg="test_pr2_mechanism_controllers_gazebo" type="test_arm.py" time-limit="110" />

Modified: pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_camera.launch
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_camera.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_camera.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -26,7 +26,7 @@
 
   <!-- send head a pointing command -->
   <node pkg="pr2_mechanism_controllers" type="pointhead.py" args="10 0 1 /base_link" output="screen"/>
-  <node pkg="pr2_default_controllers" type="tuckarm.py" args="b" output="screen"/>
+  <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="b" output="screen"/>
 
   <!-- test -->
   <test test-name="test_pr2_sensors_gazebo_test_camera" pkg="test_pr2_sensors_gazebo" type="test_camera.py" time-limit="110" />

Modified: pkg/trunk/nav/visual_nav/launch/robot.launch
===================================================================
--- pkg/trunk/nav/visual_nav/launch/robot.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/nav/visual_nav/launch/robot.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -10,7 +10,7 @@
     <node pkg="vslam" type="roadmap.py" machine="four"/>
 
     
-    <node pkg="pr2_default_controllers" type="tuckarm.py" args="r"/>
+    <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="r"/>
 
     <param name="visual_navigator/odom_frame" value="odom"/>
     <node pkg="visual_nav" type="ros_visual_nav" args="" respawn="false" output="screen" /> 

Modified: pkg/trunk/sandbox/person_data/person_data.launch
===================================================================
--- pkg/trunk/sandbox/person_data/person_data.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/sandbox/person_data/person_data.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -1,10 +1,10 @@
 <launch>
 <node pkg="person_data" type="joylistener" output="screen"/>
 <node pkg ="person_data" type="headhack" output="screen" />
-<node pkg ="pr2_default_controllers" type="tuckarm.py" args="r" output="screen" />
+<node pkg ="pr2_experimental_controllers" type="tuckarm.py" args="r" output="screen" />
 <!-- for some reason putting joylistener after the other launch files broke it,
 and putting headhack after them makes roslaunch not find it! -->
-<!-- node pkg="pr2_default_controllers" type="tuckarm.py" args="r" -->
+<!-- node pkg="pr2_experimental_controllers" type="tuckarm.py" args="r" -->
 <include file="$(find person_data)/data_collector_record.launch"  />
 <include file="$(find person_data)/truly_passive.launch" />
 <include file="$(find person_data)/teleop_joystick.launch" />

Modified: pkg/trunk/sandbox/webteleop/launch/gazebo.launch
===================================================================
--- pkg/trunk/sandbox/webteleop/launch/gazebo.launch	2009-08-24 21:10:56 UTC (rev 22754)
+++ pkg/trunk/sandbox/webteleop/launch/gazebo.launch	2009-08-24 21:24:05 UTC (rev 22755)
@@ -14,8 +14,8 @@
   <node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/willowMap.png 0.1" respawn="true" machine="three" />
 
   <!-- Tug Arms For Navigation -->
-  <node pkg="pr2_default_controllers" type="tuckarm.py" args="l" output="screen" />
-  <node pkg="pr2_default_controllers" type="tuckarm.py" args="r" output="screen" />
+  <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="l" output="screen" />
+  <node pkg="pr2_experimental_controllers" type="tuckarm.py" args="r" output="screen" />
 
   <!-- nav-stack -->
   <include file="$(find 2dnav_gazebo)/2dnav-stack-amcl.launch"/>


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


