detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 04:47:14 +02:00
Code Issues Actions Packages Releases Activity

merge conflict from 3.0.1 to restream stop from recieveR

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-30 19:05:35 +01:00
parent 1edb41242c ca855e6d39
commit 5b88203bd9
8 changed files with 468 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -83,7 +83,7 @@ using namespace std;
#define RECEIVER_SILENT_MODE_NOT_SET 0x0000000100000000ULL
#define RECEIVER_TIMER_NOT_SET 0x0000000200000000ULL
#define RECEIVER_ENABLE_GAPPIXELS_NOT_SET 0x0000000400000000ULL
#define RESTREAM_STOP_FROM_RECEIVER 0x0000000800000000ULL
// 0x0000000FFFFFFFFFULL
/** @short class returning all error messages for error mask */
@ -271,6 +271,11 @@ public:
if(slsErrorMask&RECEIVER_ENABLE_GAPPIXELS_NOT_SET)
retval.append("Could not enable/disable gap pixels in receiver.\n");
if(slsErrorMask&RESTREAM_STOP_FROM_RECEIVER)
retval.append("Could not restream stop from receiver.\n");
//------------------------------------------------------ length of message