detectors/slsDetectorPackage
24
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-13 07:18:14 +01:00
Code Issues Actions Packages Releases Activity

included configuremac in eigerserver

Browse Source
This commit is contained in:
Maliakal Dhanya
2014-05-26 18:01:52 +02:00
parent 28a8a3c79f
commit 5fcec01a31
6 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -359,7 +359,7 @@ int executeTrimming(enum trimMode mode, int par1, int par2, int imod){
} }
int configureMAC(int ipad, long long int imacadd, long long int iservermacadd, int dtb=0){ int configureMAC(int ipad, long long int imacadd, long long int iservermacadd, int dtb){
return 0; return 0;
} }

1
slsDetectorSoftware/eigerDetectorServer/sls_receiver_defs.h Symbolic link
View File

@@ -0,0 +1 @@
../../slsReceiverSoftware/includes/sls_receiver_defs.h

1
slsDetectorSoftware/eigerDetectorServer/sls_receiver_funcs.h Symbolic link
View File

@@ -0,0 +1 @@
../../slsReceiverSoftware/includes/sls_receiver_funcs.h

2
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@@ -85,7 +85,7 @@ int executeTrimming(enum trimMode mode, int par1, int par2, int imod);
#ifndef MYTHEND #ifndef MYTHEND
int configureMAC(int ipad, long long int imacadd, long long int iservermacadd, int dtb=0); int configureMAC(int ipad, long long int imacadd, long long int iservermacadd, int dtb);
#endif #endif
#ifdef GOTTHARDD #ifdef GOTTHARDD

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@@ -2936,7 +2936,7 @@ int configure_mac(int file_des) {
#ifdef SLS_DETECTOR_FUNCTION_LIST #ifdef SLS_DETECTOR_FUNCTION_LIST
if (ret==OK) { if (ret==OK) {
/*retval=configureMAC(ipad,imacadd,iservermacadd,digitalTestBit);*/ /*retval=configureMAC(ipad,imacadd,iservermacadd,digitalTestBit);*/
retval=configureMAC(ipad,imacadd,iservermacadd); retval=configureMAC(ipad,imacadd,iservermacadd,0);
/*if(retval==-1) ret=FAIL;*/ /*if(retval==-1) ret=FAIL;*/
} }
#endif #endif