diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 86708b513..44e8195c4 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer differ diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 83b08798e..55907a799 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -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; } diff --git a/slsDetectorSoftware/eigerDetectorServer/sls_receiver_defs.h b/slsDetectorSoftware/eigerDetectorServer/sls_receiver_defs.h new file mode 120000 index 000000000..a07bf98e7 --- /dev/null +++ b/slsDetectorSoftware/eigerDetectorServer/sls_receiver_defs.h @@ -0,0 +1 @@ +../../slsReceiverSoftware/includes/sls_receiver_defs.h \ No newline at end of file diff --git a/slsDetectorSoftware/eigerDetectorServer/sls_receiver_funcs.h b/slsDetectorSoftware/eigerDetectorServer/sls_receiver_funcs.h new file mode 120000 index 000000000..67df52bf4 --- /dev/null +++ b/slsDetectorSoftware/eigerDetectorServer/sls_receiver_funcs.h @@ -0,0 +1 @@ +../../slsReceiverSoftware/includes/sls_receiver_funcs.h \ No newline at end of file diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h b/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h index 524e5679f..427f76d8a 100644 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h @@ -85,7 +85,7 @@ int executeTrimming(enum trimMode mode, int par1, int par2, int imod); #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 #ifdef GOTTHARDD diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 6f8b04cc0..501992e0e 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -2936,7 +2936,7 @@ int configure_mac(int file_des) { #ifdef SLS_DETECTOR_FUNCTION_LIST if (ret==OK) { /*retval=configureMAC(ipad,imacadd,iservermacadd,digitalTestBit);*/ - retval=configureMAC(ipad,imacadd,iservermacadd); + retval=configureMAC(ipad,imacadd,iservermacadd,0); /*if(retval==-1) ret=FAIL;*/ } #endif