detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

gotthard server: bug fix get settings should not set default dacs

Browse Source
This commit is contained in:
maliakal_d 2019-03-11 14:54:53 +01:00
parent fc766055d4
commit 06a50520c1
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 2f11681d3f2bd2e437cd23fa28dc618dbbd39c68 Repsitory UUID: fc766055d4dacac815d561b04ebd5e9f82532117
Revision: 247 Revision: 249
Branch: 4.0.1-rc Branch: 4.0.2-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4057 Last Changed Rev: 4095
Last Changed Date: 2019-02-01 11:47:52.000000002 +0100 ./firmware_funcs.c Last Changed Date: 2019-03-11 14:53:56.000000002 +0100 ./server_funcs.c

8
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "2f11681d3f2bd2e437cd23fa28dc618dbbd39c68" #define GITREPUUID "fc766055d4dacac815d561b04ebd5e9f82532117"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4057 #define GITREV 0x4095
#define GITDATE 0x20190201 #define GITDATE 0x20190311
#define GITBRANCH "4.0.1-rc" #define GITBRANCH "4.0.2-rc"

2
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -1692,7 +1692,7 @@ int set_settings(int file_des) {
printf("Warning: %s",mess); printf("Warning: %s",mess);
} }
else { else if (isett != GET_SETTINGS){
ret = setDefaultDacs(); ret = setDefaultDacs();
if (ret == FAIL) { if (ret == FAIL) {
strcpy(mess,"Could change settings, but could not set to default dacs\n"); strcpy(mess,"Could change settings, but could not set to default dacs\n");