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

updated gotthard binary, not run

Browse Source
This commit is contained in:
maliakal_d 2018-10-11 14:40:52 +02:00
parent 32924def33
commit 302f31678f
13 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/gotthardDetectorServer/ansi.h
View File

@ -1 +1 @@
../../../slsSupportLib/include/ansi.h ../../slsSupportLib/include/ansi.h

2
slsDetectorServers/gotthardDetectorServer/communication_funcs.c
View File

@ -1 +1 @@
../../../slsSupportLib/include/communication_funcs.c ../../slsSupportLib/include/communication_funcs.c

2
slsDetectorServers/gotthardDetectorServer/communication_funcs.h
View File

@ -1 +1 @@
../../../slsSupportLib/include/communication_funcs.h ../../slsSupportLib/include/communication_funcs.h

10
slsDetectorServers/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer
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: 923a7e8936cbfe32a8781554de32c66be2f78035 Repsitory UUID: 32924def331e065c3955c593c07ceef2955e89e6
Revision: 2 Revision: 1
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4068 Last Changed Rev: 4104
Last Changed Date: 2018-10-09 09:15:04.000000002 +0200 ./firmware_funcs.c Last Changed Date: 2018-10-11 13:46:09.000000002 +0200 ./server_funcs.h

6
slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.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 "923a7e8936cbfe32a8781554de32c66be2f78035" #define GITREPUUID "32924def331e065c3955c593c07ceef2955e89e6"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4068 #define GITREV 0x4104
#define GITDATE 0x20181009 #define GITDATE 0x20181011
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

BIN
slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor
View File

Binary file not shown.

2
slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h
View File

@ -1 +1 @@
../../../slsSupportLib/include/sls_detector_defs.h ../../slsSupportLib/include/sls_detector_defs.h

2
slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h
View File

@ -1 +1 @@
../../../slsSupportLib/include/sls_detector_funcs.h ../../slsSupportLib/include/sls_detector_funcs.h

1
slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h
View File

@ -1 +0,0 @@
../../../slsSupportLib/include/sls_receiver_defs.h

1
slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h
View File

@ -1 +0,0 @@
../../../slsSupportLib/include/sls_receiver_funcs.h

6
slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh
View File

@ -1,11 +1,11 @@
SERVER=gotthardDetectorServer SERVER=gotthardDetectorServer
MAINDIR=slsDetectorPackage MAINDIR=slsDetectorPackage
SPECDIR=slsDetectorSoftware/slsDetectorServers/$SERVER SPECDIR=slsDetectorServers/$SERVER
TMPFILE=gitInfoGotthardTmp.h TMPFILE=gitInfoGotthardTmp.h
INCLFILE=gitInfoGotthard.h INCLFILE=gitInfoGotthard.h
#evaluate the variables #evaluate the variables
EVALFILE=../../../evalVersionVariables.sh EVALFILE=../../evalVersionVariables.sh
source $EVALFILE source $EVALFILE
@ -24,7 +24,7 @@ OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then 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 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 ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE
cd $WD cd $WD
fi fi

2
slsDetectorServers/gotthardDetectorServer/versionAPI.h
View File

@ -1 +1 @@
../../../slsSupportLib/include/versionAPI.h ../../slsSupportLib/include/versionAPI.h

2
slsSupportLib/include/versionAPI.h
View File

@ -2,5 +2,5 @@
#define APIRECEIVER 0x180927 #define APIRECEIVER 0x180927
#define APIEIGER 0x181008 #define APIEIGER 0x181008
#define APIJUNGFRAU 0x181008 #define APIJUNGFRAU 0x181008
#define APIGOTTHARD 0x180928 #define APIGOTTHARD 0x181009