detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-15 20:43:45 +01:00
Code Issues Actions Packages Releases Activity

got rid of extra servers for eiger, converted to c and it works

Browse Source
This commit is contained in:
Maliakal Dhanya
2014-08-29 16:41:19 +02:00
parent 10ca7c10e8
commit c5a4f357bf
31 changed files with 662 additions and 720 deletions
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
URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/gotthardDetectorServer
Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git
Repsitory UUID: 046a469b1e6582c4c55bd6eaeb4818b618d0a9a9
Revision: 169
Branch: separate_receiver
Repsitory UUID: 8c994ea0d538628b36a9497508960388816749fa
Revision: 172
Branch: master
Last Changed Author: Maliakal_Dhanya
Last Changed Rev: 14
Last Changed Date: 2014-06-03 12:26:45 +0200
Last Changed Rev: 278
Last Changed Date: 2014-08-08 14:03:30 +0200

8
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/gotthardDetectorServer"
//#define SVNREPPATH ""
#define SVNREPUUID "046a469b1e6582c4c55bd6eaeb4818b618d0a9a9"
//#define SVNREV 0x14
#define SVNREPUUID "8c994ea0d538628b36a9497508960388816749fa"
//#define SVNREV 0x278
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Maliakal_Dhanya"
#define SVNREV 0x14
#define SVNDATE 0x20140603
#define SVNREV 0x278
#define SVNDATE 0x20140808
//

2
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@@ -1012,7 +1012,7 @@ int set_dac(int file_des) {
n = sendDataOnly(file_des,&ret,sizeof(ret));
if (ret!=FAIL) {
/* send return argument */
n += sendDataOnly(file_des,&retval,sizeof(retval));
n += sendDataOnly(file_des,retval,sizeof(retval));
} else {
n += sendDataOnly(file_des,mess,sizeof(mess));
}