detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-14 22:07:12 +02:00
Code Issues Actions Packages Releases Activity

gotthard server bug fix, read temp

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-19 17:06:45 +01:00
parent 735b8ea206
commit 6438238b55
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: e4fa807b5d987714a047b9d2cac271c89f6c2fef Repsitory UUID: 735b8ea206bc3799535097dd27aa8fa92dec530c
Revision: 208 Revision: 209
Branch: developer Branch: 3.0
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1487 Last Changed Rev: 3148
Last Changed Date: 2017-08-16 16:01:46.000000002 +0200 ./firmware_funcs.c Last Changed Date: 2017-12-19 16:55:16.000000002 +0100 ./firmware_funcs.c

10
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#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 SVNREPPATH ""
#define SVNREPUUID "e4fa807b5d987714a047b9d2cac271c89f6c2fef" #define SVNREPUUID "735b8ea206bc3799535097dd27aa8fa92dec530c"
//#define SVNREV 0x1487 //#define SVNREV 0x3148
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1487 #define SVNREV 0x3148
#define SVNDATE 0x20170816 #define SVNDATE 0x20171219
// //

2
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -1052,7 +1052,7 @@ int get_adc(int file_des) {
ret=FAIL; ret=FAIL;
} }
ind=arg[0]; ind=arg[0];
imod=arg[1]; imod=0;//arg[1];
#ifdef VERBOSE #ifdef VERBOSE
printf("Getting ADC %d of module %d\n", ind, imod); printf("Getting ADC %d of module %d\n", ind, imod);