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

added auto comp disable feature

Browse Source
This commit is contained in:
maliakal_d
2018-02-02 18:01:01 +01:00
parent c520f10409
commit 5d04067973
15 changed files with 200 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -50,9 +50,9 @@ using namespace std;
#define PREPARE_ACQUISITION 0x0000100000000000ULL
#define CLEANUP_ACQUISITION 0x0000080000000000ULL
#define REGISER_WRITE_READ 0x0000040000000000ULL
// 0xFFFFFFF000000000ULL
// 0xFFFFFF0000000000ULL
// 0x0000000FFFFFFFFFULL
// 0x000000FFFFFFFFFFULL
#define COULDNOT_SET_NETWORK_PARAMETER 0x0000000000000001ULL
#define COULDNOT_SET_ROI 0x0000000000000002ULL
#define RECEIVER_READ_FREQUENCY 0x0000000000000004ULL
@ -89,7 +89,8 @@ using namespace std;
#define RECEIVER_SILENT_MODE_NOT_SET 0x0000000200000000ULL
#define RESTREAM_STOP_FROM_RECEIVER 0x0000000400000000ULL
#define TEMPERATURE_CONTROL 0x0000000800000000ULL
// 0x0000000FFFFFFFFFULL
#define AUTO_COMP_DISABLE 0x0000001000000000ULL
// 0x000000FFFFFFFFFFULL
/** @short class returning all error messages for error mask */
class errorDefs {
@ -280,7 +281,8 @@ public:
if(slsErrorMask&TEMPERATURE_CONTROL)
retval.append("Could not set/get threshold temperature, temp control or temp event.\n");
if(slsErrorMask&AUTO_COMP_DISABLE)
retval.append("Could not set/get auto comparator disable\n");
//------------------------------------------------------ length of message

2
slsDetectorSoftware/commonFiles/sls_detector_funcs.h
View File

@ -116,6 +116,8 @@ enum detFuncs{
F_THRESHOLD_TEMP, /** < set threshold temperature */
F_TEMP_CONTROL, /** < set temperature control */
F_TEMP_EVENT, /** < set temperature event */
F_AUTO_COMP_DISABLE, /** < auto comp disable mode */
/* Always append functions hereafter!!! */
/* Always append functions before!!! */