diff --git a/config/devices.properties b/config/devices.properties index 716d166..39b9577 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -14,4 +14,4 @@ gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSY #rf_phase_rb=ch.psi.pshell.epics.ChannelDouble|MINSB03-RSYS:GET-VSUM-PHASE|Read||true #rf_ampl_rb=ch.psi.pshell.epics.ChannelDouble|MINSB03-RSYS:GET-VSUM-AMPLT|Read||true image=ch.psi.pshell.imaging.FileSource|/afs/psi.ch/intranet/SF/Applications/config/pshell_op/context/beam.jpg||| -cam=ch.psi.pshell.epics.ArraySource|SINEG01-DSCR190:FPICTURE Int8 1000000||| +cam=ch.psi.pshell.epics.ArraySource|SINEG01-DSCR190:FPICTURE Int16 1000000||| diff --git a/config/jcae.properties b/config/jcae.properties index 4220be4..c9a440f 100755 --- a/config/jcae.properties +++ b/config/jcae.properties @@ -1,8 +1,8 @@ -#Fri Aug 19 15:44:15 CEST 2016 +#Tue Aug 23 11:43:58 CEST 2016 ch.psi.jcae.ContextFactory.addressList=129.129.130.255 129.129.131.255 129.129.137.255 ch.psi.jcae.ContextFactory.maxArrayBytes=10000000 ch.psi.jcae.ChannelFactory.retries=2 -ch.psi.jcae.ChannelFactory.timeout=500 +ch.psi.jcae.ChannelFactory.timeout=10000 ch.psi.jcae.impl.DefaultChannelService.retries=4 ch.psi.jcae.impl.DefaultChannelService.timeout=1000 ch.psi.jcae.ContextFactory.serverPort=