diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index a3822e486..078adf493 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ 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 */