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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh 2019-04-18 13:39:53 +02:00
commit a29466b396
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/receiver_defs.h
View File

@ -21,7 +21,9 @@
#define FILE_BUFFER_SIZE (16*1024*1024) //16mb #define FILE_BUFFER_SIZE (16*1024*1024) //16mb
//fifo //fifo
#define FIFO_HEADER_NUMBYTES 4 #define FIFO_HEADER_NUMBYTES 8
#define FIFO_DATASIZE_NUMBYTES 4
#define FIFO_PADDING_NUMBYTES 4 // for 8 byte alignment due to sls_receiver_header structure
//hdf5 //hdf5

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -760,7 +760,9 @@ int slsReceiverTCPIPInterface::setup_udp(){
FILE_LOG(logERROR) << mess; FILE_LOG(logERROR) << mess;
} }
receiver->setEthernetInterface(eth); receiver->setEthernetInterface(eth);
if (myDetectorType == EIGER) {
receiver->setEthernetInterface2(eth);
}
//get mac address //get mac address
if (ret != FAIL) { if (ret != FAIL) {
temp = genericSocket::nameToMac(eth); temp = genericSocket::nameToMac(eth);