[Jderobot-admin] jderobot-r1214 - in trunk/src/stable/components/openniServer: . config sv sv2

[rocapal en jderobot.org]

Author: rocapal
Date: 2014-03-25 16:23:03 +0100 (Tue, 25 Mar 2014)
New Revision: 1214

Added:
   trunk/src/stable/components/openniServer/config/1openniServer.cfg
   trunk/src/stable/components/openniServer/config/2openniServer.cfg
Removed:
   trunk/src/stable/components/openniServer/openniServer2.cfg
Modified:
   trunk/src/stable/components/openniServer/openniServer.cfg
   trunk/src/stable/components/openniServer/sv/run
   trunk/src/stable/components/openniServer/sv2/run
Log:
#132 refactored config files and supervise


Added: trunk/src/stable/components/openniServer/config/1openniServer.cfg
===================================================================
--- trunk/src/stable/components/openniServer/config/1openniServer.cfg	                        (rev 0)
+++ trunk/src/stable/components/openniServer/config/1openniServer.cfg	2014-03-25 15:23:03 UTC (rev 1214)
@@ -0,0 +1,54 @@
+# Levels: 0(DEBUG), 1(INFO), 2(WARNING), 3(ERROR)
+
+openniServer.Log.File.Name=./log/openniServer.txt
+openniServer.Log.File.Level=0
+openniServer.Log.Screen.Level=0
+
+#without registry
+openniServer.Endpoints=default -h 0.0.0.0 -p 9999
+#with registry
+#cameras configuration
+openniServer.NCameras=1
+openniServer.PlayerDetection=1
+openniServer.Mode=0
+openniServer.ImageRegistration=1
+
+NamingService.Enabled=1
+NamingService.Proxy=NamingServiceJdeRobot:default -h 0.0.0.0 -p 10000
+
+#mode=0 -> fps: 30x: 320y 240
+#mode=2 -> fps: 60x: 320y 240
+#mode=4 -> fps: 30x: 640y 480
+#mode=6 -> fps: 25x: 320y 240
+#mode=8 -> fps: 25x: 640y 480
+
+#camera 1
+openniServer.deviceId=0
+openniServer.CameraRGB.Name=cameraA
+openniServer.CameraRGB.Format=RGB8
+openniServer.CameraRGB.fps=15
+openniServer.CameraRGB.PlayerDetection=0
+openniServer.CameraRGB.Mirror=0
+
+openniServer.CameraDEPTH.Name=cameraB
+openniServer.CameraDEPTH.Format=DEPTH8_16
+openniServer.CameraDEPTH.fps=15
+openniServer.CameraDEPTH.PlayerDetection=0
+openniServer.CameraDEPTH.Mirror=0
+
+
+
+openniServer.PointCloud.Name=pointcloud1
+
+
+
+#Other components
+openniServer.CameraRGB=1
+openniServer.CameraIR=0
+openniServer.CameraDEPTH=1
+openniServer.pointCloudActive=0
+openniServer.pointCloud.Fps=10
+openniServer.Pose3DMotorsActive=0
+openniServer.KinectLedsActive=0
+openniServer.ExtraCalibration=0
+

Added: trunk/src/stable/components/openniServer/config/2openniServer.cfg
===================================================================
--- trunk/src/stable/components/openniServer/config/2openniServer.cfg	                        (rev 0)
+++ trunk/src/stable/components/openniServer/config/2openniServer.cfg	2014-03-25 15:23:03 UTC (rev 1214)
@@ -0,0 +1,58 @@
+# Levels: 0(DEBUG), 1(INFO), 2(WARNING), 3(ERROR)
+
+openniServer.Log.File.Name=./log/openniServer.txt
+openniServer.Log.File.Level=0
+openniServer.Log.Screen.Level=0
+
+#without registry
+openniServer.Endpoints=default -h 0.0.0.0 -p 9998
+#with registry
+#cameras configuration
+openniServer.PlayerDetection=0
+openniServer.Mode=0
+openniServer.ImageRegistration=1
+openniServer.Hz=20
+
+
+NamingService.Enabled=1
+NamingService.Proxy=NamingServiceJdeRobot:default -h 0.0.0.0 -p 10000
+
+#mode=0 -> fps: 30x: 320y 240
+#mode=2 -> fps: 60x: 320y 240
+#mode=4 -> fps: 30x: 640y 480
+#mode=6 -> fps: 25x: 320y 240
+#mode=8 -> fps: 25x: 640y 480
+
+#camera 1
+openniServer.deviceId=0
+openniServer.CameraRGB.Name=cameraA-2
+openniServer.CameraRGB.Format=RGB8
+openniServer.CameraRGB.fps=10
+openniServer.CameraRGB.PlayerDetection=0
+openniServer.CameraRGB.Mirror=0
+
+openniServer.CameraDEPTH.Name=cameraB-2
+openniServer.CameraDEPTH.Format=DEPTH8_16
+openniServer.CameraDEPTH.fps=10
+openniServer.CameraDEPTH.PlayerDetection=0
+openniServer.CameraDEPTH.Mirror=0
+
+
+
+openniServer.PointCloud.Name=pointcloud2
+openniServer.pointCloud.Fps=15
+
+
+
+#Other components
+openniServer.CameraRGB=1
+openniServer.CameraIR=1
+openniServer.CameraDEPTH=1
+openniServer.pointCloudActive=0
+openniServer.Pose3DMotorsActive=0
+openniServer.KinectLedsActive=0
+openniServer.ExtraCalibration=0
+openniServer.Debug=1
+openniServer.Fps=20
+
+

