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

Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

Browse Source
This commit is contained in:
Erik Frojdh
2018-10-11 14:43:47 +02:00
parent 4d69b6d3a1 302f31678f
commit a28932bb6c
207 changed files with 100 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
*.o
*~
#*#
.project

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c → slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.c → slsDetectorServers/eigerDetectorServer/Beb.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.h → slsDetectorServers/eigerDetectorServer/Beb.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.c → slsDetectorServers/eigerDetectorServer/Feb.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.h → slsDetectorServers/eigerDetectorServer/Feb.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.c → slsDetectorServers/eigerDetectorServer/FebControl.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.h → slsDetectorServers/eigerDetectorServer/FebControl.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.c → slsDetectorServers/eigerDetectorServer/FebInterface.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.h → slsDetectorServers/eigerDetectorServer/FebInterface.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h → slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.c → slsDetectorServers/eigerDetectorServer/HardwareIO.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.h → slsDetectorServers/eigerDetectorServer/HardwareIO.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h → slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c → slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h → slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile → slsDetectorServers/eigerDetectorServer/Makefile
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile.virtual → slsDetectorServers/eigerDetectorServer/Makefile.virtual
View File

1
slsDetectorServers/eigerDetectorServer/ansi.h Symbolic link
View File

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

BIN
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor → slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor
View File

Binary file not shown.

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster → slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave → slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1 → slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1
View File

1
slsDetectorServers/eigerDetectorServer/communication_funcs.c Symbolic link
View File

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

1
slsDetectorServers/eigerDetectorServer/communication_funcs.h Symbolic link
View File

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

9
slsDetectorServers/eigerDetectorServer/gitInfo.txt Normal file
View File

@ -0,0 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: c24a9b223cbb066d3851599f4d977ae835feffe4
Revision: 0
Branch: refactor
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4099
Last Changed Date: 2018-10-11 13:46:08.000000002 +0200 ./xparameters.h

6
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h → slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "b9f97f42a6a369dfb5c484bffeaa7a417e9cbca1"
#define GITREPUUID "c24a9b223cbb066d3851599f4d977ae835feffe4"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4067
#define GITDATE 0x20181008
#define GITREV 0x4099
#define GITDATE 0x20181011
#define GITBRANCH "refactor"

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfoEigerTmp.h → slsDetectorServers/eigerDetectorServer/gitInfoEigerTmp.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/renameServer.sh → slsDetectorServers/eigerDetectorServer/renameServer.sh
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c → slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h → slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer.c → slsDetectorServers/eigerDetectorServer/slsDetectorServer.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h → slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.c → slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.c
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.h → slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.h
View File

1
slsDetectorServers/eigerDetectorServer/sls_detector_defs.h Symbolic link
View File

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

1
slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h Symbolic link
View File

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

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/updateAPIVersion.sh → slsDetectorServers/eigerDetectorServer/updateAPIVersion.sh
View File

6
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh → slsDetectorServers/eigerDetectorServer/updateGitVersion.sh
View File

@ -1,11 +1,11 @@
SERVER=eigerDetectorServer
MAINDIR=slsDetectorPackage
SPECDIR=slsDetectorSoftware/slsDetectorServers/$SERVER
SPECDIR=slsDetectorServers/$SERVER
TMPFILE=gitInfoEigerTmp.h
INCLFILE=gitInfoEiger.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

1
slsDetectorServers/eigerDetectorServer/versionAPI.h Symbolic link
View File

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

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xfs_types.h → slsDetectorServers/eigerDetectorServer/xfs_types.h
View File

0
slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xparameters.h → slsDetectorServers/eigerDetectorServer/xparameters.h
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/.target-makefrag → slsDetectorServers/gotthardDetectorServer/.target-makefrag
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/AD9257.h → slsDetectorServers/gotthardDetectorServer/AD9257.h
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile → slsDetectorServers/gotthardDetectorServer/Makefile
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile.virtual → slsDetectorServers/gotthardDetectorServer/Makefile.virtual
View File

