From 2b0208bd982e4ca5c3ded7ba090a9483f6104459 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 3 Dec 2018 10:48:52 +0100 Subject: [PATCH] gotthard server bug fix: adc channel shifted by one fixed changin token timing rev for board 2 --- .../gotthardDetectorServer/gitInfo.txt | 10 +++++----- .../gotthardDetectorServer/gitInfoGotthard.h | 8 ++++---- ...4.0.0.3 => gotthardDetectorServerv4.0.1.0} | Bin 116056 -> 116056 bytes .../gotthardDetectorServer/server_defs.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename slsDetectorSoftware/gotthardDetectorServer/{gotthardDetectorServerv4.0.0.3 => gotthardDetectorServerv4.0.1.0} (99%) diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt index e73046edd..0ce8a7c10 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: c2db073d5e936d64733ba9bdfdce311a556ae212 -Revision: 241 -Branch: 4.0.0 +Repsitory UUID: 05d8ef6277b9d367aea69cc5b57e322d40079e27 +Revision: 242 +Branch: 4.0.1-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4018 -Last Changed Date: 2018-09-27 16:32:41.000000002 +0200 ./firmware_funcs.c +Last Changed Rev: 4029 +Last Changed Date: 2018-12-03 10:46:49.000000002 +0100 ./server_defs.h diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h index 4ca82b03c..53580a380 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "c2db073d5e936d64733ba9bdfdce311a556ae212" +#define GITREPUUID "05d8ef6277b9d367aea69cc5b57e322d40079e27" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4018 -#define GITDATE 0x20180927 -#define GITBRANCH "4.0.0" +#define GITREV 0x4029 +#define GITDATE 0x20181203 +#define GITBRANCH "4.0.1-rc" diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.3 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.0 similarity index 99% rename from slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.3 rename to slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.0 index 7d609b90de0f3e50da7bd7c3bbbc8b91dccd8062..e04c7042d2e0af51ffc3938607859af8219c9cfa 100755 GIT binary patch delta 49 zcmcc7#eSoUeS!u{49oA0(-#&nN^ErL;${@se4d-zfQeaX^Brq06CmCEB7ggfe8z%M E0LQ!$qW}N^ delta 49 zcmcc7#eSoUeS!u{^japR=?e=OB{sTraWnF7KF`fB E0IJjw_y7O^ diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_defs.h b/slsDetectorSoftware/gotthardDetectorServer/server_defs.h index fd2ae00e6..7be216ee5 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_defs.h +++ b/slsDetectorSoftware/gotthardDetectorServer/server_defs.h @@ -42,7 +42,7 @@ #define TOKEN_RESTART_DELAY 0x88000000 #define TOKEN_RESTART_DELAY_ROI 0x1b000000 #define TOKEN_TIMING_REV1 0x1f16 -#define TOKEN_TIMING_REV2 0x1f0f +#define TOKEN_TIMING_REV2 0x1f10 #define DEFAULT_PHASE_SHIFT 120 #define DEFAULT_IP_PACKETSIZE 0x0522