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

added sync and not executing set detector position in update mode

Browse Source
This commit is contained in:
maliakal_d 2021-10-19 07:58:54 +02:00
parent 51c2e78a31
commit 27c4d8652e
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4319,21 +4319,20 @@ int copy_detector_server(int file_des) {
} }
#endif #endif
// sync // sync
if (ret == OK) { if (ret == OK) {
strcpy(cmd, "sync"); strcpy(cmd, "sync");
if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) { if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
ret = FAIL; ret = FAIL;
snprintf( snprintf(mess, MAX_STR_LENGTH,
mess, MAX_STR_LENGTH, "Could not copy detector server (sync). %s\n",
"Could not copy detector server (sync). %s\n", retvals);
retvals); // LOG(logERROR, (mess)); already printed in executecommand
// LOG(logERROR, (mess)); already printed in executecommand } else {
} else { LOG(logINFO, ("\tsync\n"));
LOG(logINFO, ("\tsync\n")); }
} }
} }
}
#endif #endif
return Server_SendResult(file_des, OTHER, retvals, sizeof(retvals)); return Server_SendResult(file_des, OTHER, retvals, sizeof(retvals));
} }
@ -4960,7 +4959,7 @@ int set_detector_position(int file_des) {
// only set // only set
if (Server_VerifyLock() == OK) { if (Server_VerifyLock() == OK) {
if (check_detector_idle("configure mac") == OK) { if (!updateFlag && check_detector_idle("configure mac") == OK) {
maxydet = args[0]; maxydet = args[0];
detectorId = args[1]; detectorId = args[1];
calculate_and_set_position(); calculate_and_set_position();