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

fixed jungfrau image after programfpga, fixed resetfpga

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-09-14 15:55:55 +02:00
parent 49378e6d09
commit c635b19941
7 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -37,6 +37,7 @@ int sockfd; // (updated in slsDetectorServer) as extern
int (*flist[NUM_DET_FUNCTIONS])(int);
char mess[MAX_STR_LENGTH];
int dataBytes = 10;
int isControlServer = 0;
/* initialization functions */
@ -59,8 +60,10 @@ void init_detector(int controlserver) {
#endif
#ifdef SLS_DETECTOR_FUNCTION_LIST
if (controlserver)
if (controlserver) {
isControlServer = 1;
initControlServer();
}
else initStopServer();
#endif
strcpy(mess,"dummy message");
@ -4601,6 +4604,9 @@ int program_fpga(int file_des) {
#ifdef VERY_VERBOSE
printf("Done with program receiving command\n");
#endif
if (isControlServer)
basictests();
init_detector(isControlServer);
}
#endif
if (ret==OK)
@ -4646,7 +4652,9 @@ int reset_fpga(int file_des) {
}
#ifdef SLS_DETECTOR_FUNCTION_LIST
else {
initControlServer();
if (isControlServer)
basictests();
init_detector(isControlServer);
ret = FORCE_UPDATE;
}
#endif