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

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

Revision: 18139
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=18139&view=rev
Author:   hsujohnhsu
Date:     2009-07-01 22:09:50 +0000 (Wed, 01 Jul 2009)

Log Message:
-----------
some fixes on launch scripts for trex.  untested.

Modified Paths:
--------------
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_tables.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_tables.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml
    pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_tables.xml
    pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml
    pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_tables.xml

Removed Paths:
-------------
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml
    pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml
    pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml
    pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_tables.xml
===================================================================

--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_tables.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_tables.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -2,7 +2,7 @@
   <master auto="start"/>
   <group name="wg">
 
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_tables.launch"/>
+    <include file="$(find pr2_gazebo)/prototype1_tables.launch"/>
 
     <!-- Common parameter settings /-->
     <param name="/trex/ping_frequency" value="1"/>

Deleted: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -1,28 +0,0 @@
-<launch>
-  <master auto="start"/>
-  <group name="wg">
-
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_tables_no_x.launch"/>
-
-    <!-- Common parameter settings /-->
-    <param name="/trex/ping_frequency" value="1"/>
-
-    <node pkg="map_server" type="map_server" args="$(find gazebo_robot_description)/world/Media/materials/textures/map_blank.png 0.1" respawn="false" />
-
-    <node pkg="fake_localization" type="fake_localization" respawn="false" output="screen" />
-
-    <node pkg="highlevel_controllers" type="move_base_sbpl" args="" respawn="false" />
-    <node pkg="highlevel_controllers" type="recharge_controller" args="" respawn="false" />
-
-    <!--
-    <node pkg="kinematic_planning" type="kinematic_planning" args="robotdesc/pr2"/>
-    <include file="$(find world_3d_map)/run.xml"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="right" respawn="false"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="left" respawn="false" />
-    <node pkg="highlevel_controllers" type="move_end_effector" args="right" respawn="false"/>
-    -->
-
-    <!--node pkg="nav_view" type="nav_view" respawn="false" /-->
-
-  </group>
-</launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -2,7 +2,7 @@
   <master auto="start"/>
   <group name="wg">
 
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_wg.launch"/>
+    <include file="$(find pr2_gazebo)/prototype1_wg.launch"/>
 
     <!-- Common parameter settings /-->
     <param name="/trex/ping_frequency" value="1"/>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_tables.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_tables.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_tables.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -2,7 +2,7 @@
   <master auto="start"/>
   <group name="wg">
 
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_tables.launch"/>
+    <include file="$(find pr2_gazebo)/prototype1_tables.launch"/>
 
     <!-- Common parameter settings /-->
     <param name="/trex/ping_frequency" value="1"/>

Deleted: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -1,28 +0,0 @@
-<launch>
-  <master auto="start"/>
-  <group name="wg">
-
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_tables_no_x.launch"/>
-
-    <!-- Common parameter settings /-->
-    <param name="/trex/ping_frequency" value="1"/>
-
-    <node pkg="map_server" type="map_server" args="$(find gazebo_robot_description)/world/Media/materials/textures/map_blank.png 0.1" respawn="false" />
-
-    <node pkg="fake_localization" type="fake_localization" respawn="false" output="screen" />
-
-    <node pkg="highlevel_controllers" type="move_base_sbpl" args="" respawn="false" />
-    <node pkg="highlevel_controllers" type="recharge_controller" args="" respawn="false" />
-
-    <!--
-    <node pkg="kinematic_planning" type="kinematic_planning" args="robotdesc/pr2"/>
-    <include file="$(find world_3d_map)/run.xml"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="right" respawn="false"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="left" respawn="false" />
-    <node pkg="highlevel_controllers" type="move_end_effector" args="right" respawn="false"/>
-    -->
-
-    <!--node pkg="nav_view" type="nav_view" respawn="false" /-->
-
-  </group>
-</launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -2,7 +2,7 @@
   <master auto="start"/>
   <group name="wg">
 
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_wg_no_x.launch"/>
+    <include file="$(find pr2_gazebo)/prototype1_tables.launch"/>
 
     <!-- Common parameter settings /-->
     <param name="/trex/ping_frequency" value="1"/>

Modified: pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_tables.xml
===================================================================
--- pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_tables.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_tables.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -2,7 +2,7 @@
   <master auto="start"/>
   <group name="wg">
 
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_tables.launch"/>
+    <include file="$(find pr2_gazebo)/prototype1_tables.launch"/>
 
     <!-- Common parameter settings /-->
     <param name="/trex/ping_frequency" value="1"/>

