diff --git a/slsDetectorSoftware/eigerDetectorServer/FebControl.c b/slsDetectorSoftware/eigerDetectorServer/FebControl.c index 9b8990955..b686f020b 100644 --- a/slsDetectorSoftware/eigerDetectorServer/FebControl.c +++ b/slsDetectorSoftware/eigerDetectorServer/FebControl.c @@ -1966,7 +1966,7 @@ int64_t Feb_Control_GetMeasuredPeriod() { unsigned int value = 0; Feb_Interface_ReadRegister(sub_num,MEAS_PERIOD_REG, &value); - return value*10; + return (int64_t)value*10; } int64_t Feb_Control_GetSubMeasuredPeriod() { @@ -1976,7 +1976,7 @@ int64_t Feb_Control_GetSubMeasuredPeriod() { unsigned int value = 0; Feb_Interface_ReadRegister(sub_num,MEAS_SUBPERIOD_REG, &value); - return value*10; + return (int64_t)value*10; } diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.1.22.0 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.1.22.1 similarity index 76% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.1.22.0 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.1.22.1 index 6f4f0ddf2..63e32f9fc 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.1.22.0 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.1.22.1 differ diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index d20ebe849..b442b6b9a 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: 2c08c1e7ce814934b4c943df2cc715c6bd406a83 -Revision: 349 +Repsitory UUID: ef3e01b9bdf3a6a08367e2448bcc92bd13cf73ad +Revision: 351 Branch: 4.0.1-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4031 -Last Changed Date: 2018-11-30 16:01:05.000000002 +0100 ./Makefile.virtual +Last Changed Rev: 4068 +Last Changed Date: 2019-02-06 14:44:47.000000002 +0100 ./xparameters.h diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index de02b21e2..cef8cc341 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 "2c08c1e7ce814934b4c943df2cc715c6bd406a83" +#define GITREPUUID "ef3e01b9bdf3a6a08367e2448bcc92bd13cf73ad" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4031 -#define GITDATE 0x20181130 +#define GITREV 0x4068 +#define GITDATE 0x20190206 #define GITBRANCH "4.0.1-rc"