detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 14:48:59 +01:00
Code Issues Actions Packages Releases Activity

server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number

Browse Source
This commit is contained in:
maliakal_d
2018-02-07 09:23:52 +01:00
parent e6bd874a88
commit 618f6291cf
23 changed files with 164 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.10 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.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@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: a161a9aad8ac38a79ba43340344a3c923cea85f7
Revision: 307
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: e6bd874a88493557fc5127d4a1686832299aaf06
Revision: 312
Branch: 3.0.1
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 1578
Last Changed Date: 2017-10-11 12:45:54.679255119 +0200 ./Makefile.virtual
Last Changed Rev: 3346
Last Changed Date: 2018-02-05 12:40:59.000000002 +0100 ./FebRegisterDefs.h

10
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@@ -1,6 +1,6 @@
#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
#define GITREPUUID "a161a9aad8ac38a79ba43340344a3c923cea85f7"
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "e6bd874a88493557fc5127d4a1686832299aaf06"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x1578
#define GITDATE 0x20171011
#define GITBRANCH "blabla"
#define GITREV 0x3346
#define GITDATE 0x20180205
#define GITBRANCH "3.0.1"

5
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -134,10 +134,7 @@ int64_t getDetectorId(enum idMode arg){
case SOFTWARE_FIRMWARE_API_VERSION:
return (int64_t)Beb_GetFirmwareSoftwareAPIVersion();
case DETECTOR_SOFTWARE_VERSION:
retval= GITREV;
retval= (retval <<32) | GITDATE;
//cprintf(BLUE,"git date:%x, git rev:%x\n",GITDATE,GITREV);
break;
return (GITDATE & 0xFFFFFF);
default:
break;
}