diff --git a/slsDetectorServers/gotthardDetectorServer/ansi.h b/slsDetectorServers/gotthardDetectorServer/ansi.h index 1f2dbc999..4a82d0575 120000 --- a/slsDetectorServers/gotthardDetectorServer/ansi.h +++ b/slsDetectorServers/gotthardDetectorServer/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/gotthardDetectorServer/communication_funcs.c b/slsDetectorServers/gotthardDetectorServer/communication_funcs.c index 19b563862..eacf9f393 120000 --- a/slsDetectorServers/gotthardDetectorServer/communication_funcs.c +++ b/slsDetectorServers/gotthardDetectorServer/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/gotthardDetectorServer/communication_funcs.h b/slsDetectorServers/gotthardDetectorServer/communication_funcs.h index 7f8c3d192..72c567747 120000 --- a/slsDetectorServers/gotthardDetectorServer/communication_funcs.h +++ b/slsDetectorServers/gotthardDetectorServer/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/gotthardDetectorServer/gitInfo.txt b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt index 1ab0195ee..e2fd82f88 100644 --- a/slsDetectorServers/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ -Path: slsDetectorPackage/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer +Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 923a7e8936cbfe32a8781554de32c66be2f78035 -Revision: 2 +Repsitory UUID: 32924def331e065c3955c593c07ceef2955e89e6 +Revision: 1 Branch: refactor Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4068 -Last Changed Date: 2018-10-09 09:15:04.000000002 +0200 ./firmware_funcs.c +Last Changed Rev: 4104 +Last Changed Date: 2018-10-11 13:46:09.000000002 +0200 ./server_funcs.h diff --git a/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h index 0f82650bd..621db547e 100644 --- a/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "923a7e8936cbfe32a8781554de32c66be2f78035" +#define GITREPUUID "32924def331e065c3955c593c07ceef2955e89e6" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4068 -#define GITDATE 0x20181009 +#define GITREV 0x4104 +#define GITDATE 0x20181011 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor b/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor index 2258a891c..fdd03de64 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor and b/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor differ diff --git a/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h b/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h index 108fdd66a..2af30d73a 120000 --- a/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h +++ b/slsDetectorServers/gotthardDetectorServer/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/gotthardDetectorServer/sls_detector_funcs.h b/slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h index a21957495..3f48959a9 120000 --- a/slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h +++ b/slsDetectorServers/gotthardDetectorServer/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/gotthardDetectorServer/sls_receiver_defs.h b/slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h deleted file mode 120000 index fbea73b31..000000000 --- a/slsDetectorServers/gotthardDetectorServer/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/gotthardDetectorServer/sls_receiver_funcs.h b/slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h deleted file mode 120000 index 8f221c967..000000000 --- a/slsDetectorServers/gotthardDetectorServer/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/gotthardDetectorServer/updateGitVersion.sh b/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh index 933604ab8..367cf06c9 100755 --- a/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh +++ b/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh @@ -1,11 +1,11 @@ SERVER=gotthardDetectorServer MAINDIR=slsDetectorPackage -SPECDIR=slsDetectorSoftware/slsDetectorServers/$SERVER +SPECDIR=slsDetectorServers/$SERVER TMPFILE=gitInfoGotthardTmp.h INCLFILE=gitInfoGotthard.h #evaluate the variables -EVALFILE=../../../evalVersionVariables.sh +EVALFILE=../../evalVersionVariables.sh source $EVALFILE @@ -24,7 +24,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 diff --git a/slsDetectorServers/gotthardDetectorServer/versionAPI.h b/slsDetectorServers/gotthardDetectorServer/versionAPI.h index 5336e713b..5e580d8bb 120000 --- a/slsDetectorServers/gotthardDetectorServer/versionAPI.h +++ b/slsDetectorServers/gotthardDetectorServer/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 7302204dd..080d2def9 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -2,5 +2,5 @@ #define APIRECEIVER 0x180927 #define APIEIGER 0x181008 #define APIJUNGFRAU 0x181008 -#define APIGOTTHARD 0x180928 +#define APIGOTTHARD 0x181009