From 34d405ff935302414a8bfbbfe20094bb028bc5ec Mon Sep 17 00:00:00 2001 From: Dworkowski Florian Date: Tue, 1 Dec 2015 15:54:04 +0100 Subject: [PATCH] Startup --- config/imaging.properties | 3 --- config/update.properties | 30 ------------------------------ 2 files changed, 33 deletions(-) delete mode 100644 config/imaging.properties delete mode 100644 config/update.properties diff --git a/config/imaging.properties b/config/imaging.properties deleted file mode 100644 index 3f872aa..0000000 --- a/config/imaging.properties +++ /dev/null @@ -1,3 +0,0 @@ -video=ch.psi.pshell.imaging.MjpegSource http://x10sa-videoserver-1/axis-cgi/mjpg/video.cgi -mic-low=ch.psi.pshell.imaging.MjpegSource http://x10sa-fw-1.psi.ch:8090/GH-13.mjpg -mic-high=ch.psi.pshell.imaging.MjpegSource http://x10sa-fw-1.psi.ch:8090/GH-12.mjpg diff --git a/config/update.properties b/config/update.properties deleted file mode 100644 index d0fb929..0000000 --- a/config/update.properties +++ /dev/null @@ -1,30 +0,0 @@ -diode=monitored -shutter=monitored -omega=monitored -x=monitored -cy=monitored -cz=monitored -apertureX=monitored -apertureY=monitored -beamstopX=monitored -beamstopY=monitored -beamstopZ=monitored -collimatorX=monitored -collimatorY=monitored -scintillatorY=monitored -scintillatorZ=monitored -detectorZ=monitored -detectorY=monitored -apertureTable= -beamstopTable= -collimatorTable= -collimator= -aperture= -scintillator= -slit1H=monitored -slit1V=monitored -slit2H=monitored -slit2V=monitored -lamp=monitored -backlight= -frontlight=