diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 1eeaeed15..79a15bde8 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui -URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git -Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git -Repsitory UUID: c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99 -Revision: 439 -Branch: 3.0.1 -Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 3187 -Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/qTabSettings.cpp +URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repsitory UUID: 12e4530702b836985408bc1e85ddb0d996a0153b +Revision: 450 +Branch: 3.1.0-rc +Last Changed Author: Dhanya_Thattil +Last Changed Rev: 3445 +Last Changed Date: 2018-02-27 10:27:24.000000002 +0100 ./CMakeLists.txt diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 61d748cf1..b09efac21 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,6 +1,6 @@ -#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" -#define GITREPUUID "c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99" -#define GITAUTH "Dhanya_Maliakal" -#define GITREV 0x3187 -#define GITDATE 0x20171206 -#define GITBRANCH "3.0.1" +#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" +#define GITREPUUID "12e4530702b836985408bc1e85ddb0d996a0153b" +#define GITAUTH "Dhanya_Thattil" +#define GITREV 0x3445 +#define GITDATE 0x20180227 +#define GITBRANCH "3.1.0-rc" diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster index 934f86b70..0167b8fd3 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave index b92f53b65..2a735216d 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.1.16.1 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0 similarity index 99% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.1.16.1 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0 index ed605b7e6..32e5e515f 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.1.16.1 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0 differ diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index 3bb5f38db..d047cac0f 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: ecf1e9fac1aaa7034e462638bd01965df892726a -Revision: 313 -Branch: 3.0.1 +Repsitory UUID: 12e4530702b836985408bc1e85ddb0d996a0153b +Revision: 314 +Branch: 3.1.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3348 -Last Changed Date: 2018-02-07 11:04:32.000000002 +0100 ./FebRegisterDefs.h +Last Changed Rev: 3445 +Last Changed Date: 2018-02-23 13:07:05.000000002 +0100 ./Makefile.virtual diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index dd1c9250b..1a7c626de 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 "ecf1e9fac1aaa7034e462638bd01965df892726a" +#define GITREPUUID "12e4530702b836985408bc1e85ddb0d996a0153b" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3348 -#define GITDATE 0x20180207 -#define GITBRANCH "3.0.1" +#define GITREV 0x3445 +#define GITDATE 0x20180223 +#define GITBRANCH "3.1.0-rc" diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList_virtual.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList_virtual.c index 4646182e7..26c97a01c 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList_virtual.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList_virtual.c @@ -78,7 +78,7 @@ int normal = 0; /* basic tests */ -void checkFirmwareCompatibility(){ +void checkFirmwareCompatibility(int flag){ cprintf(BLUE,"\n\n" "********************************************************\n" "***************** EIGER Virtual Server *****************\n" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 82b2afd33..0b8976199 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware -URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git -Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git -Repsitory UUID: c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99 -Revision: 1629 -Branch: 3.0.1 -Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 3187 -Last Changed Date: 2017-12-06 19:00:50.000000002 +0100 ./threadFiles/ThreadPool.o +URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repsitory UUID: 12e4530702b836985408bc1e85ddb0d996a0153b +Revision: 1705 +Branch: 3.1.0-rc +Last Changed Author: Dhanya_Thattil +Last Changed Rev: 3445 +Last Changed Date: 2018-02-27 12:23:41.000000002 +0100 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.4 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.0 similarity index 99% rename from slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.4 rename to slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.0 index 14e9d445d..7553d5cd1 100755 Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.4 and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.0 differ diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardVirtualServer b/slsDetectorSoftware/gotthardDetectorServer/gotthardVirtualServer index 00f509290..ce3412978 100755 Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardVirtualServer and b/slsDetectorSoftware/gotthardDetectorServer/gotthardVirtualServer differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual index 0615b449f..cd39898fa 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.1.4 b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.0 similarity index 99% rename from slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.1.4 rename to slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.0 index a8b59d8b5..4870d23a2 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.1.4 and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.0 differ diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 61d748cf1..b09efac21 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,6 +1,6 @@ -#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" -#define GITREPUUID "c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99" -#define GITAUTH "Dhanya_Maliakal" -#define GITREV 0x3187 -#define GITDATE 0x20171206 -#define GITBRANCH "3.0.1" +#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" +#define GITREPUUID "12e4530702b836985408bc1e85ddb0d996a0153b" +#define GITAUTH "Dhanya_Thattil" +#define GITREV 0x3445 +#define GITDATE 0x20180227 +#define GITBRANCH "3.1.0-rc" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 12becbdbe..0a24f9d54 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware -URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git -Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git -Repsitory UUID: 7436d6c8d3538cef443e0fa76bc01762fd6cc246 -Revision: 688 -Branch: 3.0.1 -Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 3186 -Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/UDPStandardImplementation.cpp +URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repsitory UUID: 12e4530702b836985408bc1e85ddb0d996a0153b +Revision: 707 +Branch: 3.1.0-rc +Last Changed Author: Dhanya_Thattil +Last Changed Rev: 3445 +Last Changed Date: 2018-02-26 12:17:44.000000002 +0100 ./src/slsReceiverTCPIPInterface.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 12e1df72b..5f06dd741 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,6 +1,6 @@ -#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" -#define GITREPUUID "7436d6c8d3538cef443e0fa76bc01762fd6cc246" -#define GITAUTH "Dhanya_Maliakal" -#define GITREV 0x3186 -#define GITDATE 0x20171206 -#define GITBRANCH "3.0.1" +#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" +#define GITREPUUID "12e4530702b836985408bc1e85ddb0d996a0153b" +#define GITAUTH "Dhanya_Thattil" +#define GITREV 0x3445 +#define GITDATE 0x20180226 +#define GITBRANCH "3.1.0-rc"