detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity

print correctly the software versiondate

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-07-06 11:29:26 +02:00
parent 9c8137d892
commit b06a1e5a3c
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.2
View File

Binary file not shown.

1
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -241,6 +241,7 @@ int64_t getDetectorId(enum idMode arg){
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= SVNREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | SVNDATE;
//cprintf(BLUE,"git date:%x, git rev:%x\n",SVNDATE,SVNREV);
break; break;
default: default:
break; break;

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -47,7 +47,7 @@ void checkFirmwareCompatibility(){
cprintf(BLUE,"\n\n********************************************************\n" cprintf(BLUE,"\n\n********************************************************\n"
"**********************EIGER Server**********************\n" "**********************EIGER Server**********************\n"
"********************************************************\n"); "********************************************************\n");
cprintf(BLUE,"\nFirmware Version: %lld\nSoftware Version: %lld\n\n", cprintf(BLUE,"\nFirmware Version: %lld\nSoftware Version: %llx\n\n",
getDetectorId(DETECTOR_FIRMWARE_VERSION), getDetectorId(DETECTOR_SOFTWARE_VERSION)); getDetectorId(DETECTOR_FIRMWARE_VERSION), getDetectorId(DETECTOR_SOFTWARE_VERSION));
//check for firmware version compatibility //check for firmware version compatibility