detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 12:57:13 +02: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

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;