diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster index ee9f33b24..41dbf1b82 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave index f363ee778..3fb5134c0 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.4 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.5 similarity index 99% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.4 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.5 index 0b7255136..21e315387 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.4 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.5 differ diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index 8eb10d10c..2a268b487 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 2a88bc6a1eac9777390af1d1fb9aa02960ebfe2d -Revision: 359 +Repsitory UUID: e4645a8273c8265bc584579d5f7f8eb6dc4379f7 +Revision: 360 Branch: 4.1.0-rc -Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4130 -Last Changed Date: 2019-08-14 09:25:41.000000001 +0200 ./xparameters.h +Last Changed Author: GitHub_GitHub +Last Changed Rev: 4138 +Last Changed Date: 2019-10-04 09:28:27.000000001 +0200 ./xparameters.h diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 2307675e4..c6790c62b 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "2a88bc6a1eac9777390af1d1fb9aa02960ebfe2d" -#define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4130 -#define GITDATE 0x20190814 +#define GITREPUUID "e4645a8273c8265bc584579d5f7f8eb6dc4379f7" +#define GITAUTH "GitHub_GitHub" +#define GITREV 0x4138 +#define GITDATE 0x20191004 #define GITBRANCH "4.1.0-rc" diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 758a80a6f..b45a906c5 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -10,11 +10,11 @@ #endif #include "slsDetectorFunctionList.h" -#ifndef VIRTUAL +#include "versionAPI.h" #include "gitInfoEiger.h" +#ifndef VIRTUAL #include "FebControl.h" #include "Beb.h" -#include "versionAPI.h" #endif int default_tau_from_file= -1; @@ -200,19 +200,18 @@ void checkFirmwareCompatibility(int flag){ /* Ids */ int64_t getDetectorId(enum idMode arg){ -#ifdef VIRTUAL - return 0; -#else - int64_t retval = -1; + int64_t retval = 0; switch(arg){ case DETECTOR_SERIAL_NUMBER: retval = getDetectorNumber();/** to be implemented with mac? */ break; case DETECTOR_FIRMWARE_VERSION: - return (int64_t)getFirmwareVersion(); + return (int64_t)getFirmwareVersion(); case SOFTWARE_FIRMWARE_API_VERSION: +#ifndef VIRTUAL return (int64_t)Beb_GetFirmwareSoftwareAPIVersion(); +#endif case DETECTOR_SOFTWARE_VERSION: return (GITDATE & 0xFFFFFF); case CLIENT_SOFTWARE_API_VERSION: @@ -220,9 +219,7 @@ int64_t getDetectorId(enum idMode arg){ default: break; } - - return retval; -#endif + return retval; } u_int64_t getFirmwareVersion() {