[Jderobot-admin] jderobot-r1119 - in trunk/src/stable/components: cameraview introrob

[bmenendez en jderobot.org]

Author: bmenendez
Date: 2013-11-29 12:31:15 +0100 (Fri, 29 Nov 2013)
New Revision: 1119

Added:
   trunk/src/stable/components/cameraview/pioneer_left_cam.cfg
Modified:
   trunk/src/stable/components/introrob/introrob.cfg
   trunk/src/stable/components/introrob/robot1introrob.cfg
   trunk/src/stable/components/introrob/robot2introrob.cfg
Log:
#133 Changed .cfg files of introrob and cameraview.


Added: trunk/src/stable/components/cameraview/pioneer_left_cam.cfg
===================================================================
--- trunk/src/stable/components/cameraview/pioneer_left_cam.cfg	                        (rev 0)
+++ trunk/src/stable/components/cameraview/pioneer_left_cam.cfg	2013-11-29 11:31:15 UTC (rev 1119)
@@ -0,0 +1 @@
+Cameraview.Camera.Proxy=cam_sensor_left:tcp -h localhost -p 9995

Modified: trunk/src/stable/components/introrob/introrob.cfg
===================================================================
--- trunk/src/stable/components/introrob/introrob.cfg	2013-11-29 10:53:52 UTC (rev 1118)
+++ trunk/src/stable/components/introrob/introrob.cfg	2013-11-29 11:31:15 UTC (rev 1119)
@@ -1,9 +1,9 @@
 introrob.Motors.Proxy=Motors:tcp -h localhost -p 9999
-introrob.Camera1.Proxy=cam_sensor_left:tcp -h localhost -p 9991
-introrob.Camera2.Proxy=cam_sensor_right:tcp -h localhost -p 9992
+introrob.Camera1.Proxy=cam_sensor_left:tcp -h localhost -p 9995
+introrob.Camera2.Proxy=cam_sensor_right:tcp -h localhost -p 9994
 introrob.Encoders.Proxy=Encoders:tcp -h localhost -p 9997
-introrob.Laser.Proxy=Laser:tcp -h localhost -p 9998
-introrob.Pose3Dencoders2.Proxy=Pose3DEncodersRight:tcp -h localhost -p 9995
-introrob.Pose3Dencoders1.Proxy=Pose3DEncodersLeft:tcp -h localhost -p 9996
-introrob.Pose3Dmotors2.Proxy=Pose3DMotorsRight:tcp -h localhost -p 9993
-introrob.Pose3Dmotors1.Proxy=Pose3DMotorsLeft:tcp -h localhost -p 9994
+introrob.Laser.Proxy=Laser:tcp -h localhost -p 9996
+introrob.Pose3Dencoders2.Proxy=Pose3DEncoders2:tcp -h localhost -p 9992
+introrob.Pose3Dencoders1.Proxy=Pose3DEncoders1:tcp -h localhost -p 9993
+introrob.Pose3Dmotors2.Proxy=Pose3DMotors2:tcp -h localhost -p 9990
+introrob.Pose3Dmotors1.Proxy=Pose3DMotors1:tcp -h localhost -p 9991

