diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index b05caac6b..1b25c7bd4 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 6c978bbab..8eae1ecbb 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -385,26 +385,17 @@ void getModuleConfiguration() { return; } #ifdef VIRTUAL - // if master not modified by config file - if (master == -1) { #ifdef VIRTUAL_MASTER master = 1; -#else - master = 0; -#endif - } - // if top not modified by config file - if (top == -1) { -#ifdef VIRTUAL_MASTER top = 1; #else + master = 0; #ifdef VIRTUAL_TOP top = 1; #else top = 0; #endif #endif - } #ifdef VIRTUAL_9M normal = 0; @@ -595,7 +586,8 @@ void resetToHardwareSettings() { LOG(logERROR, ("%s\n\n", initErrorMessage)); return; } - getModuleConfiguration(); + int temp = -1, temp2 = -1; + Beb_GetModuleConfiguration(&temp, &top, &temp2); Beb_SetTopVariable(top); } // master not set in config file @@ -614,7 +606,8 @@ void resetToHardwareSettings() { LOG(logERROR, ("%s\n\n", initErrorMessage)); return; } - getModuleConfiguration(); + int temp = -1, temp2 = -1; + Beb_GetModuleConfiguration(&master, &temp, &temp2); Feb_Control_SetMasterVariable(master); } #endif diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 10f101017..45c9dea69 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -10,4 +10,4 @@ #define APIJUNGFRAU 0x200508 #define APIMYTHEN3 0x200508 #define APIMOENCH 0x200508 -#define APIEIGER 0x200511 +#define APIEIGER 0x200511