From 06a50520c1f708c4e14c3d52dadeea0e834df832 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 11 Mar 2019 14:54:53 +0100 Subject: [PATCH] gotthard server: bug fix get settings should not set default dacs --- slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt | 10 +++++----- .../gotthardDetectorServer/gitInfoGotthard.h | 8 ++++---- .../gotthardDetectorServer/server_funcs.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt index 54d150ceb..d92aae8a7 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: 2f11681d3f2bd2e437cd23fa28dc618dbbd39c68 -Revision: 247 -Branch: 4.0.1-rc +Repsitory UUID: fc766055d4dacac815d561b04ebd5e9f82532117 +Revision: 249 +Branch: 4.0.2-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4057 -Last Changed Date: 2019-02-01 11:47:52.000000002 +0100 ./firmware_funcs.c +Last Changed Rev: 4095 +Last Changed Date: 2019-03-11 14:53:56.000000002 +0100 ./server_funcs.c diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h index 0d87c914e..08a47e853 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 "2f11681d3f2bd2e437cd23fa28dc618dbbd39c68" +#define GITREPUUID "fc766055d4dacac815d561b04ebd5e9f82532117" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4057 -#define GITDATE 0x20190201 -#define GITBRANCH "4.0.1-rc" +#define GITREV 0x4095 +#define GITDATE 0x20190311 +#define GITBRANCH "4.0.2-rc" diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index 3fe6591e5..7d3ca28f7 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -1692,7 +1692,7 @@ int set_settings(int file_des) { printf("Warning: %s",mess); } - else { + else if (isett != GET_SETTINGS){ ret = setDefaultDacs(); if (ret == FAIL) { strcpy(mess,"Could change settings, but could not set to default dacs\n");