detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 07:38:04 +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

16
slsDetectorSoftware/moenchDetectorServer/gitInfo.txt
View File

@@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/moenchDetectorServer
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: 9f1b82c18ab0893d65bfadeb646b8ea244614632
Revision: 83
Branch: developer
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1443
Last Changed Date: 2017-07-10 11:03:27.000000002 +0200 ./Makefile
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: e6bd874a88493557fc5127d4a1686832299aaf06
Revision: 85
Branch: 3.0.1
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3346
Last Changed Date: 2018-02-07 09:14:36.000000002 +0100 ./server_funcs.c

12
slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
View File

@@ -1,6 +1,6 @@
#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
#define GITREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632"
#define GITAUTH "Dhanya_Maliakal"
#define GITREV 0x1443
#define GITDATE 0x20170710
#define GITBRANCH "blabla"
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "e6bd874a88493557fc5127d4a1686832299aaf06"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3346
#define GITDATE 0x20180207
#define GITBRANCH "3.0.1"

BIN
slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv2.0.3
View File

Binary file not shown.

BIN
slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv3.0.1.0 Executable file
View File

Binary file not shown.

8
slsDetectorSoftware/moenchDetectorServer/server_funcs.c
View File

@@ -593,13 +593,9 @@ int get_id(int file_des) {
retval=getDetectorNumber();
break;
case DETECTOR_FIRMWARE_VERSION:
retval=getFirmwareSVNVersion();
retval=(retval <<32) | getFirmwareVersion();
break;
return (getFirmwareVersion() & 0xFFFFFF);
case DETECTOR_SOFTWARE_VERSION:
retval= GITREV;
retval= (retval <<32) | GITDATE;
break;
return (GITDATE & 0xFFFFFF);
default:
printf("Required unknown id %d \n", arg);
ret=FAIL;