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

gotthard server bug fix, temp read

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-19 17:50:20 +01:00
parent 0649626842 bc8c706150
commit 6690335971
5 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: c5777e517c451226e3275e6948895baee21a1f94 Repsitory UUID: 0649626842512b772ab660c36dece505f3244aee
Revision: 210 Revision: 212
Branch: gotthardfix Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1585 Last Changed Rev: 3318
Last Changed Date: 2017-11-09 13:57:04.000000002 +0100 ./server_funcs.c Last Changed Date: 2017-12-19 17:45:11.000000002 +0100 ./server_funcs.c

10
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "c5777e517c451226e3275e6948895baee21a1f94" #define GITREPUUID "0649626842512b772ab660c36dece505f3244aee"
#define GITAUTH "Dhanya_Maliakal" #define GITAUTH "Dhanya_Maliakal"
#define GITREV 0x1585 #define GITREV 0x3318
#define GITDATE 0x20171109 #define GITDATE 0x20171219
#define GITBRANCH "blabla" #define GITBRANCH "3.0.1"

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.6
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.7 Executable file
View File

Binary file not shown.

2
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -1049,7 +1049,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);