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

temp_threshold, temp_control, temp_event done

Browse Source
This commit is contained in:
Dhanya Maliakal
2018-01-11 15:37:24 +01:00
parent a87687199f
commit 2d6e4c95a2
15 changed files with 725 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -88,7 +88,7 @@ using namespace std;
#define RECEIVER_SUBF_TIME_NOT_SET 0x0000000100000000ULL
#define RECEIVER_SILENT_MODE_NOT_SET 0x0000000200000000ULL
#define RESTREAM_STOP_FROM_RECEIVER 0x0000000400000000ULL
#define TEMPERATURE_CONTROL 0x0000000800000000ULL
// 0x0000000FFFFFFFFFULL
/** @short class returning all error messages for error mask */
@ -277,7 +277,8 @@ public:
if(slsErrorMask&RESTREAM_STOP_FROM_RECEIVER)
retval.append("Could not restream stop from receiver.\n");
if(slsErrorMask&TEMPERATURE_CONTROL)
retval.append("Could not set/get threshold temperature, temp control or temp event.\n");

4
slsDetectorSoftware/commonFiles/sls_detector_funcs.h
View File

@ -112,6 +112,10 @@ enum detFuncs{
F_ACTIVATE, /** < activate */
F_PREPARE_ACQUISITION, /** < prepare acquisition */
F_CLEANUP_ACQUISITION, /** < clean up after acquisition */
F_THRESHOLD_TEMP, /** < set threshold temperature */
F_TEMP_CONTROL, /** < set temperature control */
F_TEMP_EVENT, /** < set temperature event */
/* Always append functions hereafter!!! */
/* Always append functions before!!! */