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

merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file

Browse Source
This commit is contained in:
maliakal_d
2018-02-07 11:02:36 +01:00
parent 3da6a6df65 ecf1e9fac1
commit 897cbac27d
31 changed files with 170 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 0649626842512b772ab660c36dece505f3244aee
Revision: 212
Repsitory UUID: e6bd874a88493557fc5127d4a1686832299aaf06
Revision: 217
Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 3318
Last Changed Date: 2017-12-19 17:45:11.000000002 +0100 ./server_funcs.c
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3346
Last Changed Date: 2018-02-07 09:09:56.000000002 +0100 ./server_funcs.c

8
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "0649626842512b772ab660c36dece505f3244aee"
#define GITAUTH "Dhanya_Maliakal"
#define GITREV 0x3318
#define GITDATE 0x20171219
#define GITREPUUID "e6bd874a88493557fc5127d4a1686832299aaf06"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3346
#define GITDATE 0x20180207
#define GITBRANCH "3.0.1"

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_developer Executable file
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.7
View File

Binary file not shown.

8
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -588,13 +588,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;