From 6438238b555f3f9508392eb9b6863b6ea972dc9f Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 19 Dec 2017 17:06:45 +0100 Subject: [PATCH] gotthard server bug fix, read temp --- .../gotthardDetectorServer/gitInfo.txt | 14 +++++++------- .../gotthardDetectorServer/gitInfoGotthard.h | 10 +++++----- .../gotthardDetectorServer/server_funcs.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt index 331da9c31..570d65f7d 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer -URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: e4fa807b5d987714a047b9d2cac271c89f6c2fef -Revision: 208 -Branch: developer +URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repsitory UUID: 735b8ea206bc3799535097dd27aa8fa92dec530c +Revision: 209 +Branch: 3.0 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1487 -Last Changed Date: 2017-08-16 16:01:46.000000002 +0200 ./firmware_funcs.c +Last Changed Rev: 3148 +Last Changed Date: 2017-12-19 16:55:16.000000002 +0100 ./firmware_funcs.c diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h index f5a2ab5e4..043705cb2 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" +#define SVNURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" //#define SVNREPPATH "" -#define SVNREPUUID "e4fa807b5d987714a047b9d2cac271c89f6c2fef" -//#define SVNREV 0x1487 +#define SVNREPUUID "735b8ea206bc3799535097dd27aa8fa92dec530c" +//#define SVNREV 0x3148 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x1487 -#define SVNDATE 0x20170816 +#define SVNREV 0x3148 +#define SVNDATE 0x20171219 // diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index 844b2d86f..b1a5181a9 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -1052,7 +1052,7 @@ int get_adc(int file_des) { ret=FAIL; } ind=arg[0]; - imod=arg[1]; + imod=0;//arg[1]; #ifdef VERBOSE printf("Getting ADC %d of module %d\n", ind, imod);