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

jungfrau with the option to start in debug mode to bypass the checks and tests

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-09-20 16:20:39 +02:00
parent 092487c08e
commit 862169e178
7 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -17,7 +17,7 @@ Here are the definitions, but the actual implementation should be done for each
// basic tests
void checkFirmwareCompatibility();
void checkFirmwareCompatibility(int flag);
#ifdef JUNGFRAUD
int checkType();
u_int32_t testFpga(void);

12
slsDetectorSoftware/slsDetectorServer/slsDetectorServer.c
View File

@ -23,11 +23,20 @@ int main(int argc, char *argv[]){
int portno, b;
int retval=OK;
int sd, fd;
int debugflag = 0;
// if socket crash, ignores SISPIPE, prevents global signal handler
// subsequent read/write to socket gives error - must handle locally
signal(SIGPIPE, SIG_IGN);
// circumvent the basic tests
if(argc > 1) {
if(!strcasecmp(argv[1],"-debug")){
debugflag = 1;
argc=1;
}
}
#ifdef STOP_SERVER
char cmd[100];
@ -40,9 +49,10 @@ int main(int argc, char *argv[]){
"********************************************************\n\n"
, portno);
b=1;
basictests();
basictests(debugflag);
#ifdef STOP_SERVER
sprintf(cmd,"%s %d &",argv[0],DEFAULT_PORTNO+1);
//cprintf(BLUE,"cmd:%s\n", cmd);
system(cmd);
#endif
} else {

11
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -38,7 +38,7 @@ int (*flist[NUM_DET_FUNCTIONS])(int);
char mess[MAX_STR_LENGTH];
int dataBytes = 10;
int isControlServer = 0;
int debugflag = 0;
/* initialization functions */
@ -47,9 +47,10 @@ int printSocketReadError() {
return FAIL;
}
void basictests() {
void basictests(int flag) {
debugflag = flag;
#ifdef SLS_DETECTOR_FUNCTION_LIST
checkFirmwareCompatibility();
checkFirmwareCompatibility(debugflag);
#endif
}
@ -4605,7 +4606,7 @@ int program_fpga(int file_des) {
printf("Done with program receiving command\n");
#endif
if (isControlServer)
basictests();
basictests(debugflag);
init_detector(isControlServer);
}
#endif
@ -4653,7 +4654,7 @@ int reset_fpga(int file_des) {
#ifdef SLS_DETECTOR_FUNCTION_LIST
else {
if (isControlServer)
basictests();
basictests(debugflag);
init_detector(isControlServer);
ret = FORCE_UPDATE;
}

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.h
View File

@ -6,7 +6,7 @@
// initialization functions
int printSocketReadError();
void basictests();
void basictests(int);
void init_detector(int);
int decode_function(int);
const char* getFunctionName(enum detFuncs func);