From 58e6338f9c7289708df5ea88e0d0d0facdda13c1 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 29 Jul 2019 09:36:45 +0200
Subject: [PATCH] eiger server for v24

---
 .../eigerDetectorServer/FebRegisterDefs.h     |   2 +-
 ....3.23.0 => eigerDetectorServerv4.1.0.24.0} | Bin 306560 -> 306560 bytes
 .../eigerDetectorServer/gitInfo.txt           |  10 +++++-----
 .../eigerDetectorServer/gitInfoEiger.h        |   8 ++++----
 .../slsDetectorServer_defs.h                  |   2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename slsDetectorSoftware/eigerDetectorServer/bin/{eigerDetectorServerv4.0.3.23.0 => eigerDetectorServerv4.1.0.24.0} (99%)

diff --git a/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h b/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h
index 1885dd08b..03db3a1bd 100644
--- a/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h
+++ b/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h
@@ -21,7 +21,7 @@
 #define DAQ_REG_SUBFRAME_PERIOD       	7 //also pg and fifo status register
 
 
-#define DAQ_REG_RO_OFFSET				12
+#define DAQ_REG_RO_OFFSET				20
 #define DAQ_REG_STATUS					(DAQ_REG_RO_OFFSET + 0) //also pg and fifo status register
 #define FEB_REG_STATUS              	(DAQ_REG_RO_OFFSET + 3)
 #define MEAS_SUBPERIOD_REG 	 			(DAQ_REG_RO_OFFSET + 4)
diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.3.23.0 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.0
similarity index 99%
rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.3.23.0
rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.0
index 9aa4af1ae29f08ef109eacf8bd4d73f66dff45fc..99b9a7d81a625fbf1341d5929b27c54b21628af0 100755
GIT binary patch
delta 116
zcmZp;E!1#ZXv6F8j1rsQd}n85l$iYGhdPjy`5DhBKDp+nI;(^S6Ho1Ag`Z-Z_x%)Q
zWYpYz<yUq;qsVrLF2;CkM)BzjjxwqPsS`&TUjwNv$3VR8caAagGcrm}e{-DiG^0fO
QjuVVP%(Q*S3FZ?|0O1ZV$p8QV

delta 116
zcmZp;E!1#ZXv6F8jAEPLd}n856r23zhdPjy`5DhBI=SYjI;)rm6Ho1Ag`Z-Z_x%)Q
zWE9wZ<yUq;BhPk+F2;CkM*iswjxwqPsS`&TUjwNv$3VR8caAagGcpQJe{-DiG^0TK
QjuVVP%(Q*S3FZ?|0M6(yZU6uP

diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
index 1ea1d1f8b..6740c9ad9 100644
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 3e2b471ee1e6bbbd0fbce6292c30e4403a4f4b2f 
-Revision: 352 
-Branch: quad 
+Repsitory UUID: 27f3af53657b744f43b79f9751909ae4e289ad29 
+Revision: 354 
+Branch: 4.1.0-rc 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 4117 
-Last Changed Date: 2019-07-10 17:22:28.000000002 +0200 ./Beb.c
+Last Changed Rev: 4121 
+Last Changed Date: 2019-07-29 09:33:57.000000001 +0200 ./FebRegisterDefs.h
diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
index 84bfa4364..9f827070f 100644
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "3e2b471ee1e6bbbd0fbce6292c30e4403a4f4b2f"
+#define GITREPUUID "27f3af53657b744f43b79f9751909ae4e289ad29"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x4117
-#define GITDATE 0x20190710
-#define GITBRANCH "quad"
+#define GITREV 0x4121
+#define GITDATE 0x20190729
+#define GITBRANCH "4.1.0-rc"
diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
index 5eae871d9..1f9382f20 100644
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
@@ -12,7 +12,7 @@
 #include <stdint.h>
 
 #define GOODBYE 					 		(-200)
-#define REQUIRED_FIRMWARE_VERSION 	 		(22)
+#define REQUIRED_FIRMWARE_VERSION 	 		(24)
 #define IDFILECOMMAND						"more /home/root/executables/detid.txt"
 
 #define STATUS_IDLE		0