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

merge from 3.0.1: eiger server detip and mac client updated back

Browse Source
This commit is contained in:
maliakal_d
2018-02-07 15:24:44 +01:00
parent 897cbac27d a6b917851c
commit aa190fda7a
6 changed files with 69 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 3da6a6df6556312f7467407a8b5691bdc478424e
Revision: 319
Repsitory UUID: 897cbac27d3154d72893e331df3147d4b706ccc8
Revision: 321
Branch: developer
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3597
Last Changed Date: 2018-02-07 10:44:13.000000002 +0100 ./FebRegisterDefs.h
Last Changed Rev: 3600
Last Changed Date: 2018-02-07 15:22:30.000000002 +0100 ./FebRegisterDefs.h

4
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "3da6a6df6556312f7467407a8b5691bdc478424e"
#define GITREPUUID "897cbac27d3154d72893e331df3147d4b706ccc8"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3597
#define GITREV 0x3600
#define GITDATE 0x20180207
#define GITBRANCH "developer"

17
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -831,23 +831,6 @@ enum externalCommunicationMode setTiming( enum externalCommunicationMode arg){
/* configure mac */
int configureMAC(uint32_t destip, uint64_t destmac, uint64_t sourcemac, uint32_t sourceip, uint32_t udpport, uint32_t udpport2, int ival) {
if (sourcemac != getDetectorMAC()){
printf("*************************************************\n");
printf("WARNING: actual detector mac address %llx does not match the one from client %llx\n",getDetectorMAC(),sourcemac);
sourcemac = getDetectorMAC();
printf("WARNING: Matched detectormac to the hardware mac now\n");
printf("*************************************************\n");
}
//only for 1Gbe
if(!send_to_ten_gig){
if (sourceip != getDetectorIP()){
printf("*************************************************\n");
printf("WARNING: actual detector ip address %x does not match the one from client %x\n",getDetectorIP(),sourceip);
sourceip = getDetectorIP();
printf("WARNING: Matched detector ip to the hardware ip now\n");
printf("*************************************************\n");
}
}
char src_mac[50], src_ip[50],dst_mac[50], dst_ip[50];
int src_port = 0xE185;