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

Wip

Browse Source
This commit is contained in:
maliakal_d
2022-02-28 12:28:03 +01:00
parent 46578d1447
commit 0437bd0584
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -1549,6 +1549,7 @@ int Feb_Control_SetMasterEffects(int master, int controlServer) {
}
}
}
return OK;
}
int Feb_Control_SetQuad(int val) {

22
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -336,13 +336,21 @@ void initControlServer() {
Feb_Interface_FebInterface();
if (!Feb_Control_FebControl(normal)) {
initError = FAIL;
sprintf(initErrorMessage, "Could not intitalize feb control\n");
sprintf(initErrorMessage, "Could not intitalize eiger detector sever: feb control\n");
LOG(logERROR, (initErrorMessage));
initCheckDone = 1;
sharedMemory_unlockLocalLink();
return;
}
Feb_Control_SetMasterEffects(master, isControlServer);
if (Feb_Control_SetMasterEffects(master, isControlServer) == FAIL) {
initError = FAIL;
sprintf(initErrorMessage, "Could not intitalize HV for eiger detector server: feb control serial "
"communication\n");
LOG(logERROR, (initErrorMessage));
initCheckDone = 1;
sharedMemory_unlockLocalLink();
return;
}
sharedMemory_unlockLocalLink();
LOG(logDEBUG1, ("Control server: FEB Initialization done\n"));
Beb_SetTopVariable(top);
@ -389,7 +397,15 @@ void initStopServer() {
sharedMemory_unlockLocalLink();
return;
}
Feb_Control_SetMasterEffects(master, isControlServer);
if (Feb_Control_SetMasterEffects(master, isControlServer) == FAIL) {
initError = FAIL;
sprintf(initErrorMessage, "Could not intitalize HV for eiger detector server: feb control serial "
"communication\n");
LOG(logERROR, (initErrorMessage));
initCheckDone = 1;
sharedMemory_unlockLocalLink();
return;
}
sharedMemory_unlockLocalLink();
LOG(logDEBUG1, ("Stop server: FEB Initialization done\n"));
Beb_SetTopVariable(top);