detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-09 03:20:42 +02:00
Code Issues Actions Packages Releases Activity

updating versions to 3.1.0

Browse Source
This commit is contained in:
maliakal_d 2018-02-27 12:40:53 +01:00
parent 12e4530702
commit 61e7c0148f
16 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99 Repsitory UUID: 12e4530702b836985408bc1e85ddb0d996a0153b
Revision: 439 Revision: 450
Branch: 3.0.1 Branch: 3.1.0-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3187 Last Changed Rev: 3445
Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/qTabSettings.cpp Last Changed Date: 2018-02-27 10:27:24.000000002 +0100 ./CMakeLists.txt

12
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99" #define GITREPUUID "12e4530702b836985408bc1e85ddb0d996a0153b"
#define GITAUTH "Dhanya_Maliakal" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3187 #define GITREV 0x3445
#define GITDATE 0x20171206 #define GITDATE 0x20180227
#define GITBRANCH "3.0.1" #define GITBRANCH "3.1.0-rc"

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.1.16.1 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0
View File

Binary file not shown.

10
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
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: ecf1e9fac1aaa7034e462638bd01965df892726a Repsitory UUID: 12e4530702b836985408bc1e85ddb0d996a0153b
Revision: 313 Revision: 314
Branch: 3.0.1 Branch: 3.1.0-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3348 Last Changed Rev: 3445
Last Changed Date: 2018-02-07 11:04:32.000000002 +0100 ./FebRegisterDefs.h Last Changed Date: 2018-02-23 13:07:05.000000002 +0100 ./Makefile.virtual

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.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 "ecf1e9fac1aaa7034e462638bd01965df892726a" #define GITREPUUID "12e4530702b836985408bc1e85ddb0d996a0153b"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3348 #define GITREV 0x3445
#define GITDATE 0x20180207 #define GITDATE 0x20180223
#define GITBRANCH "3.0.1" #define GITBRANCH "3.1.0-rc"

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList_virtual.c
View File

@ -78,7 +78,7 @@ int normal = 0;
/* basic tests */ /* basic tests */
void checkFirmwareCompatibility(){ void checkFirmwareCompatibility(int flag){
cprintf(BLUE,"\n\n" cprintf(BLUE,"\n\n"
"********************************************************\n" "********************************************************\n"
"***************** EIGER Virtual Server *****************\n" "***************** EIGER Virtual Server *****************\n"

16
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99 Repsitory UUID: 12e4530702b836985408bc1e85ddb0d996a0153b
Revision: 1629 Revision: 1705
Branch: 3.0.1 Branch: 3.1.0-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3187 Last Changed Rev: 3445
Last Changed Date: 2017-12-06 19:00:50.000000002 +0100 ./threadFiles/ThreadPool.o Last Changed Date: 2018-02-27 12:23:41.000000002 +0100 ./threadFiles/ThreadPool.o

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.4 → slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.0
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardVirtualServer
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.1.4 → slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.0
View File

Binary file not shown.

12
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99" #define GITREPUUID "12e4530702b836985408bc1e85ddb0d996a0153b"
#define GITAUTH "Dhanya_Maliakal" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3187 #define GITREV 0x3445
#define GITDATE 0x20171206 #define GITDATE 0x20180227
#define GITBRANCH "3.0.1" #define GITBRANCH "3.1.0-rc"

16
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 7436d6c8d3538cef443e0fa76bc01762fd6cc246 Repsitory UUID: 12e4530702b836985408bc1e85ddb0d996a0153b
Revision: 688 Revision: 707
Branch: 3.0.1 Branch: 3.1.0-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3186 Last Changed Rev: 3445
Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/UDPStandardImplementation.cpp Last Changed Date: 2018-02-26 12:17:44.000000002 +0100 ./src/slsReceiverTCPIPInterface.cpp

12
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "7436d6c8d3538cef443e0fa76bc01762fd6cc246" #define GITREPUUID "12e4530702b836985408bc1e85ddb0d996a0153b"
#define GITAUTH "Dhanya_Maliakal" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3186 #define GITREV 0x3445
#define GITDATE 0x20171206 #define GITDATE 0x20180226
#define GITBRANCH "3.0.1" #define GITBRANCH "3.1.0-rc"