Modified: trunk/src/stable/components/openniServer/openniServer.cfg
===================================================================
--- trunk/src/stable/components/openniServer/openniServer.cfg	2014-03-25 15:14:02 UTC (rev 1213)
+++ trunk/src/stable/components/openniServer/openniServer.cfg	2014-03-25 15:23:03 UTC (rev 1214)
@@ -8,7 +8,7 @@
 openniServer.Hz=20
 
 
-NamingService.Enabled=0
+NamingService.Enabled=1
 NamingService.Proxy=NamingServiceJdeRobot:default -h 0.0.0.0 -p 10000
 
 #mode=0 -> fps: 30x: 320y 240

Deleted: trunk/src/stable/components/openniServer/openniServer2.cfg
===================================================================
--- trunk/src/stable/components/openniServer/openniServer2.cfg	2014-03-25 15:14:02 UTC (rev 1213)
+++ trunk/src/stable/components/openniServer/openniServer2.cfg	2014-03-25 15:23:03 UTC (rev 1214)
@@ -1,60 +0,0 @@
-#without registry
-openniServer.Endpoints=default -h 0.0.0.0 -p 9998
-#with registry
-#cameras configuration
-openniServer.PlayerDetection=0
-openniServer.Mode=0
-openniServer.ImageRegistration=1
-openniServer.Hz=20
-
-
-NamingService.Enabled=0
-NamingService.Proxy=NamingServiceJdeRobot:default -h 0.0.0.0 -p 10000
-
-#mode=0 -> fps: 30x: 320y 240
-#mode=2 -> fps: 60x: 320y 240
-#mode=4 -> fps: 30x: 640y 480
-#mode=6 -> fps: 25x: 320y 240
-#mode=8 -> fps: 25x: 640y 480
-
-#camera 1
-openniServer.deviceId=1
-openniServer.CameraRGB.Name=cameraA-2
-openniServer.CameraRGB.Format=RGB8
-openniServer.CameraRGB.fps=10
-openniServer.CameraRGB.PlayerDetection=0
-openniServer.CameraRGB.Mirror=0
-
-
-#openniServer.calibration=camera-0.cfg
-openniServer.CameraDEPTH.Name=cameraB-2
-openniServer.CameraDEPTH.Format=DEPTH8_16
-openniServer.CameraDEPTH.fps=10
-openniServer.CameraDEPTH.PlayerDetection=0
-openniServer.CameraDEPTH.Mirror=0
-
-
-
-openniServer.PointCloud.Name=pointcloud2
-openniServer.pointCloud.Fps=15
-
-
-
-#Other components
-openniServer.CameraRGB=1
-openniServer.CameraIR=1
-openniServer.CameraDEPTH=1
-openniServer.pointCloudActive=0
-openniServer.Pose3DMotorsActive=0
-openniServer.KinectLedsActive=0
-openniServer.ExtraCalibration=0
-openniServer.Debug=1
-openniServer.Fps=20
-
-
-# Levels: 0(DEBUG), 1(INFO), 2(WARNING), 3(ERROR)
-
-openniServer.Log.File.Name=./log/openniServer.txt
-openniServer.Log.File.Level=0
-openniServer.Log.Screen.Level=0
-

Modified: trunk/src/stable/components/openniServer/sv/run
===================================================================
--- trunk/src/stable/components/openniServer/sv/run	2014-03-25 15:14:02 UTC (rev 1213)
+++ trunk/src/stable/components/openniServer/sv/run	2014-03-25 15:23:03 UTC (rev 1214)
@@ -7,5 +7,6 @@
 echo "Restarting openniServer ... " `date` >> ../log/system.log
 
 cd ..
-./openniServer --Ice.Config=openniServer.cfg
+./openniServer --Ice.Config=config/1openniServer.cfg
 
+sleep 5

Modified: trunk/src/stable/components/openniServer/sv2/run
===================================================================
--- trunk/src/stable/components/openniServer/sv2/run	2014-03-25 15:14:02 UTC (rev 1213)
+++ trunk/src/stable/components/openniServer/sv2/run	2014-03-25 15:23:03 UTC (rev 1214)
@@ -7,6 +7,6 @@
 echo "Restarting openniServer ... " `date` >> ../log/system.log
 
 cd ..
-./openniServer --Ice.Config=config/openniServer2.cfg
+./openniServer --Ice.Config=config/2openniServer.cfg
 
 sleep 5