diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 954b478a1..6cbb68b6c 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index 6db843d23..f5dc3a835 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 3b6ead77836f2b6d2a795a9a994259d1dc8c131d -Revision: 159 +Repsitory UUID: 830f92dedcd3dd1b4ba259139d709d9a37aadbf1 +Revision: 160 Branch: developer Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3943 -Last Changed Date: 2018-07-17 16:15:43.000000002 +0200 ./RegisterDefs.h +Last Changed Rev: 3982 +Last Changed Date: 2018-08-16 12:21:37.000000002 +0200 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index baa181354..b89db54f1 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "3b6ead77836f2b6d2a795a9a994259d1dc8c131d" +#define GITREPUUID "830f92dedcd3dd1b4ba259139d709d9a37aadbf1" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3943 -#define GITDATE 0x20180717 +#define GITREV 0x3982 +#define GITDATE 0x20180816 #define GITBRANCH "developer" diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index b688e9085..82a296847 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -113,7 +113,7 @@ int decode_function(int file_des) { #ifdef JUNGFRAUD if ((debugflag == PROGRAMMING_MODE) && ((fnum != F_PROGRAM_FPGA) && (fnum != F_GET_DETECTOR_TYPE) && - (fnum != F_RESET_FPGA) && (fnum != F_UPDATE_CLIENT))) { + (fnum != F_RESET_FPGA) && (fnum != F_UPDATE_CLIENT) && (fnum != F_CHECK_VERSION))) { sprintf(mess,"This Function %s cannot be executed. ", getFunctionName((enum detFuncs)fnum)); ret=(M_nofuncMode)(file_des); } else