detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 19:43:41 +01:00
Code Issues Actions Packages Releases Activity

updated ctb and moench, moench not tested

Browse Source
This commit is contained in:
maliakal_d
2019-03-05 09:38:10 +01:00
parent 08bd2378f4
commit c56561bc9f
17 changed files with 433 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -193,7 +193,7 @@ int64_t getDetectorId(enum idMode arg) {
case DETECTOR_FIRMWARE_VERSION:
return (int64_t)getFirmwareVersion();
case SOFTWARE_FIRMWARE_API_VERSION:
return (int64_t)Beb_GetFirmwareSoftwareAPIVersion();
return (int64_t)getFirmwareAPIVersion();
case DETECTOR_SOFTWARE_VERSION:
return (GITDATE & 0xFFFFFF);
case CLIENT_SOFTWARE_API_VERSION:
@@ -214,6 +214,14 @@ u_int64_t getFirmwareVersion() {
#endif
}
u_int64_t getFirmwareAPIVersion() {
#ifdef VIRTUAL
return 0;
#else
return (u_int64_t)Beb_GetFirmwareSoftwareAPIVersion();
#endif
}
u_int32_t getDetectorNumber() {