detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 14:38:14 +02:00
Code Issues Actions 2 Packages Releases Activity

Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer

Browse Source
This commit is contained in:
bergamaschi 2016-08-30 09:30:53 +02:00
commit 13aa48e3ec
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/eigerDetectorServer/Beb.c
View File

@ -432,7 +432,21 @@ int Beb_InitBebInfos(){//file name at some point
bebInfoSize++; bebInfoSize++;
} }
if(!Beb_ReadSetUpFromFile("/home/root/executables/setup_beb.txt")) return 0; int i0=34,i1=0;
if(Beb_GetBebInfoIndex(i0)){
printf("Error adding beb 34(random), beb number %d already added.\n",i0);
exit(0);
}
struct BebInfo b1;
BebInfo_BebInfo(&b1,i0);
BebInfo_SetSerialAddress(&b1,i1);
BebInfo_SetHeaderInfo(&b1,0,(char*)"00:50:c2:46:d9:34",(char*)"129.129.205.78",42000+i0);
BebInfo_SetHeaderInfo(&b1,1,(char*)"00:50:c2:46:d9:35",(char*)"10.0.26.1",52000+i0);
beb_infos[bebInfoSize] = b1;
bebInfoSize++;
//if(!Beb_ReadSetUpFromFile("/home/root/executables/setup_beb.txt")) return 0;
/* /*
//loop through file to fill vector. //loop through file to fill vector.
BebInfo* b = new BebInfo(26); BebInfo* b = new BebInfo(26);

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.2 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.3
View File

Binary file not shown.