|
From: <wa...@us...> - 2009-07-28 03:00:55
|
Revision: 19817
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19817&view=rev
Author: wattsk
Date: 2009-07-28 03:00:43 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
PS3 Joystick updates and fixes
Modified Paths:
--------------
pkg/trunk/stacks/pr2/pr2_alpha/pre.launch
pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch
Modified: pkg/trunk/stacks/pr2/pr2_alpha/pre.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/pre.launch 2009-07-28 02:59:51 UTC (rev 19816)
+++ pkg/trunk/stacks/pr2/pr2_alpha/pre.launch 2009-07-28 03:00:43 UTC (rev 19817)
@@ -5,10 +5,10 @@
<!-- PS3 joystick for A2 servers on PRE -->
-<!-- Watts Commenting out until joystick driver works all the way, and python dev selector is tested
- <node machine="two" pkg="joy" type="ps3_joy" name="joy" respawn="true" >
- <param name="deadzone" value="0.10" />
- <param name="dev" value="/dev/input/js1" />
+<!-- Watts Commenting out until joystick driver works all the way, and python dev selector is tested. Launch joy with joy/ps3.launch
+ <node machine="realtime" pkg="joy" type="ps3_joy" name="joy" respawn="true" >
+ <param name="deadzone" value="0.10" />
+ <param name="dev" value="/dev/input/js1" />
</node>
-->
Modified: pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch 2009-07-28 02:59:51 UTC (rev 19816)
+++ pkg/trunk/stacks/pr2/pr2_alpha/teleop_ps3.launch 2009-07-28 03:00:43 UTC (rev 19817)
@@ -26,8 +26,11 @@
<param name="max_vw_run" value="1.4" />
<param name="max_vx_run" value="1.0" />
<param name="max_vy_run" value="1.0" />
-<param name="tilt_step" value="0.1" />
-<param name="pan_step" value="0.1" />
+<param name="max_pan" value="2.7" />
+<param name="max_tilt" value="1.4" />
+<param name="min_tilt" value="-0.4" />
+<param name="tilt_step" value="0.015" />
+<param name="pan_step" value="0.02" />
<!-- Buttons have changed for PS3 controller mapping -->
<param name="run_button" value="7" type="int" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|