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

eiger server bug fix: in 10giga mode always used the 1g ip (dhcp ip) if detectorip is before tengiga in config file

Browse Source
This commit is contained in:
maliakal_d
2018-03-20 16:36:45 +01:00
parent afac5be3c3
commit 59ad15b54e
5 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.1 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.1.16.0
View File

Binary file not shown.

12
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: 8b02aa9e91bbee0470492dcf1ff67415851e14fa
Revision: 315
Branch: 3.1.0-rc
Last Changed Author: Erik_Frojdh
Last Changed Rev: 3455
Last Changed Date: 2018-03-08 16:44:32.000000002 +0100 ./FebRegisterDefs.h
Repsitory UUID: afac5be3c3674fe87044d3b7a54471291698d4ba
Revision: 316
Branch: 3.1.1-rc
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3467
Last Changed Date: 2018-03-19 17:26:38.000000002 +0100 ./FebRegisterDefs.h

10
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "8b02aa9e91bbee0470492dcf1ff67415851e14fa"
#define GITAUTH "Erik_Frojdh"
#define GITREV 0x3455
#define GITDATE 0x20180308
#define GITBRANCH "3.1.0-rc"
#define GITREPUUID "afac5be3c3674fe87044d3b7a54471291698d4ba"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3467
#define GITDATE 0x20180319
#define GITBRANCH "3.1.1-rc"