diff --git a/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c b/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c index 528515fa6..66843d3dc 100755 --- a/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c @@ -2309,8 +2309,6 @@ u_int32_t* decode_data(int *datain) int setDynamicRange(int dr) { if (dr%16==0 && dr>0) { dynamicRange=16; - nSamples=dr/16; - bus_w(NSAMPLES_REG,nSamples); } getDynamicRange(); allocateRAM(); diff --git a/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt b/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt index 71571fdc3..cab8f9b7e 100644 --- a/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt @@ -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: a45cc31a576153e251cfe904b3b459c7a2a9abdb -Revision: 9 +Repsitory UUID: 2ed351b29db70212973e15b26f604a0a7fef6fcc +Revision: 14 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1553 -Last Changed Date: 2017-09-07 11:20:19.000000002 +0200 ./server_funcs.c +Last Changed Rev: 1582 +Last Changed Date: 2017-09-21 16:35:15.000000002 +0200 ./firmware_funcs.c diff --git a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h index 004265b6b..f9d5ebc89 100644 --- a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h +++ b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "a45cc31a576153e251cfe904b3b459c7a2a9abdb" -//#define SVNREV 0x1553 +#define SVNREPUUID "2ed351b29db70212973e15b26f604a0a7fef6fcc" +//#define SVNREV 0x1582 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x1553 -#define SVNDATE 0x20170907 +#define SVNREV 0x1582 +#define SVNDATE 0x20170921 // diff --git a/slsDetectorSoftware/jctbDetectorServer/jungfrauDetectorServerTest b/slsDetectorSoftware/jctbDetectorServer/jungfrauDetectorServerTest index ea64c10b9..6ad6ee1be 100755 Binary files a/slsDetectorSoftware/jctbDetectorServer/jungfrauDetectorServerTest and b/slsDetectorSoftware/jctbDetectorServer/jungfrauDetectorServerTest differ