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

one more conflict resolved from mergin with 3.0.1 (silent mode, this had changes for zmq source ip)

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-03 15:01:30 +02:00
parent 03a2f979a9
commit 34f10b382e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -262,16 +262,15 @@ public:
if(slsErrorMask&RECEIVER_FILE_FORMAT) if(slsErrorMask&RECEIVER_FILE_FORMAT)
retval.append("Could not set receiver file format\n"); retval.append("Could not set receiver file format\n");
<<<<<<< HEAD
if(slsErrorMask&RECEIVER_TIMER_NOT_SET) if(slsErrorMask&RECEIVER_TIMER_NOT_SET)
retval.append("Could not set timer in receiver.\n"); retval.append("Could not set timer in receiver.\n");
=======
if(slsErrorMask&RECEIVER_SUBF_TIME_NOT_SET) if(slsErrorMask&RECEIVER_SUBF_TIME_NOT_SET)
retval.append("Could not set sub exposure time in receiver.\n"); retval.append("Could not set sub exposure time in receiver.\n");
if(slsErrorMask&RECEIVER_SILENT_MODE_NOT_SET) if(slsErrorMask&RECEIVER_SILENT_MODE_NOT_SET)
retval.append("Could not set silent mode in receiver.\n"); retval.append("Could not set silent mode in receiver.\n");
>>>>>>> 3.0.1
//------------------------------------------------------ length of message //------------------------------------------------------ length of message