detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

fix for reset

Browse Source
This commit is contained in:
maliakal_d
2020-05-11 20:09:09 +02:00
parent e3d3c88d74
commit 88f801061f
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

17
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -385,26 +385,17 @@ void getModuleConfiguration() {
return; return;
} }
#ifdef VIRTUAL #ifdef VIRTUAL
// if master not modified by config file
if (master == -1) {
#ifdef VIRTUAL_MASTER #ifdef VIRTUAL_MASTER
master = 1; master = 1;
#else
master = 0;
#endif
}
// if top not modified by config file
if (top == -1) {
#ifdef VIRTUAL_MASTER
top = 1; top = 1;
#else #else
master = 0;
#ifdef VIRTUAL_TOP #ifdef VIRTUAL_TOP
top = 1; top = 1;
#else #else
top = 0; top = 0;
#endif #endif
#endif #endif
}
#ifdef VIRTUAL_9M #ifdef VIRTUAL_9M
normal = 0; normal = 0;
@ -595,7 +586,8 @@ void resetToHardwareSettings() {
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));
return; return;
} }
getModuleConfiguration(); int temp = -1, temp2 = -1;
Beb_GetModuleConfiguration(&temp, &top, &temp2);
Beb_SetTopVariable(top); Beb_SetTopVariable(top);
} }
// master not set in config file // master not set in config file
@ -614,7 +606,8 @@ void resetToHardwareSettings() {
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));
return; return;
} }
getModuleConfiguration(); int temp = -1, temp2 = -1;
Beb_GetModuleConfiguration(&master, &temp, &temp2);
Feb_Control_SetMasterVariable(master); Feb_Control_SetMasterVariable(master);
} }
#endif #endif

2
slsSupportLib/include/versionAPI.h
View File

@ -10,4 +10,4 @@
#define APIJUNGFRAU 0x200508 #define APIJUNGFRAU 0x200508
#define APIMYTHEN3 0x200508 #define APIMYTHEN3 0x200508
#define APIMOENCH 0x200508 #define APIMOENCH 0x200508
#define APIEIGER 0x200511 #define APIEIGER 0x200511