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

fixed eiger virtual software versions

Browse Source
This commit is contained in:
maliakal_d 2019-10-04 09:41:21 +02:00
parent e4645a8273
commit 696073b505
6 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.4 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.5
View File

Binary file not shown.

10
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 2a88bc6a1eac9777390af1d1fb9aa02960ebfe2d Repsitory UUID: e4645a8273c8265bc584579d5f7f8eb6dc4379f7
Revision: 359 Revision: 360
Branch: 4.1.0-rc Branch: 4.1.0-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: GitHub_GitHub
Last Changed Rev: 4130 Last Changed Rev: 4138
Last Changed Date: 2019-08-14 09:25:41.000000001 +0200 ./xparameters.h Last Changed Date: 2019-10-04 09:28:27.000000001 +0200 ./xparameters.h

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "2a88bc6a1eac9777390af1d1fb9aa02960ebfe2d" #define GITREPUUID "e4645a8273c8265bc584579d5f7f8eb6dc4379f7"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "GitHub_GitHub"
#define GITREV 0x4130 #define GITREV 0x4138
#define GITDATE 0x20190814 #define GITDATE 0x20191004
#define GITBRANCH "4.1.0-rc" #define GITBRANCH "4.1.0-rc"

13
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -10,11 +10,11 @@
#endif #endif
#include "slsDetectorFunctionList.h" #include "slsDetectorFunctionList.h"
#ifndef VIRTUAL #include "versionAPI.h"
#include "gitInfoEiger.h" #include "gitInfoEiger.h"
#ifndef VIRTUAL
#include "FebControl.h" #include "FebControl.h"
#include "Beb.h" #include "Beb.h"
#include "versionAPI.h"
#endif #endif
int default_tau_from_file= -1; int default_tau_from_file= -1;
@ -200,10 +200,7 @@ void checkFirmwareCompatibility(int flag){
/* Ids */ /* Ids */
int64_t getDetectorId(enum idMode arg){ int64_t getDetectorId(enum idMode arg){
#ifdef VIRTUAL int64_t retval = 0;
return 0;
#else
int64_t retval = -1;
switch(arg){ switch(arg){
case DETECTOR_SERIAL_NUMBER: case DETECTOR_SERIAL_NUMBER:
@ -212,7 +209,9 @@ int64_t getDetectorId(enum idMode arg){
case DETECTOR_FIRMWARE_VERSION: case DETECTOR_FIRMWARE_VERSION:
return (int64_t)getFirmwareVersion(); return (int64_t)getFirmwareVersion();
case SOFTWARE_FIRMWARE_API_VERSION: case SOFTWARE_FIRMWARE_API_VERSION:
#ifndef VIRTUAL
return (int64_t)Beb_GetFirmwareSoftwareAPIVersion(); return (int64_t)Beb_GetFirmwareSoftwareAPIVersion();
#endif
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
return (GITDATE & 0xFFFFFF); return (GITDATE & 0xFFFFFF);
case CLIENT_SOFTWARE_API_VERSION: case CLIENT_SOFTWARE_API_VERSION:
@ -220,9 +219,7 @@ int64_t getDetectorId(enum idMode arg){
default: default:
break; break;
} }
return retval; return retval;
#endif
} }
u_int64_t getFirmwareVersion() { u_int64_t getFirmwareVersion() {