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

fix using real detectors, moving readconfig to end (due to initialization)

Browse Source
This commit is contained in:
maliakal_d
2020-05-11 19:26:22 +02:00
parent 6620027439
commit 5aaefc8e00
10 changed files with 1396 additions and 1335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -4119,9 +4119,23 @@ int set_activate(int file_des) {
#else
// set & get
if ((arg == -1) || (Server_VerifyLock() == OK)) {
retval = activate(arg);
LOG(logDEBUG1, ("Activate: %d\n", retval));
validate(arg, retval, "set activate", DEC);
if (arg >= 0) {
if (setActivate(arg) == FAIL) {
ret = FAIL;
sprintf(mess, "Could not %s\n", (arg == 0 ? "deactivate" : "activate"));
LOG(logERROR, (mess));
}
}
if (ret == OK) {
if (getActivate(&retval) == FAIL) {
ret = FAIL;
sprintf(mess, "Could not get activate flag\n");
LOG(logERROR, (mess));
} else {
LOG(logDEBUG1, ("Activate: %d\n", retval));
validate(arg, retval, "set/get activate", DEC);
}
}
}
#endif
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
@ -7264,7 +7278,8 @@ int get_receiver_parameters(int file_des) {
// activate
#ifdef EIGERD
i32 = activate(-1);
i32 = 0;
getActivate(&i32);
#else
i32 = 0;
#endif