diff --git a/config/devices.properties b/config/devices.properties index 03445da..d64d606 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,13 +1,13 @@ #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 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| +gripper_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8ea5e463.psi.ch/axis-cgi/mjpg/video.cgi?camera=1 reopen||-200|false +#monitoring_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8ea5e463.psi.ch/axis-cgi/mjpg/video.cgi?camera=2 reopen||-200| +#top_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8ea5e463.psi.ch/axis-cgi/mjpg/video.cgi?camera=3 true||-200| #cam=ch.psi.pshell.epics.AreaDetector|MX-SAMCAM||| mscan_pin=ch.psi.pshell.serial.TcpDevice|mscan-tell6s-pin:2001||| mscan_pin_cmd=ch.psi.pshell.serial.TcpDevice|mscan-tell6s-pin:2003||| mscan_puck=ch.psi.pshell.serial.TcpDevice|mscan-tell6s-puck:2001||| mscan_puck_cmd=ch.psi.pshell.serial.TcpDevice|mscan-tell6s-puck:2003||| -$ue=LaserUE|COM4|||false +ue=LaserUE|COM4|||false puck_detection=ch.psi.mxsc.PuckDetection|tell6s-raspberrypi:5556||| wago=ch.psi.pshell.modbus.ModbusTCP|tell6s-wago:502||| led_ok_1=ch.psi.pshell.modbus.DigitalInput|wago 0||1000| diff --git a/plugins/MXSC-1.10.0.jar b/plugins/MXSC-1.10.0.jar index 1f92a4d..6fec05c 100644 Binary files a/plugins/MXSC-1.10.0.jar and b/plugins/MXSC-1.10.0.jar differ