diff --git a/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h b/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h index 1885dd08b..03db3a1bd 100644 --- a/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h +++ b/slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h @@ -21,7 +21,7 @@ #define DAQ_REG_SUBFRAME_PERIOD 7 //also pg and fifo status register -#define DAQ_REG_RO_OFFSET 12 +#define DAQ_REG_RO_OFFSET 20 #define DAQ_REG_STATUS (DAQ_REG_RO_OFFSET + 0) //also pg and fifo status register #define FEB_REG_STATUS (DAQ_REG_RO_OFFSET + 3) #define MEAS_SUBPERIOD_REG (DAQ_REG_RO_OFFSET + 4) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.3.23.0 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.0 similarity index 99% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.3.23.0 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.0 index 9aa4af1ae..99b9a7d81 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.3.23.0 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.1.0.24.0 differ diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index 1ea1d1f8b..6740c9ad9 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: 3e2b471ee1e6bbbd0fbce6292c30e4403a4f4b2f -Revision: 352 -Branch: quad +Repsitory UUID: 27f3af53657b744f43b79f9751909ae4e289ad29 +Revision: 354 +Branch: 4.1.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4117 -Last Changed Date: 2019-07-10 17:22:28.000000002 +0200 ./Beb.c +Last Changed Rev: 4121 +Last Changed Date: 2019-07-29 09:33:57.000000001 +0200 ./FebRegisterDefs.h diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 84bfa4364..9f827070f 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 "3e2b471ee1e6bbbd0fbce6292c30e4403a4f4b2f" +#define GITREPUUID "27f3af53657b744f43b79f9751909ae4e289ad29" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4117 -#define GITDATE 0x20190710 -#define GITBRANCH "quad" +#define GITREV 0x4121 +#define GITDATE 0x20190729 +#define GITBRANCH "4.1.0-rc" diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h index 5eae871d9..1f9382f20 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h @@ -12,7 +12,7 @@ #include #define GOODBYE (-200) -#define REQUIRED_FIRMWARE_VERSION (22) +#define REQUIRED_FIRMWARE_VERSION (24) #define IDFILECOMMAND "more /home/root/executables/detid.txt" #define STATUS_IDLE 0