diff --git a/config/devices.properties b/config/devices.properties index 2d8159e..7e4d5eb 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -57,3 +57,4 @@ keithley_3a=ch.psi.pshell.epics.ChannelDouble|X11MA-ES1:CADC3|Read||true otf_start=ch.psi.pshell.epics.ChannelInteger|X11MA-OTF:GO|||true eiger=ch.psi.pshell.epics.AreaDetector|X11MA-ES1-SD1|||true image=ch.psi.pshell.imaging.CameraSource|eiger|||true +axis=ch.psi.pshell.imaging.MjpegSource|http://axis-x11ma.psi.ch/axis-cgi/mjpg/video.cgi?id=176 true||-200|false diff --git a/config/settings.properties b/config/settings.properties index 33d112a..d418652 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,4 +1,4 @@ -#Wed Nov 11 15:27:05 CET 2020 +#Wed Nov 11 15:44:02 CET 2020 HARMONIC_ID_1=1 RSYNC_USER=e18650 ENERGY=850.0 diff --git a/devices/axis.properties b/devices/axis.properties new file mode 100644 index 0000000..098f00c --- /dev/null +++ b/devices/axis.properties @@ -0,0 +1,20 @@ +#Wed Nov 11 15:51:29 CET 2020 +spatialCalOffsetY=NaN +invert=false +spatialCalOffsetX=NaN +rotation=0.0 +rotationCrop=false +scale=1.0 +rescaleFactor=1.0 +grayscale=false +spatialCalUnits=mm +flipVertically=false +roiHeight=-1 +spatialCalScaleX=NaN +spatialCalScaleY=NaN +flipHorizontally=false +roiY=0 +roiX=0 +rescaleOffset=0.0 +transpose=false +roiWidth=-1