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

still updating slsdetector.cpp

Browse Source
This commit is contained in:
maliakal_d
2018-10-25 16:24:05 +02:00
parent 261849d69c
commit cf87b6ca83
8 changed files with 1803 additions and 2432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1686,9 +1686,7 @@ void readFrame(int *ret, char *mess) {
//FILE_LOG(logERROR ,"Waiting for finished flag\n"));
usleep(5000);
}
*ret = (int)FINISHED;
strcpy(mess,"acquisition successfully finished\n"));
FILE_LOG(logGREEN, "%s", mess));
FILE_LOG(logGREEN, ("acquisition successfully finished\n"));
return;
#else
@ -1714,9 +1712,7 @@ void readFrame(int *ret, char *mess) {
FILE_LOG(logINFO, ("*****Done Waiting...\n"));
*ret = (int)FINISHED;
strcpy(mess,"acquisition successfully finished\n");
FILE_LOG(logGREEN, (mess));
FILE_LOG(logGREEN, ("acquisition successfully finished\n"));
#endif
}

7
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1599,8 +1599,6 @@ void readFrame(int *ret, char *mess){
//cprintf(RED,"Waiting for finished flag\n");
usleep(5000);
}
*ret = (int)FINISHED;
strcpy(mess,"acquisition successfully finished\n");
return;
#endif
// wait for status to be done
@ -1615,9 +1613,8 @@ void readFrame(int *ret, char *mess){
sprintf(mess,"no data and run stopped: %lld frames left\n",(long long int)retval);
cprintf(RED,"%s\n",mess);
} else {
*ret = (int)FINISHED;
sprintf(mess,"acquisition successfully finished\n");
cprintf(GREEN, "%s",mess);
*ret = (int)OK;
cprintf(GREEN, "acquisition successfully finished\n");
}
}

8
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -373,6 +373,7 @@ int exec_command(int file_des) {
int get_detector_type(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
enum detectorType retval = myDetectorType;
FILE_LOG(logDEBUG5,("Returning detector type %d\n", retval));
return Server_SendResult(file_des, INT32, 1, &retval, sizeof(retval));
@ -784,7 +785,7 @@ int get_adc(int file_des) {
int write_register(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int args[2] = {-1, -1};
uint32_t args[2] = {-1, -1};
uint32_t retval = -1;
if (receiveData(file_des, args, sizeof(args), INT32) < 0)
@ -1693,6 +1694,7 @@ int set_speed(int file_des) {
int exit_server(int file_des) {
cprintf(BG_RED,"Closing Server\n");
ret = OK;
memset(mess, 0, sizeof(mess));
Server_SendResult(file_des, INT32, 0, NULL, 0);
return GOODBYE;
}
@ -1728,6 +1730,7 @@ int lock_server(int file_des) {
int get_last_client_ip(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
return Server_SendResult(file_des, INT32, 1, lastClientIP, sizeof(lastClientIP));
}
@ -1738,6 +1741,7 @@ int set_port(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int p_number = -1;
char oldLastClientIP[INET_ADDRSTRLEN] = {0};
if (receiveData(file_des, &p_number, sizeof(p_number), INT32) < 0)
return printSocketReadError();
@ -1754,6 +1758,7 @@ int set_port(int file_des) {
} else {
FILE_LOG(logINFO, ("Setting %s port to %d\n",
(isControlServer ? "control":"stop"), p_number));
strcpy(oldLastClientIP, lastClientIP);
sd = bindSocket(p_number);
}
}
@ -1764,6 +1769,7 @@ int set_port(int file_des) {
closeConnection(file_des);
exitServer(sockfd);
sockfd = sd;
strcpy(lastClientIP, oldLastClientIP);
}
return ret;
}