From 24db58e6157cb5b6153775d68a9d874e2bd8c7c0 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Wed, 6 Jun 2018 10:23:06 +0200
Subject: [PATCH] jungfrau server required firmware version on server changed
 from 0x2018 to 0x18

---
 .../bin/jungfrauDetectorServer_developer      | Bin 116212 -> 116212 bytes
 .../jungfrauDetectorServer/gitInfo.txt        |  10 +++++-----
 .../jungfrauDetectorServer/gitInfoJungfrau.h  |   8 ++++----
 .../slsDetectorServer_defs.h                  |   2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index a3822e486e467682c18dfca61cfe463db40c1585..078adf493d406d70dde1d63a10eec787e8008d71 100755
GIT binary patch
delta 118
zcmey;&HkmEeS#*l_{`Snj75wR8(rqMGBQkl)Vf%of$^al69*TEz=55P4<#Tx4t)jp
zhchOz1F_pfl_)kKKD6`lP6wd;<SlKX{6JNzKs}}c4PZT!CE8^f88(}>XD~4_vNbR0
L+`gcbF~kM{){rSz

delta 118
zcmey;&HkmEeS#)4kNNKDj75wR8(rqMGAc}d)Vf$-f$^al69*TEz=55P4<#Tx4t)jp
zhchOz1F_pfl_)kKKD6`lP6wd;<SlKX{6JNzKs}}c4PZT!CE8^f6*il-XD~5our@E~
L+`gcbF~kM{@ct?$

diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
index 251eb1723..259d5bcdb 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 4d4e4a4ce7a91af094251ed0903575ba7e73ef5f 
-Revision: 153 
-Branch: versioning 
+Repsitory UUID: bab7d8e3fba7119b3da122cd4769f2447d6da28a 
+Revision: 154 
+Branch: developer 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3847 
-Last Changed Date: 2018-05-28 18:02:50.000000002 +0200 ./RegisterDefs.h
+Last Changed Rev: 3890 
+Last Changed Date: 2018-06-01 10:38:17.000000002 +0200 ./RegisterDefs.h
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
index 4b229b7c6..96684456e 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "4d4e4a4ce7a91af094251ed0903575ba7e73ef5f"
+#define GITREPUUID "bab7d8e3fba7119b3da122cd4769f2447d6da28a"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3847
-#define GITDATE 0x20180528
-#define GITBRANCH "versioning"
+#define GITREV 0x3890
+#define GITDATE 0x20180601
+#define GITBRANCH "developer"
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h
index 3fd667120..e98896d43 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h
@@ -10,7 +10,7 @@
 #define GOODBYE 					(-200)
 #define PROGRAMMING_MODE			(-200)
 #define MIN_REQRD_VRSN_T_RD_API     0x171220
-#define REQRD_FRMWR_VRSN            0x20180226
+#define REQRD_FRMWR_VRSN            0x180226
 
 
 /* Struct Definitions */