diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 044bb0569..26bce8be3 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index 8f791e4b0..2585355cd 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 40b55134f..43278aff6 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -457,10 +457,10 @@ int getModuleConfiguration(int *m, int *t, int *n) { *t = top; *n = normal; #else - if (Beb_GetModuleConfiguration(&m, &t, &n) == FAIL) { + if (Beb_GetModuleConfiguration(m, t, n) == FAIL) { initError = FAIL; strcpy(initErrorMessage, ("Could not get module configuration\n")); - LOG(logERROR, (mess)); + LOG(logERROR, (initErrorMessage)); return FAIL; } #endif @@ -1512,7 +1512,7 @@ int setMaster(enum MASTERINDEX m) { sharedMemory_unlockLocalLink(); // get and update master variable - if (isMaster(master) == FAIL) { + if (isMaster(&master) == FAIL) { return FAIL; } @@ -1563,14 +1563,14 @@ int setTop(enum TOPINDEX t) { } sharedMemory_lockLocalLink(); - if (!Feb_Control_SetTop(t)) { + if (!Feb_Control_SetTop(t, 1, 1)) { sharedMemory_unlockLocalLink(); return FAIL; } sharedMemory_unlockLocalLink(); // get and update top variable - if (isTop(top) == FAIL) { + if (isTop(&top) == FAIL) { return FAIL; } diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index c107dc4e9..bdb8d518d 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 2c7fa59a7..0e1946d5f 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 7c35d3cb0..a4ef25cdc 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index c3e6c2e41..b87df4628 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 4b4c158f1..6d9142d72 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 02cba7f71..9512ee3f0 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -6,10 +6,10 @@ #define APIRECEIVER 0x211124 #define APIGUI 0x211124 -#define APICTB 0x220223 -#define APIGOTTHARD 0x220223 -#define APIGOTTHARD2 0x220223 -#define APIJUNGFRAU 0x220223 -#define APIMYTHEN3 0x220223 -#define APIMOENCH 0x220223 -#define APIEIGER 0x220223 +#define APICTB 0x220228 +#define APIGOTTHARD 0x220228 +#define APIGOTTHARD2 0x220228 +#define APIJUNGFRAU 0x220228 +#define APIMYTHEN3 0x220228 +#define APIMOENCH 0x220228 +#define APIEIGER 0x220228