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

slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c

@@ -25,11 +25,17 @@ int32_t clkPhase[2] = {0, 0};
 
 /* basic tests */
 
-void checkFirmwareCompatibility() {
+void checkFirmwareCompatibility(int flag) {
 
 	defineGPIOpins();
 	resetFPGA();
-	if ((mapCSP0() == FAIL) || (checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL)) {
+	if (mapCSP0() == FAIL) {
+		cprintf(BG_RED, "Dangerous to continue. Goodbye!\n");
+		exit(EXIT_FAILURE);
+	}
+
+	// does check only if flag is 0 (by default), set by command line
+	if ((!flag) && ((checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) {
 		cprintf(BG_RED, "Dangerous to continue. Goodbye!\n");
 		exit(EXIT_FAILURE);
 	}

slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h

@@ -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);

slsDetectorSoftware/slsDetectorServer/slsDetectorServer.c

@@ -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 {

slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c

@@ -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;
 	}

slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.h

@@ -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);