From 4aa0d26f26a16d48ddd265128f02b39e7140127f Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Fri, 21 Sep 2018 17:29:43 +0200
Subject: [PATCH] gotthard server: trying to resolve roi problem that is only
 affected by latest firmware

---
 .../gotthardDetectorServer/firmware_funcs.c   | 33 ++++++++++++++-----
 .../gotthardDetectorServer/gitInfo.txt        |  8 ++---
 .../gotthardDetectorServer/gitInfoGotthard.h  |  6 ++--
 .../gotthardDetectorServer/server_funcs.c     |  4 +--
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 5e28d88a6..ab12ef2af 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -64,6 +64,8 @@ int slaveadcphase = 0;
 int rsttosw1delay = 2;
 int startacqdelay = 1;
 
+int detectorFirstServer = 1;
+
 
 #ifdef MCB_FUNCS
 extern const int nChans;
@@ -273,12 +275,20 @@ void setMasterSlaveConfiguration(){
 			}
 			else {
 				cprintf(RED,"could not scan masterflags %s value from config file\n",value);
+				fclose(fd);
 				exit(EXIT_FAILURE);
 			}
+
+			if (!detectorFirstServer) {
+				cprintf(BLUE, "Server has been started up before. Ignoring rest of config file\n");
+				fclose(fd);
+				return;
+			}
 		}
 		else {
 			if(sscanf(value,"%d",&ival)<=0) {
 				cprintf(RED,"could not scan patternphase %s value from config file\n",value);
+				fclose(fd);
 				exit(EXIT_FAILURE);
 			}
 
@@ -298,6 +308,7 @@ void setMasterSlaveConfiguration(){
                 startacqdelay = ival;
 			else {
 				cprintf(RED,"could not scan parameter name %s from config file\n",key);
+				fclose(fd);
 				exit(EXIT_FAILURE);
 			}
 		}
@@ -384,6 +395,7 @@ int setPhaseShiftOnce(){
 	//bus_w(addr,0x0);   //clear the reg
 
 	if(reg==0){
+		detectorFirstServer = 1;
 		printf("\nImplementing phase shift of %d\n",phase_shift);
 		for (i=1;i<phase_shift;i++) {
 			bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|SW1_BIT|PHASE_STEP_BIT));//0x2821
@@ -392,7 +404,7 @@ int setPhaseShiftOnce(){
 #ifdef VERBOSE
 		printf("Multipupose reg now:%x\n",bus_r(addr));
 #endif
-	}
+	} else detectorFirstServer = 0;
 
 	return OK;
 }
@@ -1261,8 +1273,6 @@ int setADC(int adc){
 
 int configureMAC(int ipad,long long int macad,long long int detectormacad, int detipad, int ival, int udpport){
 
-	startReceiver(1);
-
 #ifdef DDEBUG
 	printf("Chip of Intrst Reg:%x\n",bus_r(CHIP_OF_INTRST_REG));
 	printf("IP Packet Size:%d\n",ipPacketSize);
@@ -1858,7 +1868,7 @@ int configureADC(){
 
 
 		// start point
-		valw=0xff;
+		valw=0xffffffff;
 		bus_w(ADC_SPI_REG,(valw));
 
 		 //chip sel bar down
@@ -1869,25 +1879,30 @@ int configureADC(){
 			 //cldwn
 			valw=valw&(~(0x1<<cdx));
 			bus_w(ADC_SPI_REG,valw);
-			usleep(0);
+			//usleep(0);
 
 			//write data (i)
 			valw=(valw&(~(0x1<<ddx)))+(((codata>>(23-i))&0x1)<<ddx);
 			bus_w(ADC_SPI_REG,valw);
-			usleep(0);
+			//usleep(0);
 
 			//clkup
 			valw=valw+(0x1<<cdx);
 			bus_w(ADC_SPI_REG,valw);
-			usleep(0);
+			//usleep(0);
 		}
 
+	    valw |= csmask;
+	    bus_w(ADC_SPI_REG,valw);
+		//usleep(0);
+
 		 // stop point =start point
 		valw=valw&(~(0x1<<cdx));
-		usleep(0);
-		valw=0xff;
 		bus_w(ADC_SPI_REG,(valw));
 
+	    valw = 0xffffffff;
+	    bus_w(ADC_SPI_REG,(valw));
+
 		//usleep in between
 		usleep(50000);
 	}
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
index 485b59dec..617896948 100644
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 255931bbde2721a1d7ddf3422ba9ee79ec7655f5 
-Revision: 237 
+Repsitory UUID: 9f84bf71759d607b957bcf1fc88eb22c59d8378a 
+Revision: 238 
 Branch: 4.0.0 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 4000 
-Last Changed Date: 2018-09-18 17:37:25.000000002 +0200 ./server_funcs.c
+Last Changed Rev: 4004 
+Last Changed Date: 2018-09-21 13:58:41.000000002 +0200 ./server_funcs.c
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
index e5944cb43..13025d3b2 100644
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "255931bbde2721a1d7ddf3422ba9ee79ec7655f5"
+#define GITREPUUID "9f84bf71759d607b957bcf1fc88eb22c59d8378a"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x4000
-#define GITDATE 0x20180918
+#define GITREV 0x4004
+#define GITDATE 0x20180921
 #define GITBRANCH "4.0.0"
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index 2099f32b0..e8c6156af 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -87,6 +87,7 @@ int init_detector( int b) {
     //gotthard specific
     setPhaseShiftOnce();
     configureADC();
+
     setADC(-1); //already does setdaqreg and clean fifo
     setSettings(DYNAMICGAIN,-1);
     setDefaultDacs();
@@ -101,9 +102,8 @@ int init_detector( int b) {
     setTiming(GET_EXTERNAL_COMMUNICATION_MODE);
     setMaster(GET_MASTER);
     setSynchronization(GET_SYNCHRONIZATION_MODE);
-    startReceiver(0);
+    startReceiver(1);
     setMasterSlaveConfiguration();
-    setADC(-1);
   }
   strcpy(mess,"dummy message");
   strcpy(lastClientIP,"none");