Modified: trunk/src/stable/components/introrob/robot1introrob.cfg
===================================================================
--- trunk/src/stable/components/introrob/robot1introrob.cfg	2013-11-29 10:53:52 UTC (rev 1118)
+++ trunk/src/stable/components/introrob/robot1introrob.cfg	2013-11-29 11:31:15 UTC (rev 1119)
@@ -1,13 +1,9 @@
-introrob.Motors.Proxy=motors1:tcp -h 192.168.0.12 -p 9999
-introrob.Camera1.Proxy=cameraA:tcp -h 192.168.0.12 -p 9999
-introrob.Camera2.Proxy=cameraB:tcp -h 192.168.0.12 -p 9999
-introrob.Encoders.Proxy=encoders1:tcp -h 192.168.0.12 -p 9999
-introrob.Laser.Proxy=laser1:tcp -h 192.168.0.12 -p 9999
-introrob.PTEncoders1.Proxy=ptencoders1:tcp -h 192.168.0.12 -p 9999
-introrob.PTEncoders2.Proxy=ptencoders2:tcp -h 192.168.0.12 -p 9999
-introrob.PTMotors1.Proxy=ptmotors1:tcp -h 192.168.0.12 -p 9999
-introrob.PTMotors2.Proxy=ptmotors2:tcp -h 192.168.0.12 -p 9999
-introrob.Pose3Dencoders2.Proxy=pose3dencoders2:tcp -h 192.168.0.12 -p 9999
-introrob.Pose3Dencoders1.Proxy=pose3dencoders1:tcp -h 192.168.0.12 -p 9999
-introrob.Pose3Dmotors2.Proxy=pose3dmotors2:tcp -h 192.168.0.12 -p 9999
-introrob.Pose3Dmotors1.Proxy=pose3dmotors1:tcp -h 192.168.0.12 -p 9999
+introrob.Motors.Proxy=Motors:tcp -h localhost -p 9999
+introrob.Camera1.Proxy=cam_sensor_left:tcp -h localhost -p 9995
+introrob.Camera2.Proxy=cam_sensor_right:tcp -h localhost -p 9994
+introrob.Encoders.Proxy=Encoders:tcp -h localhost -p 9997
+introrob.Laser.Proxy=Laser:tcp -h localhost -p 9996
+introrob.Pose3Dencoders2.Proxy=Pose3DEncoders2:tcp -h localhost -p 9992
+introrob.Pose3Dencoders1.Proxy=Pose3DEncoders1:tcp -h localhost -p 9993
+introrob.Pose3Dmotors2.Proxy=Pose3DMotors2:tcp -h localhost -p 9990
+introrob.Pose3Dmotors1.Proxy=Pose3DMotors1:tcp -h localhost -p 9991

Modified: trunk/src/stable/components/introrob/robot2introrob.cfg
===================================================================
--- trunk/src/stable/components/introrob/robot2introrob.cfg	2013-11-29 10:53:52 UTC (rev 1118)
+++ trunk/src/stable/components/introrob/robot2introrob.cfg	2013-11-29 11:31:15 UTC (rev 1119)
@@ -1,13 +1,9 @@
-introrob.Motors.Proxy=motors1:tcp -h 192.168.0.12 -p 9997
-introrob.Camera1.Proxy=cameraC:tcp -h 192.168.0.12 -p 9997
-introrob.Camera2.Proxy=cameraD:tcp -h 192.168.0.12 -p 9997
-introrob.Encoders.Proxy=encoders1:tcp -h 192.168.0.12 -p 9997
-introrob.Laser.Proxy=laser1:tcp -h 192.168.0.12 -p 9997
-introrob.PTEncoders1.Proxy=ptencoders1:tcp -h 192.168.0.12 -p 9997
-introrob.PTEncoders2.Proxy=ptencoders2:tcp -h 192.168.0.12 -p 9997
-introrob.PTMotors1.Proxy=ptmotors1:tcp -h 192.168.0.12 -p 9997
-introrob.PTMotors2.Proxy=ptmotors2:tcp -h 192.168.0.12 -p 9997
-introrob.Pose3Dencoders2.Proxy=pose3dencoders2:tcp -h 192.168.0.12 -p 9997
-introrob.Pose3Dencoders1.Proxy=pose3dencoders1:tcp -h 192.168.0.12 -p 9997
-introrob.Pose3Dmotors2.Proxy=pose3dmotors2:tcp -h 192.168.0.12 -p 9997
-introrob.Pose3Dmotors1.Proxy=pose3dmotors1:tcp -h 192.168.0.12 -p 9997
+introrob.Motors.Proxy=Motors:tcp -h localhost -p 8999
+introrob.Camera1.Proxy=cam_sensor_left:tcp -h localhost -p 8995
+introrob.Camera2.Proxy=cam_sensor_right:tcp -h localhost -p 8994
+introrob.Encoders.Proxy=Encoders:tcp -h localhost -p 8997
+introrob.Laser.Proxy=Laser:tcp -h localhost -p 8998
+introrob.Pose3Dencoders2.Proxy=Pose3DEncoders2:tcp -h localhost -p 8992
+introrob.Pose3Dencoders1.Proxy=Pose3DEncoders1:tcp -h localhost -p 8993
+introrob.Pose3Dmotors2.Proxy=Pose3DMotors2:tcp -h localhost -p 8990
+introrob.Pose3Dmotors1.Proxy=Pose3DMotors1:tcp -h localhost -p 8991