diff --git a/slsDetectorServers/jungfrauDetectorServer/ansi.h b/slsDetectorServers/jungfrauDetectorServer/ansi.h index 1f2dbc999..4a82d0575 120000 --- a/slsDetectorServers/jungfrauDetectorServer/ansi.h +++ b/slsDetectorServers/jungfrauDetectorServer/ansi.h @@ -1 +1 @@ -../../../slsSupportLib/include/ansi.h \ No newline at end of file +../../slsSupportLib/include/ansi.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor index 206613888..49afdb448 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor differ diff --git a/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c index 19b563862..eacf9f393 120000 --- a/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c +++ b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c @@ -1 +1 @@ -../../../slsSupportLib/include/communication_funcs.c \ No newline at end of file +../../slsSupportLib/include/communication_funcs.c \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h index 7f8c3d192..72c567747 120000 --- a/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h +++ b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h @@ -1 +1 @@ -../../../slsSupportLib/include/communication_funcs.h \ No newline at end of file +../../slsSupportLib/include/communication_funcs.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt b/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt index e9a0c5f70..3de37899c 100644 --- a/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt +++ b/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ -Path: slsDetectorPackage/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer +Path: slsDetectorPackage/slsDetectorServers/jungfrauDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: b9f97f42a6a369dfb5c484bffeaa7a417e9cbca1 +Repsitory UUID: ee20932392a576a700f48140be02acb94b7eb6de Revision: 1 Branch: refactor Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4067 -Last Changed Date: 2018-10-08 13:53:39.000000002 +0200 ./Makefile.virtual +Last Changed Rev: 4103 +Last Changed Date: 2018-10-11 13:46:09.000000002 +0200 ./RegisterDefs.h diff --git a/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h index 3a8464eae..99a0a7b3d 100644 --- a/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h +++ b/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "b9f97f42a6a369dfb5c484bffeaa7a417e9cbca1" +#define GITREPUUID "ee20932392a576a700f48140be02acb94b7eb6de" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4067 -#define GITDATE 0x20181008 +#define GITREV 0x4103 +#define GITDATE 0x20181011 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h b/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h index 108fdd66a..2af30d73a 120000 --- a/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h @@ -1 +1 @@ -../../../slsSupportLib/include/sls_detector_defs.h \ No newline at end of file +../../slsSupportLib/include/sls_detector_defs.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h b/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h index a21957495..3f48959a9 120000 --- a/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h +++ b/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h @@ -1 +1 @@ -../../../slsSupportLib/include/sls_detector_funcs.h \ No newline at end of file +../../slsSupportLib/include/sls_detector_funcs.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h b/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h deleted file mode 120000 index fbea73b31..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h +++ /dev/null @@ -1 +0,0 @@ -../../../slsSupportLib/include/sls_receiver_defs.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h b/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h deleted file mode 120000 index 8f221c967..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h +++ /dev/null @@ -1 +0,0 @@ -../../../slsSupportLib/include/sls_receiver_funcs.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh b/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh index 917de1fcf..3994778d6 100755 --- a/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh +++ b/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh @@ -1,12 +1,12 @@ SERVER=jungfrauDetectorServer MAINDIR=slsDetectorPackage -SPECDIR=slsDetectorSoftware/slsDetectorServers/$SERVER +SPECDIR=slsDetectorServers/$SERVER TMPFILE=gitInfoJungfrauTmp.h INCLFILE=gitInfoJungfrau.h #evaluate the variables -EVALFILE=../../../evalVersionVariables.sh +EVALFILE=../../evalVersionVariables.sh source $EVALFILE @@ -25,7 +25,7 @@ OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}') #update INCLFILE if changes if [ "$OLDDATE" != "$NEWDATE" ]; then echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt - cd ../../../ + cd ../../ ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE cd $WD fi \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/versionAPI.h b/slsDetectorServers/jungfrauDetectorServer/versionAPI.h index 5336e713b..5e580d8bb 120000 --- a/slsDetectorServers/jungfrauDetectorServer/versionAPI.h +++ b/slsDetectorServers/jungfrauDetectorServer/versionAPI.h @@ -1 +1 @@ -../../../slsSupportLib/include/versionAPI.h \ No newline at end of file +../../slsSupportLib/include/versionAPI.h \ No newline at end of file diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index f9f45cea5..7302204dd 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -1,6 +1,6 @@ /** API versions */ #define APIRECEIVER 0x180927 #define APIEIGER 0x181008 -#define APIJUNGFRAU 0x180925 +#define APIJUNGFRAU 0x181008 #define APIGOTTHARD 0x180928