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

better testing for eiger

Browse Source
This commit is contained in:
maliakal_d
2019-10-21 15:10:31 +02:00
parent fee110c73a
commit f2fc187f13
5 changed files with 77 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1650,12 +1650,18 @@ int start_acquisition(int file_des) {
// check for hardware mac and hardware ip
if (udpDetails.srcmac != getDetectorMAC()) {
ret = FAIL;
sprintf(mess, "Invalid udp source mac address for this detector. Must be same as hardware detector mac address \n");
uint64_t sourcemac = getDetectorMAC();
char src_mac[50];
getMacAddressinString(src_mac, 50, sourcemac);
sprintf(mess, "Invalid udp source mac address for this detector. Must be same as hardware detector mac address %s\n", src_mac);
FILE_LOG(logERROR,(mess));
}
else if (!enableTenGigabitEthernet(-1) && (udpDetails.srcip != getDetectorIP())) {
ret = FAIL;
sprintf(mess, "Invalid udp source ip address for this detector. Must be same as hardware detector ip address in 1G readout mode \n");
uint32_t sourceip = getDetectorIP();
char src_ip[INET_ADDRSTRLEN];
getIpAddressinString(src_ip, sourceip);
sprintf(mess, "Invalid udp source ip address for this detector. Must be same as hardware detector ip address %s in 1G readout mode \n", src_ip);
FILE_LOG(logERROR,(mess));
}
else
@ -1758,12 +1764,18 @@ int start_and_read_all(int file_des) {
// check for hardware mac and hardware ip
if (udpDetails.srcmac != getDetectorMAC()) {
ret = FAIL;
sprintf(mess, "Invalid udp source mac address for this detector. Must be same as hardware detector mac address \n");
uint64_t sourcemac = getDetectorMAC();
char src_mac[50];
getMacAddressinString(src_mac, 50, sourcemac);
sprintf(mess, "Invalid udp source mac address for this detector. Must be same as hardware detector mac address %s\n", src_mac);
FILE_LOG(logERROR,(mess));
}
else if (!enableTenGigabitEthernet(-1) && (udpDetails.srcip != getDetectorIP())) {
ret = FAIL;
sprintf(mess, "Invalid udp source ip address for this detector. Must be same as hardware detector ip address in 1G readout mode \n");
uint32_t sourceip = getDetectorIP();
char src_ip[INET_ADDRSTRLEN];
getIpAddressinString(src_ip, sourceip);
sprintf(mess, "Invalid udp source ip address for this detector. Must be same as hardware detector ip address %s in 1G readout mode \n", src_ip);
FILE_LOG(logERROR,(mess));
}
else