2018-08-24 18:00:42 +02:00
parent 01d73ec7a7
commit 1af729d724
7 changed files with 14 additions and 14 deletions
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,7 +1,7 @@
 img=ch.psi.pshell.prosilica.Prosilica|25001 "PacketSize=1522;PixelFormat=Mono8;BinningX=1;BinningY=1;RegionX=300;RegionY=200;Width=1000;Height=1000;MulticastEnable=Off"|||false
-gripper_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8e9cc87b.psi.ch/axis-cgi/mjpg/video.cgi?camera=1||-1|
-monitoring_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8e9cc87b.psi.ch/axis-cgi/mjpg/video.cgi?camera=2||-1|
-top_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8e9cc87b.psi.ch/axis-cgi/mjpg/video.cgi?camera=3||-1|
+gripper_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8e9cc87b.psi.ch/axis-cgi/mjpg/video.cgi?camera=1 reopen||-200|
+monitoring_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8e9cc87b.psi.ch/axis-cgi/mjpg/video.cgi?camera=2 reopen||-200|
+top_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8e9cc87b.psi.ch/axis-cgi/mjpg/video.cgi?camera=3 true||-200|
 #cam=ch.psi.pshell.epics.AreaDetector|MX-SAMCAM|||
 microscan=ch.psi.pshell.serial.TcpDevice|MicroHAWK38C528:2001|||
 microscan_cmd=ch.psi.pshell.serial.TcpDevice|MicroHAWK38C528:2003|||
--- a/devices/led_ctrl_1.properties
+++ b/devices/led_ctrl_1.properties
@@ -1,5 +1,5 @@
-#Tue Aug 21 18:52:35 CEST 2018
-maxValue=0.4
+#Fri Aug 24 10:56:15 CEST 2018
+maxValue=1.0
 minValue=0.0
 offset=0.0
 precision=2
--- a/devices/led_ctrl_2.properties
+++ b/devices/led_ctrl_2.properties
@@ -1,5 +1,5 @@
-#Tue Aug 21 18:52:35 CEST 2018
-maxValue=0.4
+#Fri Aug 24 10:56:15 CEST 2018
+maxValue=1.0
 minValue=0.0
 offset=0.0
 precision=2
--- a/devices/led_ctrl_3.properties
+++ b/devices/led_ctrl_3.properties
@@ -1,5 +1,5 @@
-#Tue Aug 21 18:52:35 CEST 2018
-maxValue=0.4
+#Fri Aug 24 10:56:15 CEST 2018
+maxValue=1.0
 minValue=0.0
 offset=0.0
 precision=2
--- a/devices/robot_j6.properties
+++ b/devices/robot_j6.properties
@@ -1,6 +1,6 @@
-#Tue Jun 19 16:41:28 CEST 2018
-maxValue=270.0
-minValue=-270.0
+#Fri Aug 24 14:56:42 CEST 2018
+maxValue=400.0
+minValue=-400.0
 offset=0.0
 precision=2
 resolution=0.1
--- a/devices/smart_magnet.properties
+++ b/devices/smart_magnet.properties
@@ -1,5 +1,5 @@
-#Wed Jun 27 10:45:31 CEST 2018
-holdingCurrent=25.0
+#Fri Aug 24 14:18:31 CEST 2018
+holdingCurrent=30.0
 mountCurrent=35.0
 remanenceCurrent=-10.0
 restingCurrent=10.0
--- a/plugins/MXSC-1.10.0.jar
+++ b/plugins/MXSC-1.10.0.jar