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 7d609b90d..e04c7042d 100755 Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.3 and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.0 differ 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