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

Pr fix

Browse Source
This commit is contained in:
maliakal_d 2020-05-13 09:22:40 +02:00
parent d8ca9bb6b5
commit af4b5bbf50
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorServers/eigerDetectorServer/Beb.c
View File

@ -391,7 +391,10 @@ int Beb_SetMaster(enum MASTERINDEX ind) {
} }
int Beb_SetActivate(int enable) { int Beb_SetActivate(int enable) {
enable = enable == 0 ? 0 : 1; if (enable < 0) {
LOG(logERROR, ("Invalid enable value\n"));
return 0;
}
u_int32_t *csp0base = 0; u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR); int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR);
if (fd < 0) { if (fd < 0) {

9
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1880,7 +1880,6 @@ int setActivate(int enable) {
LOG(logERROR, ("Invalid activate argument: %d\n", enable)); LOG(logERROR, ("Invalid activate argument: %d\n", enable));
return FAIL; return FAIL;
} }
enable = enable == 0 ? 0 : 1;
#ifdef VIRTUAL #ifdef VIRTUAL
eiger_virtual_activate = enable; eiger_virtual_activate = enable;
#else #else
@ -1889,12 +1888,12 @@ int setActivate(int enable) {
} }
Feb_Control_activate(enable); Feb_Control_activate(enable);
#endif #endif
if (enable == 0) { if (enable) {
LOG(logINFORED, ("Deactivated in %s Server!\n",
isControlServer ? " Control" : "Stop"));
} else {
LOG(logINFOGREEN, ("Activated in %s Server!\n", LOG(logINFOGREEN, ("Activated in %s Server!\n",
isControlServer ? " Control" : "Stop")); isControlServer ? " Control" : "Stop"));
} else {
LOG(logINFORED, ("Deactivated in %s Server!\n",
isControlServer ? " Control" : "Stop"));
} }
return OK; return OK;
} }