From 53423a42ac02eb3c0d91ba9e8a5afe5dfc131e07 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 10 Jul 2018 15:04:59 +0200 Subject: [PATCH] slsDetectorSoftware eiger and jungfrau server version API updated --- slsDetectorSoftware/commonFiles/versionAPI.h | 4 ++-- ..._developer => eigerDetectorServerv3.3.0.0} | Bin 302050 -> 302050 bytes .../eigerDetectorServer/gitInfo.txt | 10 +++++----- .../eigerDetectorServer/gitInfoEiger.h | 8 ++++---- ...veloper => jungfrauDetectorServerv3.3.0.0} | Bin 116268 -> 116268 bytes .../jungfrauDetectorServer/gitInfo.txt | 10 +++++----- .../jungfrauDetectorServer/gitInfoJungfrau.h | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) rename slsDetectorSoftware/eigerDetectorServer/bin/{eigerDetectorServer_developer => eigerDetectorServerv3.3.0.0} (99%) rename slsDetectorSoftware/jungfrauDetectorServer/bin/{jungfrauDetectorServer_developer => jungfrauDetectorServerv3.3.0.0} (99%) diff --git a/slsDetectorSoftware/commonFiles/versionAPI.h b/slsDetectorSoftware/commonFiles/versionAPI.h index 9cbf2d4ea..8c35add53 100644 --- a/slsDetectorSoftware/commonFiles/versionAPI.h +++ b/slsDetectorSoftware/commonFiles/versionAPI.h @@ -1,5 +1,5 @@ /** API versions */ #define APIRECEIVER 0x180517 -#define APIEIGER 0x180523 -#define APIJUNGFRAU 0x180523 +#define APIEIGER 0x180528 +#define APIJUNGFRAU 0x180628 #define APIGOTTHARD 0x180529 diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.3.0.0 similarity index 99% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.3.0.0 index 11dabc17966daa8743bb1162f4f5cd0e2509bb94..17cdfa199c5ff67f79c702f7509595a3a9aa5a70 100755 GIT binary patch delta 110 zcmaE~UFgwvp$*Tz2(b%zFfb@sFJNG>KfoZ7e2-P5`Nx;`A72=Om}&cuFU$ujtSrnJ mic-_#^Gb7z^~_97O~Aae#2hfs6h+PwSKfoZ7e2-PR`Nx;`A72=Om}&cuFU$ujtjsMK nic-_#^Gb7z^~_97%)q>|#2hfs99hoP5LwRDX#1yJmJhlBv#Ba& diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index c6a6c8e0e..7e55d1c51 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: 4d4e4a4ce7a91af094251ed0903575ba7e73ef5f -Revision: 341 -Branch: versioning +Repsitory UUID: c2b1eef75cb3c8a83adc091c656d9d23ad331139 +Revision: 342 +Branch: 3.3.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3847 -Last Changed Date: 2018-05-28 18:02:50.000000002 +0200 ./xparameters.h +Last Changed Rev: 3939 +Last Changed Date: 2018-07-10 13:27:59.000000002 +0200 ./Makefile.virtual diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 4b229b7c6..118cc5026 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 "4d4e4a4ce7a91af094251ed0903575ba7e73ef5f" +#define GITREPUUID "c2b1eef75cb3c8a83adc091c656d9d23ad331139" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3847 -#define GITDATE 0x20180528 -#define GITBRANCH "versioning" +#define GITREV 0x3939 +#define GITDATE 0x20180710 +#define GITBRANCH "3.3.0-rc" diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.3.0.0 similarity index 99% rename from slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer rename to slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.3.0.0 index b43bc8e7c5ad55024fc7e1aaa84c0d3b7ef29d8f..7c32a48190f9f52d40544b4692fcf66e01b929e4 100755 GIT binary patch delta 53 zcmV-50LuTYj0dcY2aqWPM6L^$A#wp2u|$@M77zymU;;1;Fu=RfyAL2j;TQk{;V1@! L@QJtZi2*!3;v*8X delta 53 zcmV-50LuTYj0dcY2aqWPH0~*vA#wp2u|$@M7AOV-U;;1;Fu=RfyAL2j;TQk{;Ufiu L@QJtZi2*!3@t6}5 diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index 1b2f6fd1e..dbb15888c 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: 72f47b2375be2f3b095e5bd35cebda523d2210ae -Revision: 156 -Branch: developer +Repsitory UUID: c2b1eef75cb3c8a83adc091c656d9d23ad331139 +Revision: 158 +Branch: 3.3.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3917 -Last Changed Date: 2018-06-28 08:21:09.000000002 +0200 ./RegisterDefs.h +Last Changed Rev: 3939 +Last Changed Date: 2018-07-10 13:27:59.000000002 +0200 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index 759c800ca..118cc5026 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 "72f47b2375be2f3b095e5bd35cebda523d2210ae" +#define GITREPUUID "c2b1eef75cb3c8a83adc091c656d9d23ad331139" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3917 -#define GITDATE 0x20180628 -#define GITBRANCH "developer" +#define GITREV 0x3939 +#define GITDATE 0x20180710 +#define GITBRANCH "3.3.0-rc"