diff --git a/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h b/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h index f26642454..7051ff135 100644 --- a/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h +++ b/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h @@ -26,7 +26,7 @@ #define DAQ_REG_HRDWRE_OW_MSK (0x00000001 << DAQ_REG_HRDWRE_OW_OFST) #define DAQ_REG_HRDWRE_TOP_OFST (1) #define DAQ_REG_HRDWRE_TOP_MSK (0x00000001 << DAQ_REG_HRDWRE_TOP_OFST) -#define DAQ_REG_HRDWRE_INTRRPT_SF_OFST (3) +#define DAQ_REG_HRDWRE_INTRRPT_SF_OFST (2) #define DAQ_REG_HRDWRE_INTRRPT_SF_MSK (0x00000001 << DAQ_REG_HRDWRE_INTRRPT_SF_OFST) #define DAQ_REG_RO_OFFSET 20 diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster index 8530be551..ee9f33b24 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave index 18d5d623a..f363ee778 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.2 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.3 similarity index 99% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.2 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.3 index 64b5fa836..812edf098 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.2 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.3 differ diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index ad18580b7..5b10dceaa 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 8c491f18fdc76505082df44f55c97794f59fe1a7 -Revision: 357 +Repsitory UUID: c5f22757037a3aab60f5d91514d10d59440a29f6 +Revision: 358 Branch: 4.1.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4125 -Last Changed Date: 2019-07-31 15:14:52.000000001 +0200 ./xparameters.h +Last Changed Rev: 4126 +Last Changed Date: 2019-08-06 17:19:23.000000001 +0200 ./FebRegisterDefs.h diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 4f14a9ce3..9008526fa 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "8c491f18fdc76505082df44f55c97794f59fe1a7" +#define GITREPUUID "c5f22757037a3aab60f5d91514d10d59440a29f6" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4125 -#define GITDATE 0x20190731 +#define GITREV 0x4126 +#define GITDATE 0x20190806 #define GITBRANCH "4.1.0-rc" diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index d95e846d1..758a80a6f 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -1255,8 +1255,8 @@ int setInterruptSubframe(int value) { if(!Feb_Control_SetInterruptSubframe(value)) { return FAIL; } - return OK; #endif + return OK; } int getInterruptSubframe() {