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

[<hsu...@us...>]

Revision: 8017
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=8017&view=rev
Author:   hsujohnhsu
Date:     2008-12-12 18:46:09 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
moved gazebo examples into demo directory.

Modified Paths:
--------------
    pkg/trunk/demos/examples_gazebo/dual_link.xml
    pkg/trunk/demos/examples_gazebo/dual_link_no_x.xml
    pkg/trunk/demos/examples_gazebo/multi_link.xml
    pkg/trunk/demos/examples_gazebo/single_link.xml

Added Paths:
-----------
    pkg/trunk/demos/examples_gazebo/dual_link_defs/
    pkg/trunk/demos/examples_gazebo/multi_link_defs/
    pkg/trunk/demos/examples_gazebo/single_link_defs/

Removed Paths:
-------------
    pkg/trunk/robot_descriptions/wg_robot_description/dual_link_test/
    pkg/trunk/robot_descriptions/wg_robot_description/multi_link_test/
    pkg/trunk/robot_descriptions/wg_robot_description/single_link_test/

Modified: pkg/trunk/demos/examples_gazebo/dual_link.xml
===================================================================
--- pkg/trunk/demos/examples_gazebo/dual_link.xml	2008-12-12 18:43:52 UTC (rev 8016)
+++ pkg/trunk/demos/examples_gazebo/dual_link.xml	2008-12-12 18:46:09 UTC (rev 8017)
@@ -1,7 +1,7 @@
 <launch>
   <group name="wg">
     <!-- send dual_link.xml to param server -->
-    <include file="$(find wg_robot_description)/dual_link_test/send_description.launch" />
+    <param name="robotdesc/pr2" command="$(find xacro)/xacro.py '$(find examples_gazebo)/dual_link_defs/dual_link.xml'" />
 
     <!-- start gazebo -->
     <node pkg="gazebo" type="gazebo" args="$(find gazebo_robot_description)/gazebo_worlds/empty.world" respawn="false" output="screen">
@@ -14,7 +14,7 @@
   <!-- push robotdesc/pr2 to factory and spawn robot in gazebo -->
   <node pkg="gazebo_plugin" type="urdf2factory" args="robotdesc/pr2" respawn="false" output="screen" /> <!-- load default arm controller -->
 
-  <!--node pkg="mechanism_control" type="mech.py" args="sp $(find wg_robot_description)/dual_link_test/controllers_dual_link.xml" respawn="false" output="screen" /--> <!-- load default arm controller -->
+  <!--node pkg="mechanism_control" type="mech.py" args="sp $(find examples_gazebo)/dual_link_defs/controllers_dual_link.xml" respawn="false" output="screen" /--> <!-- load default arm controller -->
   <!--node pkg="robot_mechanism_controllers" type="control.py" args="set test_controller 0.5" respawn="false" output="screen" /--> <!-- open gripper .5 radians -->
 </launch>
 

Modified: pkg/trunk/demos/examples_gazebo/dual_link_no_x.xml
===================================================================
--- pkg/trunk/demos/examples_gazebo/dual_link_no_x.xml	2008-12-12 18:43:52 UTC (rev 8016)
+++ pkg/trunk/demos/examples_gazebo/dual_link_no_x.xml	2008-12-12 18:46:09 UTC (rev 8017)
@@ -1,7 +1,7 @@
 <launch>
   <group name="wg">
     <!-- send dual_link.xml to param server -->
-    <include file="$(find wg_robot_description)/dual_link_test/send_description.launch" />
+    <param name="robotdesc/pr2" command="$(find xacro)/xacro.py '$(find examples_gazebo)/dual_link_defs/dual_link.xml'" />
 
     <!-- start gazebo -->
     <node pkg="gazebo" type="gazebo" args="-r $(find gazebo_robot_description)/gazebo_worlds/empty.world" respawn="false" output="screen">
@@ -14,7 +14,7 @@
   <!-- push robotdesc/pr2 to factory and spawn robot in gazebo -->
   <node pkg="gazebo_plugin" type="urdf2factory" args="robotdesc/pr2" respawn="false" output="screen" /> <!-- load default arm controller -->
 
