From de34d85761cd85e490fbd54b9241119cce073b99 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 7 Jan 2019 11:51:25 +0100 Subject: [PATCH] jungfrau server for firmware 0.7, updated required FW version to run current code --- slsDetectorSoftware/commonFiles/versionAPI.h | 2 +- slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt | 8 ++++---- .../jungfrauDetectorServer/gitInfoJungfrau.h | 6 +++--- .../jungfrauDetectorServer/slsDetectorServer_defs.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/slsDetectorSoftware/commonFiles/versionAPI.h b/slsDetectorSoftware/commonFiles/versionAPI.h index 410dd54a6..ae6182675 100644 --- a/slsDetectorSoftware/commonFiles/versionAPI.h +++ b/slsDetectorSoftware/commonFiles/versionAPI.h @@ -1,5 +1,5 @@ /** API versions */ #define APIRECEIVER 0x180823 #define APIEIGER 0x181130 -#define APIJUNGFRAU 0x180823 +#define APIJUNGFRAU 0x190107 #define APIGOTTHARD 0x181204 diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index e13f1cabb..fedb3b251 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: f701c731fb72f258ae8cc6fb440761616e4f2801 -Revision: 166 +Repsitory UUID: f747c908dc4ece72acd29e5b677049b44e5b7da4 +Revision: 167 Branch: 4.0.1-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4043 -Last Changed Date: 2019-01-03 11:29:17.000000002 +0100 ./RegisterDefs.h +Last Changed Rev: 4049 +Last Changed Date: 2019-01-07 11:38:36.000000002 +0100 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index 4b569ac7b..148c61817 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 "f701c731fb72f258ae8cc6fb440761616e4f2801" +#define GITREPUUID "f747c908dc4ece72acd29e5b677049b44e5b7da4" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4043 -#define GITDATE 0x20190103 +#define GITREV 0x4049 +#define GITDATE 0x20190107 #define GITBRANCH "4.0.1-rc" diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h index c42b2ba73..259d7534e 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 0x180615 +#define REQRD_FRMWR_VRSN 0x181206 // temp bug fix from last version, timing mode is backwards compatible /* Struct Definitions */