Deleted: pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml
===================================================================
--- pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -1,28 +0,0 @@
-<launch>
-  <master auto="start"/>
-  <group name="wg">
-
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_tables_no_x.launch"/>
-
-    <!-- Common parameter settings /-->
-    <param name="/trex/ping_frequency" value="1"/>
-
-    <node pkg="map_server" type="map_server" args="$(find gazebo_robot_description)/world/Media/materials/textures/map_blank.png 0.1" respawn="false" />
-
-    <node pkg="fake_localization" type="fake_localization" respawn="false" output="screen" />
-
-    <node pkg="highlevel_controllers" type="move_base_sbpl" args="" respawn="false" />
-    <node pkg="highlevel_controllers" type="recharge_controller" args="" respawn="false" />
-
-    <!--
-    <node pkg="kinematic_planning" type="kinematic_planning" args="robotdesc/pr2"/>
-    <include file="$(find world_3d_map)/run.xml"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="right" respawn="false"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="left" respawn="false" />
-    <node pkg="highlevel_controllers" type="move_end_effector" args="right" respawn="false"/>
-    -->
-
-    <!--node pkg="nav_view" type="nav_view" respawn="false" /-->
-
-  </group>
-</launch>

Modified: pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml
===================================================================
--- pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -2,7 +2,7 @@
   <master auto="start"/>
   <group name="wg">
 
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_wg.launch"/>
+    <include file="$(find pr2_gazebo)/prototype1_tables.launch"/>
 
     <!-- Common parameter settings /-->
     <param name="/trex/ping_frequency" value="1"/>

Modified: pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_tables.xml
===================================================================
--- pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_tables.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_tables.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -2,7 +2,7 @@
   <master auto="start"/>
   <group name="wg">
 
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_tables.launch"/>
+    <include file="$(find pr2_gazebo)/prototype1_tables.launch"/>
 
     <!-- Common parameter settings /-->
     <param name="/trex/ping_frequency" value="1"/>

Deleted: pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml
===================================================================
--- pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -1,28 +0,0 @@
-<launch>
-  <master auto="start"/>
-  <group name="wg">
-
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_tables_no_x.launch"/>
-
-    <!-- Common parameter settings /-->
-    <param name="/trex/ping_frequency" value="1"/>
-
-    <node pkg="map_server" type="map_server" args="$(find gazebo_robot_description)/world/Media/materials/textures/map_blank.png 0.1" respawn="false" />
-
-    <node pkg="fake_localization" type="fake_localization" respawn="false" output="screen" />
-
-    <node pkg="highlevel_controllers" type="move_base_sbpl" args="" respawn="false" />
-    <node pkg="highlevel_controllers" type="recharge_controller" args="" respawn="false" />
-
-    <!--
-    <node pkg="kinematic_planning" type="kinematic_planning" args="robotdesc/pr2"/>
-    <include file="$(find world_3d_map)/run.xml"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="right" respawn="false"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="left" respawn="false" />
-    <node pkg="highlevel_controllers" type="move_end_effector" args="right" respawn="false"/>
-    -->
-
-    <!--node pkg="nav_view" type="nav_view" respawn="false" /-->
-
-  </group>
-</launch>

Deleted: pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml
===================================================================
--- pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml	2009-07-01 22:08:10 UTC (rev 18138)
+++ pkg/trunk/stacks/trex/trex_ros/deprecated/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml	2009-07-01 22:09:50 UTC (rev 18139)
@@ -1,32 +0,0 @@
-<launch>
-  <master auto="start"/>
-  <group name="wg">
-
-    <include file="$(find pr2_prototype1_gazebo)/pr2_prototype1_wg_no_x.launch"/>
-
-    <!-- Common parameter settings /-->
-    <param name="/trex/ping_frequency" value="1"/>
-
-    <!-- blank map fails on timeout -->
-    <!--
-    <node pkg="map_server" type="map_server" args="$(find gazebo_robot_description)/world/Media/materials/textures/map_blank.png 0.1" respawn="false" />
-    -->
-    <node pkg="map_server" type="map_server" args="$(find gazebo_robot_description)/world/Media/materials/textures/willowMap.png 0.1" respawn="false" />
-
-    <node pkg="fake_localization" type="fake_localization" respawn="false" output="screen" />
-
-    <node pkg="highlevel_controllers" type="move_base_sbpl" args="" respawn="false" />
-    <node pkg="highlevel_controllers" type="recharge_controller" args="" respawn="false" />
-
-    <!--
-    <node pkg="kinematic_planning" type="kinematic_planning" args="robotdesc/pr2"/>
-    <include file="$(find world_3d_map)/run.xml"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="right" respawn="false"/>
-    <node pkg="highlevel_controllers" type="move_arm" args="left" respawn="false" />
-    <node pkg="highlevel_controllers" type="move_end_effector" args="right" respawn="false"/>
-    -->
-
-    <!--node pkg="nav_view" type="nav_view" respawn="false" /-->
-
-  </group>
-</launch>


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