1
slsDetectorServers/gotthardDetectorServer/ansi.h Symbolic link
View File

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

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h → slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h
View File

1
slsDetectorServers/gotthardDetectorServer/communication_funcs.c Symbolic link
View File

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

1
slsDetectorServers/gotthardDetectorServer/communication_funcs.h Symbolic link
View File

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

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/config.txt → slsDetectorServers/gotthardDetectorServer/config.txt
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.c → slsDetectorServers/gotthardDetectorServer/firmware_funcs.c
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.h → slsDetectorServers/gotthardDetectorServer/firmware_funcs.h
View File

9
slsDetectorServers/gotthardDetectorServer/gitInfo.txt Normal file
View File

@ -0,0 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 32924def331e065c3955c593c07ceef2955e89e6
Revision: 1
Branch: refactor
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4104
Last Changed Date: 2018-10-11 13:46:09.000000002 +0200 ./server_funcs.h

6
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h → slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -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"

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h → slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h
View File

BIN
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor → slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor
View File

Binary file not shown.

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual → slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/registers_g.h → slsDetectorServers/gotthardDetectorServer/registers_g.h
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server.c → slsDetectorServers/gotthardDetectorServer/server.c
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_defs.h → slsDetectorServers/gotthardDetectorServer/server_defs.h
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.c → slsDetectorServers/gotthardDetectorServer/server_funcs.c
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.h → slsDetectorServers/gotthardDetectorServer/server_funcs.h
View File

1
slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h Symbolic link
View File

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

1
slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h Symbolic link
View File

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

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/stop_server.c → slsDetectorServers/gotthardDetectorServer/stop_server.c
View File

0
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh → slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh
View File

6
slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh → slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh
View File

@ -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

1
slsDetectorServers/gotthardDetectorServer/versionAPI.h Symbolic link
View File

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

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/AD9257.h → slsDetectorServers/jctbDetectorServer/AD9257.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/Makefile → slsDetectorServers/jctbDetectorServer/Makefile
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/ansi.h → slsDetectorServers/jctbDetectorServer/ansi.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/bf_init.sh → slsDetectorServers/jctbDetectorServer/bf_init.sh
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.c → slsDetectorServers/jctbDetectorServer/blackfin.c
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.h → slsDetectorServers/jctbDetectorServer/blackfin.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/commonServerFunctions.h → slsDetectorServers/jctbDetectorServer/commonServerFunctions.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.c → slsDetectorServers/jctbDetectorServer/communication_funcs.c
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.h → slsDetectorServers/jctbDetectorServer/communication_funcs.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c → slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.c → slsDetectorServers/jctbDetectorServer/firmware_funcs.c
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.h → slsDetectorServers/jctbDetectorServer/firmware_funcs.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/get_server.sh → slsDetectorServers/jctbDetectorServer/get_server.sh
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfo.txt → slsDetectorServers/jctbDetectorServer/gitInfo.txt
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoench.h → slsDetectorServers/jctbDetectorServer/gitInfoMoench.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h → slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer → slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.c → slsDetectorServers/jctbDetectorServer/mcb_funcs.c
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.h → slsDetectorServers/jctbDetectorServer/mcb_funcs.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh → slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c → slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/test.p → slsDetectorServers/jctbDetectorServer/patternGenerator/test.p
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/program_fpga.sh → slsDetectorServers/jctbDetectorServer/program_fpga.sh
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/registers_m.h → slsDetectorServers/jctbDetectorServer/registers_m.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server.c → slsDetectorServers/jctbDetectorServer/server.c
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_defs.h → slsDetectorServers/jctbDetectorServer/server_defs.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.c → slsDetectorServers/jctbDetectorServer/server_funcs.c
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.h → slsDetectorServers/jctbDetectorServer/server_funcs.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.c → slsDetectorServers/jctbDetectorServer/sharedmemory.c
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.h → slsDetectorServers/jctbDetectorServer/sharedmemory.h
View File

0
slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/slow_adc.c → slsDetectorServers/jctbDetectorServer/slow_adc.c
View File

Some files were not shown because too many files have changed in this diff Show More