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

[<bla...@us...>]

Revision: 23329
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23329&view=rev
Author:   blaisegassend
Date:     2009-08-29 02:13:07 +0000 (Sat, 29 Aug 2009)

Log Message:
-----------
Fixes related to the forearm camera name change

Modified Paths:
--------------
    pkg/trunk/stacks/pr2/pr2_alpha/pre.launch
    pkg/trunk/stacks/pr2/pr2_alpha/prf.launch
    pkg/trunk/stacks/pr2/pr2_alpha/prf_forearm_cam.launch
    pkg/trunk/stacks/pr2/pr2_alpha/prf_forearm_cam_config.launch
    pkg/trunk/stacks/pr2/pr2_alpha/prg.launch

Modified: pkg/trunk/stacks/pr2/pr2_alpha/pre.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/pre.launch	2009-08-29 02:03:51 UTC (rev 23328)
+++ pkg/trunk/stacks/pr2/pr2_alpha/pre.launch	2009-08-29 02:13:07 UTC (rev 23329)
@@ -63,7 +63,7 @@
   <node machine="realtime" pkg="imu_node" type="imu_node" name="imu_node" output="screen"/>
 
 <!-- Forearm Cameras -->
-  <node machine="two" name="wge100_camera_r" pkg="wge100_camera" type="forearm_node" respawn="false" output="screen">
+  <node machine="two" name="forearm_camera_r" pkg="wge100_camera" type="wge100_camera_node" respawn="false" output="screen">
     <param name="camera_url" type="str" value="name://forearm_r"/>
     <param name="video_mode" type="str" value="640x480x30" />
     <param name="auto_exposure" type="bool" value="True" />
@@ -77,7 +77,7 @@
     <param name="trig_phase" type="int" value="0" />
   </node>
   
-  <node machine="two" name="wge100_camera_l" pkg="wge100_camera" type="forearm_node" respawn="false" output="screen">
+  <node machine="two" name="forearm_camera_l" pkg="wge100_camera" type="wge100_camera_node" respawn="false" output="screen">
     <param name="camera_url" type="str" value="name://forearm_l"/>
     <param name="video_mode" type="str" value="640x480x30" />
     <param name="auto_exposure" type="bool" value="True" />

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prf.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prf.launch	2009-08-29 02:03:51 UTC (rev 23328)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prf.launch	2009-08-29 02:13:07 UTC (rev 23329)
@@ -95,8 +95,8 @@
   </group>
 
 <!-- Forearm Camera -->
-  <include file="$(find pr2_alpha)/prf_wge100_camera_config.launch"/>
-  <node machine="three" name="wge100_camera_r" pkg="wge100_camera" type="forearm_node" respawn="false" output="screen"/>
+  <include file="$(find pr2_alpha)/prf_forearm_cam_config.launch"/>
+  <node machine="three" name="forearm_camera_r" pkg="wge100_camera" type="wge100_camera_node" respawn="false" output="screen"/>
 
 <!-- Sound  -->
   <node pkg="sound_play" type="soundplay_node.py" machine="four" />

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prf_forearm_cam.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prf_forearm_cam.launch	2009-08-29 02:03:51 UTC (rev 23328)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prf_forearm_cam.launch	2009-08-29 02:13:07 UTC (rev 23329)
@@ -1,7 +1,7 @@
 <launch>
-  <include file="$(find pr2_alpha)/prf_wge100_camera_config.launch"/>
-  <node name="wge100_camera_r" pkg="wge100_camera" type="forearm_node" respawn="false" output="screen"/>
+  <include file="$(find pr2_alpha)/prf_forearm_cam_config.launch"/>
+  <node name="forearm_camera_r" pkg="wge100_camera" type="wge100_camera_node" respawn="false" output="screen"/>
   <node name="forearm_proc_r" pkg="stereo_image_proc" type="imageproc" respawn="false" output="screen">
-    <remap from="camera" to="wge100_camera_r"/>
+    <remap from="camera" to="forearm_camera_r"/>
   </node>
 </launch>

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prf_forearm_cam_config.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prf_forearm_cam_config.launch	2009-08-29 02:03:51 UTC (rev 23328)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prf_forearm_cam_config.launch	2009-08-29 02:13:07 UTC (rev 23329)
@@ -1,5 +1,5 @@
 <launch>
-  <group ns="wge100_camera_r">
+  <group ns="forearm_camera_r">
     <param name="camera_url" type="str" value="serial://3@10.68.0.68"/>
     <param name="video_mode" type="str" value="640x480x30"/>
     <param name="frame_id" type="str" value="r_wge100_camera_optical_frame"/>

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prg.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prg.launch	2009-08-29 02:03:51 UTC (rev 23328)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prg.launch	2009-08-29 02:13:07 UTC (rev 23329)
@@ -96,7 +96,7 @@
 
 
 <!-- Forearm Camera -->
-  <node machine="three" name="wge100_camera_r" pkg="wge100_camera" type="forearm_node" respawn="true" output="screen">
+  <node machine="three" name="forearm_camera_r" pkg="wge100_camera" type="wge100_camera_node" respawn="true" output="screen">
     <param name="camera_url" type="str" value="name://forearm_r"/>
     <param name="video_mode" type="str" value="640x480x30" />
     <param name="auto_exposure" type="bool" value="True" />


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