diff --git a/config/devices.properties b/config/devices.properties index 68ccf95..9241a96 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,3 +1,4 @@ +img=ch.psi.pshell.prosilica.Prosilica|25001|||true #robot=RobotTcp|127.0.0.1:1000||| #onewire=ch.psi.pshell.serial.TcpDevice|129.129.126.83:5000||| puck_detection=ch.psi.mxsc.PuckDetection|raspberrypi:5556||| @@ -19,5 +20,5 @@ relays=ch.psi.pshell.modbus.DigitalOutputArray|dewar 0 16||1000| relay1=ch.psi.pshell.modbus.DigitalOutput|dewar 0||1000| relay2=ch.psi.pshell.modbus.DigitalOutput|dewar 1||1000| $temperature=ch.psi.pshell.modbus.AnalogInput|dewar 0||| -cam=ch.psi.pshell.epics.AreaDetector|MX-SAMCAM||| -img=ch.psi.pshell.imaging.CameraSource|cam||-100| +#cam=ch.psi.pshell.epics.AreaDetector|MX-SAMCAM||| +#img_back=ch.psi.pshell.imaging.CameraSource|cam||-100| diff --git a/robot/MXLAB/Controller1/usr/configs/controller.cfx b/robot/MXLAB/Controller1/usr/configs/controller.cfx index ad58e43..d8198c8 100644 --- a/robot/MXLAB/Controller1/usr/configs/controller.cfx +++ b/robot/MXLAB/Controller1/usr/configs/controller.cfx @@ -1,4 +1,4 @@ - + @@ -17,9 +17,9 @@ - - - + + + @@ -33,5 +33,5 @@ - + \ No newline at end of file