From 94c34138a8a8ce72985ddc4aeebb1496958a440a Mon Sep 17 00:00:00 2001 From: Ezequiel Panepucci Date: Wed, 14 Jun 2023 07:53:48 +0200 Subject: [PATCH] epics/jcae changes in gateway, eh_door_lock - added channel access gateways to access epics channels outside beamline network - modifed eh_door_lock device so it always returns the value regardless of alarm status --- config/devices.properties | 2 +- config/jcae.properties | 9 +++++---- config/settings.properties | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index d20f580..b1cec68 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,5 +1,5 @@ +eh_door_lock=ch.psi.pshell.epics.ChannelString|X06SA-EH1-LAC:02_05 true None|Read|| cryopos=ch.psi.pshell.epics.Motor|X06SA-ES-CJ:TRY1|||true -eh_door_lock=ch.psi.pshell.epics.ChannelString|X06SA-EH1-LAC:02_05|Read||true img=ch.psi.pshell.prosilica.Prosilica|204464 "PacketSize=1504;PixelFormat=Mono8;BinningX=1;BinningY=1;RegionX=290;RegionY=130;Width=1000;Height=1000;MulticastEnable=Off"||-200|false 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| diff --git a/config/jcae.properties b/config/jcae.properties index 7f9e889..90656b0 100644 --- a/config/jcae.properties +++ b/config/jcae.properties @@ -1,11 +1,12 @@ -#Tue Sep 06 15:10:24 CEST 2016 -ch.psi.jcae.ContextFactory.addressList= +#Tue Jun 13 13:06:34 CEST 2023 +ch.psi.jcae.ContextFactory.addressList=129.129.109.255 sls-x06sa-cagw.psi.ch\:5832 sls-bl-cagw.psi.ch\:5820 ch.psi.jcae.ContextFactory.serverPort= ch.psi.jcae.ContextFactory.maxArrayBytes=20000000 ch.psi.jcae.ChannelFactory.retries=1 -ch.psi.jcae.ChannelFactory.timeout=500 +ch.psi.jcae.ChannelFactory.timeout=1000 ch.psi.jcae.impl.DefaultChannelService.retries=2 ch.psi.jcae.impl.DefaultChannelService.timeout=1000 ch.psi.jcae.ContextFactory.autoAddressList=true ch.psi.jcae.ContextFactory.useShellVariables=false -ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false +ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=true +ch.psi.jcae.ContextFactory.maxSendArrayBytes= diff --git a/config/settings.properties b/config/settings.properties index 01e0931..90e6136 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,11 +1,11 @@ -#Mon May 08 09:42:18 CEST 2023 +#Wed Jun 14 07:48:21 CEST 2023 dry_mount_counter=0 room_temperature_enabled=false pin_offset=-0.0 cryopos_in=5.0 puck_types=true imaging_enabled=false -dry_timestamp=1.683525406704E9 +dry_timestamp=1.686638562447E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false