-  <!--node pkg="mechanism_control" type="mech.py" args="sp $(find wg_robot_description)/dual_link_test/controllers_dual_link.xml" respawn="false" output="screen" /--> <!-- load default arm controller -->
+  <!--node pkg="mechanism_control" type="mech.py" args="sp $(find examples_gazebo)/dual_link_defs/controllers_dual_link.xml" respawn="false" output="screen" /--> <!-- load default arm controller -->
   <!--node pkg="robot_mechanism_controllers" type="control.py" args="set test_controller 0.5" respawn="false" output="screen" /--> <!-- open gripper .5 radians -->
 </launch>
 

Modified: pkg/trunk/demos/examples_gazebo/multi_link.xml
===================================================================
--- pkg/trunk/demos/examples_gazebo/multi_link.xml	2008-12-12 18:43:52 UTC (rev 8016)
+++ pkg/trunk/demos/examples_gazebo/multi_link.xml	2008-12-12 18:46:09 UTC (rev 8017)
@@ -1,7 +1,7 @@
 <launch>
   <group name="wg">
     <!-- send multi_link.xml to param server -->
-    <include file="$(find wg_robot_description)/multi_link_test/send_description.launch" />
+    <param name="robotdesc/pr2" command="$(find xacro)/xacro.py '$(find examples_gazebo)/multi_link_defs/multi_link.xml'" />
 
     <!-- start gazebo -->
     <node pkg="gazebo" type="gazebo" args="$(find gazebo_robot_description)/gazebo_worlds/empty.world" respawn="false" output="screen">
@@ -14,7 +14,7 @@
   <!-- push robotdesc/pr2 to factory and spawn robot in gazebo -->
   <node pkg="gazebo_plugin" type="urdf2factory" args="robotdesc/pr2" respawn="false" output="screen" /> <!-- load default arm controller -->
 
-  <node pkg="mechanism_control" type="mech.py" args="sp $(find wg_robot_description)/multi_link_test/controllers_multi_link.xml" respawn="false" output="screen" /> <!-- load default arm controller -->
+  <node pkg="mechanism_control" type="mech.py" args="sp $(find examples_gazebo)/multi_link_defs/controllers_multi_link.xml" respawn="false" output="screen" /> <!-- load default arm controller -->
   <!--node pkg="robot_mechanism_controllers" type="control.py" args="set test_controller 0.5" respawn="false" output="screen" /--> <!-- open gripper .5 radians -->
 </launch>
 

Modified: pkg/trunk/demos/examples_gazebo/single_link.xml
===================================================================
--- pkg/trunk/demos/examples_gazebo/single_link.xml	2008-12-12 18:43:52 UTC (rev 8016)
+++ pkg/trunk/demos/examples_gazebo/single_link.xml	2008-12-12 18:46:09 UTC (rev 8017)
@@ -1,7 +1,7 @@
 <launch>
   <group name="wg">
     <!-- send single_link.xml to param server -->
-    <include file="$(find wg_robot_description)/single_link_test/send_description.launch" />
+    <param name="robotdesc/pr2" command="$(find xacro)/xacro.py '$(find examples_gazebo)/single_link_defs/single_link.xml'" />
 
     <!-- start gazebo -->
     <node pkg="gazebo" type="gazebo" args="$(find gazebo_robot_description)/gazebo_worlds/empty.world" respawn="false" output="screen">
@@ -14,7 +14,7 @@
   <!-- push robotdesc/pr2 to factory and spawn robot in gazebo -->
   <node pkg="gazebo_plugin" type="urdf2factory" args="robotdesc/pr2" respawn="false" output="screen" /> <!-- load default arm controller -->
 
-  <node pkg="mechanism_control" type="mech.py" args="sp $(find wg_robot_description)/single_link_test/controllers_single_link.xml" respawn="false" output="screen" /> <!-- load default arm controller -->
+  <node pkg="mechanism_control" type="mech.py" args="sp $(find examples_gazebo)/single_link_defs/controllers_single_link.xml" respawn="false" output="screen" /> <!-- load default arm controller -->
   <node pkg="robot_mechanism_controllers" type="control.py" args="set test_controller 0.5" respawn="false" output="screen" /> <!-- open gripper .5 radians -->
 </launch>
 


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