detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 07:20:01 +02:00
Code Issues Actions Packages Releases Activity

merge fix

Browse Source
This commit is contained in:
maliakal_d 2021-08-25 17:26:15 +02:00
commit 41f0687671
8 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

5
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1545,12 +1545,13 @@ int set_module(int file_des) {
else if (Server_VerifyLock() == OK) { else if (Server_VerifyLock() == OK) {
// check index // check index
#ifndef EIGERD // setsettings
#ifndef MYTHEN3D
validate_settings((enum detectorSettings)(module.reg)); validate_settings((enum detectorSettings)(module.reg));
#endif #endif
ret = setModule(module, mess); ret = setModule(module, mess);
enum detectorSettings retval = getSettings(); enum detectorSettings retval = getSettings();
#ifndef EIGERD #ifndef MYTHEN3D
validate(&ret, mess, module.reg, (int)retval, "set module (settings)", validate(&ret, mess, module.reg, (int)retval, "set module (settings)",
DEC); DEC);
#endif #endif

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

@ -4,10 +4,10 @@
#define APILIB 0x210816 #define APILIB 0x210816
#define APIRECEIVER 0x210816 #define APIRECEIVER 0x210816
#define APIGUI 0x210816 #define APIGUI 0x210816
#define APIEIGER 0x210825
#define APICTB 0x210825 #define APICTB 0x210825
#define APIGOTTHARD 0x210825 #define APIGOTTHARD 0x210825
#define APIGOTTHARD2 0x210825 #define APIGOTTHARD2 0x210825
#define APIJUNGFRAU 0x210825 #define APIJUNGFRAU 0x210825
#define APIMYTHEN3 0x210825 #define APIMYTHEN3 0x210825
#define APIMOENCH 0x210825 #define APIMOENCH 0x210825
#define APIEIGER 0x210825