detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 09:29:55 +01:00
Code Issues Actions Packages Releases Activity

merged with 2.1.1-rc inclding deactivate detectr and receiver

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-04 14:06:47 +02:00
parent f513fb06fb 0979d04693
commit a4bb3fe4dd
9 changed files with 226 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/commonFiles/error_defs.h
View File

@@ -62,6 +62,7 @@ using namespace std;
#define RATE_CORRECTION_NOT_32or16BIT 0x0000000000800000ULL
#define RATE_CORRECTION_NO_TAU_PROVIDED 0x0000000001000000ULL
#define PROGRAMMING_ERROR 0x0000000002000000ULL
#define RECEIVER_ACTIVATE 0x0000000004000000ULL
// 0x00000000FFFFFFFFULL
/** @short class returning all error messages for error mask */
@@ -202,7 +203,8 @@ public:
if(slsErrorMask&PROGRAMMING_ERROR)
retval.append("Could not program FPGA\n");
if(slsErrorMask&RECEIVER_ACTIVATE)
retval.append("Could not activate/deactivate receiver\n");
//------------------------------------------------------ length of message