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

slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up

Browse Source
This commit is contained in:
maliakal_d
2018-05-28 19:11:34 +02:00
parent 4d4e4a4ce7
commit cf8b0de433
36 changed files with 633 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -51,6 +51,7 @@
#define PREPARE_ACQUISITION 0x0000100000000000ULL
#define CLEANUP_ACQUISITION 0x0000080000000000ULL
#define REGISER_WRITE_READ 0x0000040000000000ULL
#define VERSION_COMPATIBILITY 0x0000020000000000ULL
// 0xFFFFFF0000000000ULL
// 0x000000FFFFFFFFFFULL
@ -170,6 +171,9 @@ public:
if(slsErrorMask&REGISER_WRITE_READ)
retval.append("Could not read/write register in detector\n");
if(slsErrorMask&VERSION_COMPATIBILITY)
retval.append("Incompatible versions with detector or receiver. Please check log for more details.\n");
if(slsErrorMask&COULD_NOT_CONFIGURE_MAC)

4
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -291,7 +291,9 @@ enum idMode{
DETECTOR_SOFTWARE_VERSION, /**<return detector system software version */
THIS_SOFTWARE_VERSION, /**<return this software version */
RECEIVER_VERSION, /**<return receiver software version */
SOFTWARE_FIRMWARE_API_VERSION /** return software firmware API version **/
SOFTWARE_FIRMWARE_API_VERSION, /** return software firmware API version **/
CLIENT_SOFTWARE_API_VERSION, /** return detector software and client api version */
CLIENT_RECEIVER_API_VERSION /** return client and receiver api version */
};
/**
detector digital test modes

2
slsDetectorSoftware/commonFiles/sls_detector_funcs.h
View File

@ -119,6 +119,8 @@ enum detFuncs{
F_AUTO_COMP_DISABLE, /** < auto comp disable mode */
F_STORAGE_CELL_START, /** < storage cell start */
F_CHECK_VERSION, /** < check version compatibility */
/* Always append functions hereafter!!! */
/* Always append functions before!!! */

6
slsDetectorSoftware/commonFiles/versionAPI.h
View File

@ -1,5 +1,5 @@
/** API versions */
#define APIRECEIVER 0x20170101
#define APIEIGER 0x20170101
#define APIJUNGFRAU 0x20170101
#define APIRECEIVER 0x180517
#define APIEIGER 0x180523
#define APIJUNGFRAU 0x180523
#define APIGOTTHARD 0x20170101