diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt index 859caa9c9..ee5115894 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer -URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: c5777e517c451226e3275e6948895baee21a1f94 -Revision: 210 -Branch: gotthardfix +URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repsitory UUID: 0649626842512b772ab660c36dece505f3244aee +Revision: 212 +Branch: 3.0.1 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1585 -Last Changed Date: 2017-11-09 13:57:04.000000002 +0100 ./server_funcs.c +Last Changed Rev: 3318 +Last Changed Date: 2017-12-19 17:45:11.000000002 +0100 ./server_funcs.c diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h index 8c07d218f..25844d8df 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h @@ -1,6 +1,6 @@ -#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" -#define GITREPUUID "c5777e517c451226e3275e6948895baee21a1f94" +#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" +#define GITREPUUID "0649626842512b772ab660c36dece505f3244aee" #define GITAUTH "Dhanya_Maliakal" -#define GITREV 0x1585 -#define GITDATE 0x20171109 -#define GITBRANCH "blabla" +#define GITREV 0x3318 +#define GITDATE 0x20171219 +#define GITBRANCH "3.0.1" diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.6 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.6 deleted file mode 100755 index f14fa775b..000000000 Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.6 and /dev/null differ diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.7 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.7 new file mode 100755 index 000000000..bc5c03120 Binary files /dev/null and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.7 differ diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index 1bcc4f045..b2fe9cec5 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -1049,7 +1049,7 @@ int get_adc(int file_des) { ret=FAIL; } ind=arg[0]; - imod=arg[1]; + imod=0;//arg[1]; #ifdef VERBOSE printf("Getting ADC %d of module %d\n", ind, imod);