diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_refactor b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_refactor new file mode 100755 index 000000000..341d61559 Binary files /dev/null and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_refactor differ diff --git a/slsDetectorServers/ctbDetectorServer/gitInfo.txt b/slsDetectorServers/ctbDetectorServer/gitInfo.txt index 23624f0bb..e2f214e14 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfo.txt +++ b/slsDetectorServers/ctbDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 45b837b42a9f190cb68688fd2b1a8d77c3050578 -Revision: 52 -Branch: program2 -Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4490 -Last Changed Date: 2019-04-02 17:21:25.000000002 +0200 ./slsDetectorServer_defs.h +Repsitory UUID: c284b2439746a148dcdb1249d9f95ce1c6bf06dd +Revision: 53 +Branch: refactor +Last Changed Author: Erik_Frojdh +Last Changed Rev: 4519 +Last Changed Date: 2019-04-04 11:50:16.000000002 +0200 ./slsDetectorServer_defs.h diff --git a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h index 7cb23e08f..ccd6b05cc 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h +++ b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "45b837b42a9f190cb68688fd2b1a8d77c3050578" -#define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4490 -#define GITDATE 0x20190402 -#define GITBRANCH "program2" +#define GITREPUUID "c284b2439746a148dcdb1249d9f95ce1c6bf06dd" +#define GITAUTH "Erik_Frojdh" +#define GITREV 0x4519 +#define GITDATE 0x20190404 +#define GITBRANCH "refactor" diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h index 82ba1a85e..b1271dbcb 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h @@ -4,7 +4,7 @@ #define MIN_REQRD_VRSN_T_RD_API 0x181130 -#define REQRD_FRMWR_VRSN 0x190310 +#define REQRD_FRMWR_VRSN 0x190402 #define CTRL_SRVR_INIT_TIME_US (1 * 1000 * 1000) diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 64146a7ed..5e373c9f6 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -3,6 +3,6 @@ #define APIEIGER 0x181031 #define APIJUNGFRAU 0x190111 #define APIGOTTHARD 0x190108 -#define APICTB 0x190311 +#define APICTB 0x190402 #define APIMOENCH 0x181108