detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

Browse Source
This commit is contained in:
Erik Frojdh 2019-04-04 12:19:39 +02:00
commit 05720c12ac
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_refactor Executable file
View File

Binary file not shown.

12
slsDetectorServers/ctbDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer
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: 45b837b42a9f190cb68688fd2b1a8d77c3050578 Repsitory UUID: c284b2439746a148dcdb1249d9f95ce1c6bf06dd
Revision: 52 Revision: 53
Branch: program2 Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Erik_Frojdh
Last Changed Rev: 4490 Last Changed Rev: 4519
Last Changed Date: 2019-04-02 17:21:25.000000002 +0200 ./slsDetectorServer_defs.h Last Changed Date: 2019-04-04 11:50:16.000000002 +0200 ./slsDetectorServer_defs.h

10
slsDetectorServers/ctbDetectorServer/gitInfoCtb.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 "45b837b42a9f190cb68688fd2b1a8d77c3050578" #define GITREPUUID "c284b2439746a148dcdb1249d9f95ce1c6bf06dd"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Erik_Frojdh"
#define GITREV 0x4490 #define GITREV 0x4519
#define GITDATE 0x20190402 #define GITDATE 0x20190404
#define GITBRANCH "program2" #define GITBRANCH "refactor"

2
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -4,7 +4,7 @@
#define MIN_REQRD_VRSN_T_RD_API 0x181130 #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) #define CTRL_SRVR_INIT_TIME_US (1 * 1000 * 1000)

2
slsSupportLib/include/versionAPI.h
View File

@ -3,6 +3,6 @@
#define APIEIGER 0x181031 #define APIEIGER 0x181031
#define APIJUNGFRAU 0x190111 #define APIJUNGFRAU 0x190111
#define APIGOTTHARD 0x190108 #define APIGOTTHARD 0x190108
#define APICTB 0x190311 #define APICTB 0x190402
#define APIMOENCH 0x181108 #define APIMOENCH 0x181108