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 fix

Browse Source
This commit is contained in:
maliakal_d
2022-03-17 08:46:04 +01:00
parent 80d31bbb10 7bd4b9d9d9
commit ef1c52ddc1
46 changed files with 1531 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsSupportLib/include/sls/sls_detector_funcs.h
View File

@ -258,6 +258,9 @@ enum detFuncs {
F_UPDATE_DETECTOR_SERVER,
F_GET_UPDATE_MODE,
F_SET_UPDATE_MODE,
F_SET_MASTER,
F_GET_TOP,
F_SET_TOP,
NUM_DET_FUNCTIONS,
RECEIVER_ENUM_START = 256, /**< detector function should not exceed this
@ -619,6 +622,9 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
case F_UPDATE_DETECTOR_SERVER: return "F_UPDATE_DETECTOR_SERVER";
case F_GET_UPDATE_MODE: return "F_GET_UPDATE_MODE";
case F_SET_UPDATE_MODE: return "F_SET_UPDATE_MODE";
case F_SET_MASTER: return "F_SET_MASTER";
case F_GET_TOP: return "F_GET_TOP";
case F_SET_TOP: return "F_SET_TOP";
case NUM_DET_FUNCTIONS: return "NUM_DET_FUNCTIONS";
case RECEIVER_ENUM_START: return "RECEIVER_ENUM_START";

14
slsSupportLib/include/sls/versionAPI.h
View File

@ -5,11 +5,11 @@
#define APILIB 0x211125
#define APIRECEIVER 0x211124
#define APIGUI 0x211124
#define APICTB 0x220317
#define APIGOTTHARD 0x220317
#define APIGOTTHARD2 0x220317
#define APIJUNGFRAU 0x220317
#define APIMYTHEN3 0x220317
#define APIMOENCH 0x220317
#define APICTB 0x220223
#define APIGOTTHARD 0x220223
#define APIGOTTHARD2 0x220223
#define APIJUNGFRAU 0x220223
#define APIMYTHEN3 0x220223
#define APIMOENCH 0x220223
#define APIEIGER 0x220315
#define APIEIGER 0x220317