in between moench stuff

This commit is contained in:
Dhanya Maliakal
2017-11-20 14:23:32 +01:00
parent c5c23e73d5
commit 99037449f4
6 changed files with 24 additions and 17 deletions

View File

@ -4044,7 +4044,7 @@ void initializeDetector(){
setFrames(-1);
setTrains(-1);
setExposureTime(-1);
setPeriod(-1);
setPeriod(1 * 1000 * 1000);//1ms
setDelay(-1);
setGates(-1);

View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 2ed351b29db70212973e15b26f604a0a7fef6fcc
Revision: 14
Repsitory UUID: 9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7
Revision: 16
Branch: developer
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1582
Last Changed Date: 2017-09-21 16:35:15.000000002 +0200 ./firmware_funcs.c
Last Changed Rev: 1669
Last Changed Date: 2017-11-20 11:32:02.000000002 +0100 ./firmware_funcs.c

View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "2ed351b29db70212973e15b26f604a0a7fef6fcc"
//#define SVNREV 0x1582
#define SVNREPUUID "9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7"
//#define SVNREV 0x1669
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1582
#define SVNDATE 0x20170921
#define SVNREV 0x1669
#define SVNDATE 0x20171120
//