detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-18 15:57:13 +02:00
Code Issues Actions Packages Releases Activity

eiger server bug fix: interrupt subframe wrong bit mapped, virtual compilation

Browse Source
This commit is contained in:
maliakal_d
2019-08-06 17:22:54 +02:00
parent c5f2275703
commit ddfbea76be
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h
View File

@ -26,7 +26,7 @@
#define DAQ_REG_HRDWRE_OW_MSK (0x00000001 << DAQ_REG_HRDWRE_OW_OFST) #define DAQ_REG_HRDWRE_OW_MSK (0x00000001 << DAQ_REG_HRDWRE_OW_OFST)
#define DAQ_REG_HRDWRE_TOP_OFST (1) #define DAQ_REG_HRDWRE_TOP_OFST (1)
#define DAQ_REG_HRDWRE_TOP_MSK (0x00000001 << DAQ_REG_HRDWRE_TOP_OFST) #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_HRDWRE_INTRRPT_SF_MSK (0x00000001 << DAQ_REG_HRDWRE_INTRRPT_SF_OFST)
#define DAQ_REG_RO_OFFSET 20 #define DAQ_REG_RO_OFFSET 20

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.2 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.3
View File

Binary file not shown.

8
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 8c491f18fdc76505082df44f55c97794f59fe1a7 Repsitory UUID: c5f22757037a3aab60f5d91514d10d59440a29f6
Revision: 357 Revision: 358
Branch: 4.1.0-rc Branch: 4.1.0-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4125 Last Changed Rev: 4126
Last Changed Date: 2019-07-31 15:14:52.000000001 +0200 ./xparameters.h Last Changed Date: 2019-08-06 17:19:23.000000001 +0200 ./FebRegisterDefs.h

6
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "8c491f18fdc76505082df44f55c97794f59fe1a7" #define GITREPUUID "c5f22757037a3aab60f5d91514d10d59440a29f6"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4125 #define GITREV 0x4126
#define GITDATE 0x20190731 #define GITDATE 0x20190806
#define GITBRANCH "4.1.0-rc" #define GITBRANCH "4.1.0-rc"

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1255,8 +1255,8 @@ int setInterruptSubframe(int value) {
if(!Feb_Control_SetInterruptSubframe(value)) { if(!Feb_Control_SetInterruptSubframe(value)) {
return FAIL; return FAIL;
} }
return OK;
#endif #endif
return OK;
} }
int getInterruptSubframe() { int getInterruptSubframe() {