|
From: <jl...@us...> - 2009-09-03 00:51:12
|
Revision: 23733
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23733&view=rev
Author: jleibs
Date: 2009-09-03 00:51:03 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
Moving ps3 to /dev/sensors/ps3joy
Modified Paths:
--------------
pkg/trunk/stacks/pr2/pr2_alpha/pre.machine
pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch
Modified: pkg/trunk/stacks/pr2/pr2_alpha/pre.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/pre.machine 2009-09-03 00:49:05 UTC (rev 23732)
+++ pkg/trunk/stacks/pr2/pr2_alpha/pre.machine 2009-09-03 00:51:03 UTC (rev 23733)
@@ -2,6 +2,9 @@
<machine name="realtime_root" user="root" address="pre1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never">
<env name="PATH" value="$(env PATH):$(env ROS_ROOT)/bin" /> <!-- HACK. Depends on ROS bug #1586. Remove when closed -->
</machine>
+ <machine name="two_root" user="root" address="pre2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never">
+ <env name="PATH" value="$(env PATH):$(env ROS_ROOT)/bin" /> <!-- HACK. Depends on ROS bug #1586. Remove when closed -->
+ </machine>
<machine name="realtime" address="pre1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="true"/>
<machine name="two" address="pre2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
Modified: pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch 2009-09-03 00:49:05 UTC (rev 23732)
+++ pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch 2009-09-03 00:51:03 UTC (rev 23733)
@@ -2,13 +2,13 @@
<include file="$(find pr2_alpha)/pre.machine" />
<!-- Start up pairing thing -->
- <node machine="realtime_root" pkg="ps3joy" output="screen"
+ <node machine="two_root" pkg="ps3joy" output="screen"
type="ps3joy.py" name="ps3_connector" />
<!-- PS3 joy node -->
- <node machine="realtime" respawn="true" pkg="ps3joy"
+ <node machine="two" respawn="true" pkg="ps3joy"
type="ps3_joy_node" name="ps3_joy" >
- <param name="dev" type="string" value="/dev/input/js1" />
+ <param name="dev" type="string" value="/dev/sensors/ps3joy" />
<param name="deadzone" value="0.12" />
</node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|