From 0ee7f67965610d28de35b86f99eb1f47be29027a Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 11 Oct 2018 14:20:50 +0200 Subject: [PATCH 1/3] detector servers moved out of slsdetector software, eiger server compiles with new headers --- slsDetectorServers/.gitignore | 4 ++ .../eigerDetectorServer/9mhvserial_bf.c | 0 .../eigerDetectorServer/Beb.c | 0 .../eigerDetectorServer/Beb.h | 0 .../eigerDetectorServer/Feb.c | 0 .../eigerDetectorServer/Feb.h | 0 .../eigerDetectorServer/FebControl.c | 0 .../eigerDetectorServer/FebControl.h | 0 .../eigerDetectorServer/FebInterface.c | 0 .../eigerDetectorServer/FebInterface.h | 0 .../eigerDetectorServer/FebRegisterDefs.h | 0 .../eigerDetectorServer/HardwareIO.c | 0 .../eigerDetectorServer/HardwareIO.h | 0 .../HardwareMMappingDefs.h | 0 .../eigerDetectorServer/LocalLinkInterface.c | 0 .../eigerDetectorServer/LocalLinkInterface.h | 0 .../eigerDetectorServer/Makefile | 0 .../eigerDetectorServer/Makefile.virtual | 0 slsDetectorServers/eigerDetectorServer/ansi.h | 1 + .../bin/eigerDetectorServer_refactor | Bin 288988 -> 288988 bytes .../bin/eigerDetectorServer_virtualMaster | Bin .../bin/eigerDetectorServer_virtualSlave | Bin .../bin/hv9m_blackfin_serverv3.0.0.1 | Bin .../eigerDetectorServer/communication_funcs.c | 1 + .../eigerDetectorServer/communication_funcs.h | 1 + .../eigerDetectorServer/gitInfo.txt | 9 +++++ .../eigerDetectorServer/gitInfoEiger.h | 6 +-- .../eigerDetectorServer/gitInfoEigerTmp.h | 0 .../eigerDetectorServer/renameServer.sh | 0 .../slsDetectorFunctionList.c | 0 .../slsDetectorFunctionList.h | 0 .../eigerDetectorServer/slsDetectorServer.c | 0 .../slsDetectorServer_defs.h | 0 .../slsDetectorServer_funcs.c | 0 .../slsDetectorServer_funcs.h | 0 .../eigerDetectorServer/sls_detector_defs.h | 1 + .../eigerDetectorServer/sls_detector_funcs.h | 1 + .../eigerDetectorServer/updateAPIVersion.sh | 0 .../eigerDetectorServer/updateGitVersion.sh | 6 +-- .../eigerDetectorServer/versionAPI.h | 1 + .../eigerDetectorServer/xfs_types.h | 0 .../eigerDetectorServer/xparameters.h | 0 .../gotthardDetectorServer/.target-makefrag | 0 .../gotthardDetectorServer/AD9257.h | 0 .../gotthardDetectorServer/Makefile | 0 .../gotthardDetectorServer/Makefile.virtual | 0 .../gotthardDetectorServer}/ansi.h | 0 .../commonServerFunctions.h | 0 .../communication_funcs.c | 0 .../communication_funcs.h | 0 .../gotthardDetectorServer/config.txt | 0 .../gotthardDetectorServer/firmware_funcs.c | 0 .../gotthardDetectorServer/firmware_funcs.h | 0 .../gotthardDetectorServer/gitInfo.txt | 0 .../gotthardDetectorServer/gitInfoGotthard.h | 0 .../gitInfoGotthardTmp.h | 0 .../gotthardDetectorServer_refactor | Bin .../gotthardDetectorServer_virtual | Bin .../gotthardDetectorServer/registers_g.h | 0 .../gotthardDetectorServer/server.c | 0 .../gotthardDetectorServer/server_defs.h | 0 .../gotthardDetectorServer/server_funcs.c | 0 .../gotthardDetectorServer/server_funcs.h | 0 .../sls_detector_defs.h | 0 .../sls_detector_funcs.h | 0 .../sls_receiver_defs.h | 0 .../sls_receiver_funcs.h | 0 .../gotthardDetectorServer/stop_server.c | 0 .../updateAPIVersion.sh | 0 .../updateGitVersion.sh | 0 .../gotthardDetectorServer}/versionAPI.h | 0 .../jctbDetectorServer/AD9257.h | 0 .../jctbDetectorServer/Makefile | 0 .../jctbDetectorServer/ansi.h | 0 .../jctbDetectorServer/bf_init.sh | 0 .../jctbDetectorServer/blackfin.c | 0 .../jctbDetectorServer/blackfin.h | 0 .../commonServerFunctions.h | 0 .../jctbDetectorServer/communication_funcs.c | 0 .../jctbDetectorServer/communication_funcs.h | 0 .../jctbDetectorServer/convert_pof_to_raw.c | 0 .../jctbDetectorServer/firmware_funcs.c | 0 .../jctbDetectorServer/firmware_funcs.h | 0 .../jctbDetectorServer/get_server.sh | 0 .../jctbDetectorServer/gitInfo.txt | 0 .../jctbDetectorServer/gitInfoMoench.h | 0 .../jctbDetectorServer/gitInfoMoenchTmp.h | 0 .../jctbDetectorServer_developer | Bin .../jctbDetectorServer/mcb_funcs.c | 0 .../jctbDetectorServer/mcb_funcs.h | 0 .../patternGenerator/generate.sh | 0 .../patternGenerator/generator.c | 0 .../patternGenerator/test.p | 0 .../jctbDetectorServer/program_fpga.sh | 0 .../jctbDetectorServer/registers_m.h | 0 .../jctbDetectorServer/server.c | 0 .../jctbDetectorServer/server_defs.h | 0 .../jctbDetectorServer/server_funcs.c | 0 .../jctbDetectorServer/server_funcs.h | 0 .../jctbDetectorServer/sharedmemory.c | 0 .../jctbDetectorServer/sharedmemory.h | 0 .../jctbDetectorServer/slow_adc.c | 0 .../jctbDetectorServer/slow_adc.h | 0 .../jctbDetectorServer/sls_detector_defs.h | 0 .../jctbDetectorServer/sls_detector_funcs.h | 0 .../jctbDetectorServer/sls_receiver_defs.h | 0 .../jctbDetectorServer/sls_receiver_funcs.h | 0 .../jctbDetectorServer/stop_server.c | 0 .../jctbDetectorServer/updateGitVersion.sh | 0 .../jungfrauDetectorServer/AD9257.h | 0 .../jungfrauDetectorServer/Makefile | 0 .../jungfrauDetectorServer/Makefile.virtual | 0 .../jungfrauDetectorServer/RegisterDefs.h | 0 .../jungfrauDetectorServer}/ansi.h | 0 .../bin/jungfrauDetectorServer_refactor | Bin .../bin/jungfrauDetectorServer_virtual | Bin .../jungfrauDetectorServer/blackfin.h | 0 .../commonServerFunctions.h | 0 .../communication_funcs.c | 0 .../communication_funcs.h | 0 .../jungfrauDetectorServer/gitInfo.txt | 0 .../jungfrauDetectorServer/gitInfoJungfrau.h | 0 .../gitInfoJungfrauTmp.h | 0 .../jungfrauDetectorServer/programfpga.h | 0 .../slsDetectorFunctionList.c | 0 .../slsDetectorFunctionList.h | 0 .../slsDetectorServer.c | 0 .../slsDetectorServer_defs.h | 0 .../slsDetectorServer_funcs.c | 0 .../slsDetectorServer_funcs.h | 0 .../sls_detector_defs.h | 0 .../sls_detector_funcs.h | 0 .../sls_receiver_defs.h | 0 .../sls_receiver_funcs.h | 0 .../updateAPIVersion.sh | 0 .../updateGitVersion.sh | 0 .../jungfrauDetectorServer}/versionAPI.h | 0 .../mythen3DetectorServer/AD9257.h | 0 .../mythen3DetectorServer/Makefile | 0 .../mythen3DetectorServer/Makefile.virtual | 0 .../mythen3DetectorServer/RegisterDefs.h | 0 .../mythen3DetectorServer/ansi.h | 0 .../mythen3DetectorServer/blackfin.h | 0 .../commonServerFunctions.h | 0 .../communication_funcs.c | 0 .../communication_funcs.h | 0 .../mythen3DetectorServer/gitInfo.txt | 0 .../mythen3DetectorServer/gitInfoMythen3.h | 0 .../mythen3DetectorServer/gitInfoMythen3Tmp.h | 0 .../mythen3DetectorServer/mythen3Server | Bin .../mythen3DetectorServer/mythen3Server.gdb | Bin .../mythen3DetectorServer/programfpga.h | 0 .../slsDetectorFunctionList.c | 0 .../slsDetectorFunctionList.h | 0 .../mythen3DetectorServer/slsDetectorServer.c | 0 .../slsDetectorServer_defs.h | 0 .../slsDetectorServer_funcs.c | 0 .../slsDetectorServer_funcs.h | 0 .../mythen3DetectorServer/sls_detector_defs.h | 0 .../sls_detector_funcs.h | 0 .../mythen3DetectorServer/sls_receiver_defs.h | 0 .../sls_receiver_funcs.h | 0 .../mythen3DetectorServer/updateGitVersion.sh | 0 .../slsDetectorServer/AD9257.h | 0 .../slsDetectorServer/Makefile | 0 .../slsDetectorServer/blackfin.h | 0 .../slsDetectorServer/commonServerFunctions.h | 0 .../slsDetectorServer/communication_funcs.c | 0 .../slsDetectorServer/communication_funcs.h | 0 .../slsDetectorServer/programfpga.h | 0 .../slsDetectorFunctionList.c | 0 .../slsDetectorFunctionList.h | 0 .../slsDetectorServer/slsDetectorServer.c | 0 .../slsDetectorServer_defs.h | 0 .../slsDetectorServer_funcs.c | 35 +++++++++++------- .../slsDetectorServer_funcs.h | 0 .../slsDetector_stopServer.c | 0 .../slsDetectorServer/sls_detector_defs.h | 0 .../slsDetectorServer/sls_detector_funcs.h | 0 slsDetectorSoftware/gitInfo.txt | 8 ++-- slsDetectorSoftware/slsDetector/gitInfoLib.h | 6 +-- .../eigerDetectorServer/gitInfo.txt | 9 ----- .../jungfrauDetectorServer/ansi.h | 1 - .../communication_funcs.c | 1 - .../communication_funcs.h | 1 - .../sls_detector_defs.h | 1 - .../sls_detector_funcs.h | 1 - .../sls_receiver_defs.h | 1 - .../sls_receiver_funcs.h | 1 - .../jungfrauDetectorServer/versionAPI.h | 1 - slsSupportLib/include/sls_detector_funcs.h | 1 + slsSupportLib/include/versionAPI.h | 2 +- 192 files changed, 56 insertions(+), 44 deletions(-) create mode 100644 slsDetectorServers/.gitignore rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/9mhvserial_bf.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/Beb.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/Beb.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/Feb.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/Feb.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/FebControl.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/FebControl.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/FebInterface.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/FebInterface.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/FebRegisterDefs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/HardwareIO.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/HardwareIO.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/HardwareMMappingDefs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/LocalLinkInterface.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/LocalLinkInterface.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/Makefile (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/Makefile.virtual (100%) create mode 120000 slsDetectorServers/eigerDetectorServer/ansi.h rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/bin/eigerDetectorServer_refactor (89%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1 (100%) create mode 120000 slsDetectorServers/eigerDetectorServer/communication_funcs.c create mode 120000 slsDetectorServers/eigerDetectorServer/communication_funcs.h create mode 100644 slsDetectorServers/eigerDetectorServer/gitInfo.txt rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/gitInfoEiger.h (54%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/gitInfoEigerTmp.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/renameServer.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/slsDetectorFunctionList.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/slsDetectorFunctionList.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/slsDetectorServer.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/slsDetectorServer_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/slsDetectorServer_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/slsDetectorServer_funcs.h (100%) create mode 120000 slsDetectorServers/eigerDetectorServer/sls_detector_defs.h create mode 120000 slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/updateAPIVersion.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/updateGitVersion.sh (90%) create mode 120000 slsDetectorServers/eigerDetectorServer/versionAPI.h rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/xfs_types.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/eigerDetectorServer/xparameters.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/.target-makefrag (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/AD9257.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/Makefile (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/Makefile.virtual (100%) rename {slsDetectorSoftware/slsDetectorServers/eigerDetectorServer => slsDetectorServers/gotthardDetectorServer}/ansi.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/commonServerFunctions.h (100%) rename {slsDetectorSoftware/slsDetectorServers/eigerDetectorServer => slsDetectorServers/gotthardDetectorServer}/communication_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers/eigerDetectorServer => slsDetectorServers/gotthardDetectorServer}/communication_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/config.txt (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/firmware_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/firmware_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/gitInfo.txt (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/gitInfoGotthard.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/gitInfoGotthardTmp.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/gotthardDetectorServer_refactor (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/gotthardDetectorServer_virtual (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/registers_g.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/server.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/server_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/server_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/server_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers/eigerDetectorServer => slsDetectorServers/gotthardDetectorServer}/sls_detector_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers/eigerDetectorServer => slsDetectorServers/gotthardDetectorServer}/sls_detector_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers/eigerDetectorServer => slsDetectorServers/gotthardDetectorServer}/sls_receiver_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers/eigerDetectorServer => slsDetectorServers/gotthardDetectorServer}/sls_receiver_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/stop_server.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/updateAPIVersion.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/gotthardDetectorServer/updateGitVersion.sh (100%) rename {slsDetectorSoftware/slsDetectorServers/eigerDetectorServer => slsDetectorServers/gotthardDetectorServer}/versionAPI.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/AD9257.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/Makefile (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/ansi.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/bf_init.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/blackfin.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/blackfin.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/commonServerFunctions.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/communication_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/communication_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/convert_pof_to_raw.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/firmware_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/firmware_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/get_server.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/gitInfo.txt (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/gitInfoMoench.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/gitInfoMoenchTmp.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/jctbDetectorServer_developer (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/mcb_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/mcb_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/patternGenerator/generate.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/patternGenerator/generator.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/patternGenerator/test.p (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/program_fpga.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/registers_m.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/server.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/server_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/server_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/server_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/sharedmemory.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/sharedmemory.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/slow_adc.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/slow_adc.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/sls_detector_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/sls_detector_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/sls_receiver_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/sls_receiver_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/stop_server.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jctbDetectorServer/updateGitVersion.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/AD9257.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/Makefile (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/Makefile.virtual (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/RegisterDefs.h (100%) rename {slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer => slsDetectorServers/jungfrauDetectorServer}/ansi.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/blackfin.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/commonServerFunctions.h (100%) rename {slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer => slsDetectorServers/jungfrauDetectorServer}/communication_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer => slsDetectorServers/jungfrauDetectorServer}/communication_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/gitInfo.txt (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/gitInfoJungfrau.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/gitInfoJungfrauTmp.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/programfpga.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/slsDetectorFunctionList.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/slsDetectorFunctionList.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/slsDetectorServer.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/slsDetectorServer_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/slsDetectorServer_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/slsDetectorServer_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer => slsDetectorServers/jungfrauDetectorServer}/sls_detector_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer => slsDetectorServers/jungfrauDetectorServer}/sls_detector_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer => slsDetectorServers/jungfrauDetectorServer}/sls_receiver_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer => slsDetectorServers/jungfrauDetectorServer}/sls_receiver_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/updateAPIVersion.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/jungfrauDetectorServer/updateGitVersion.sh (100%) rename {slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer => slsDetectorServers/jungfrauDetectorServer}/versionAPI.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/AD9257.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/Makefile (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/Makefile.virtual (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/RegisterDefs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/ansi.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/blackfin.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/commonServerFunctions.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/communication_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/communication_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/gitInfo.txt (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/gitInfoMythen3.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/gitInfoMythen3Tmp.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/mythen3Server (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/mythen3Server.gdb (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/programfpga.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/slsDetectorFunctionList.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/slsDetectorFunctionList.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/slsDetectorServer.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/slsDetectorServer_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/slsDetectorServer_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/slsDetectorServer_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/sls_detector_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/sls_detector_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/sls_receiver_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/sls_receiver_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/mythen3DetectorServer/updateGitVersion.sh (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/AD9257.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/Makefile (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/blackfin.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/commonServerFunctions.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/communication_funcs.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/communication_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/programfpga.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/slsDetectorFunctionList.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/slsDetectorFunctionList.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/slsDetectorServer.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/slsDetectorServer_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/slsDetectorServer_funcs.c (99%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/slsDetectorServer_funcs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/slsDetector_stopServer.c (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/sls_detector_defs.h (100%) rename {slsDetectorSoftware/slsDetectorServers => slsDetectorServers}/slsDetectorServer/sls_detector_funcs.h (100%) delete mode 100644 slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfo.txt delete mode 120000 slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/ansi.h delete mode 120000 slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c delete mode 120000 slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h delete mode 120000 slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h delete mode 120000 slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h delete mode 120000 slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h delete mode 120000 slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h delete mode 120000 slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/versionAPI.h diff --git a/slsDetectorServers/.gitignore b/slsDetectorServers/.gitignore new file mode 100644 index 000000000..825dda897 --- /dev/null +++ b/slsDetectorServers/.gitignore @@ -0,0 +1,4 @@ +*.o +*~ +#*# +.project diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c b/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c rename to slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.c b/slsDetectorServers/eigerDetectorServer/Beb.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.c rename to slsDetectorServers/eigerDetectorServer/Beb.c diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.h b/slsDetectorServers/eigerDetectorServer/Beb.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.h rename to slsDetectorServers/eigerDetectorServer/Beb.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.c b/slsDetectorServers/eigerDetectorServer/Feb.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.c rename to slsDetectorServers/eigerDetectorServer/Feb.c diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.h b/slsDetectorServers/eigerDetectorServer/Feb.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.h rename to slsDetectorServers/eigerDetectorServer/Feb.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.c rename to slsDetectorServers/eigerDetectorServer/FebControl.c diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.h b/slsDetectorServers/eigerDetectorServer/FebControl.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.h rename to slsDetectorServers/eigerDetectorServer/FebControl.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.c b/slsDetectorServers/eigerDetectorServer/FebInterface.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.c rename to slsDetectorServers/eigerDetectorServer/FebInterface.c diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.h b/slsDetectorServers/eigerDetectorServer/FebInterface.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.h rename to slsDetectorServers/eigerDetectorServer/FebInterface.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h b/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h rename to slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.c b/slsDetectorServers/eigerDetectorServer/HardwareIO.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.c rename to slsDetectorServers/eigerDetectorServer/HardwareIO.c diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.h b/slsDetectorServers/eigerDetectorServer/HardwareIO.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.h rename to slsDetectorServers/eigerDetectorServer/HardwareIO.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h b/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h rename to slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c rename to slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h rename to slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile b/slsDetectorServers/eigerDetectorServer/Makefile similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile rename to slsDetectorServers/eigerDetectorServer/Makefile diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile.virtual b/slsDetectorServers/eigerDetectorServer/Makefile.virtual similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile.virtual rename to slsDetectorServers/eigerDetectorServer/Makefile.virtual diff --git a/slsDetectorServers/eigerDetectorServer/ansi.h b/slsDetectorServers/eigerDetectorServer/ansi.h new file mode 120000 index 000000000..4a82d0575 --- /dev/null +++ b/slsDetectorServers/eigerDetectorServer/ansi.h @@ -0,0 +1 @@ +../../slsSupportLib/include/ansi.h \ No newline at end of file diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor similarity index 89% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor rename to slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor index 2daff2e253bd5697ae40263c255b4ea7d27531e2..e07602041ca5431c0c70bd1b6f48a5d73eb67e8f 100755 GIT binary patch delta 6645 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 F{|Dt6DuVz3 delta 6660 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 Gl>Y gitInfo.txt - cd ../../../ + cd ../../ ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE cd $WD fi diff --git a/slsDetectorServers/eigerDetectorServer/versionAPI.h b/slsDetectorServers/eigerDetectorServer/versionAPI.h new file mode 120000 index 000000000..5e580d8bb --- /dev/null +++ b/slsDetectorServers/eigerDetectorServer/versionAPI.h @@ -0,0 +1 @@ +../../slsSupportLib/include/versionAPI.h \ No newline at end of file diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xfs_types.h b/slsDetectorServers/eigerDetectorServer/xfs_types.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xfs_types.h rename to slsDetectorServers/eigerDetectorServer/xfs_types.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xparameters.h b/slsDetectorServers/eigerDetectorServer/xparameters.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xparameters.h rename to slsDetectorServers/eigerDetectorServer/xparameters.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/.target-makefrag b/slsDetectorServers/gotthardDetectorServer/.target-makefrag similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/.target-makefrag rename to slsDetectorServers/gotthardDetectorServer/.target-makefrag diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/AD9257.h b/slsDetectorServers/gotthardDetectorServer/AD9257.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/AD9257.h rename to slsDetectorServers/gotthardDetectorServer/AD9257.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile b/slsDetectorServers/gotthardDetectorServer/Makefile similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile rename to slsDetectorServers/gotthardDetectorServer/Makefile diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile.virtual b/slsDetectorServers/gotthardDetectorServer/Makefile.virtual similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile.virtual rename to slsDetectorServers/gotthardDetectorServer/Makefile.virtual diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/ansi.h b/slsDetectorServers/gotthardDetectorServer/ansi.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/ansi.h rename to slsDetectorServers/gotthardDetectorServer/ansi.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h b/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h rename to slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/communication_funcs.c b/slsDetectorServers/gotthardDetectorServer/communication_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/communication_funcs.c rename to slsDetectorServers/gotthardDetectorServer/communication_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/communication_funcs.h b/slsDetectorServers/gotthardDetectorServer/communication_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/communication_funcs.h rename to slsDetectorServers/gotthardDetectorServer/communication_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/config.txt b/slsDetectorServers/gotthardDetectorServer/config.txt similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/config.txt rename to slsDetectorServers/gotthardDetectorServer/config.txt diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.c b/slsDetectorServers/gotthardDetectorServer/firmware_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.c rename to slsDetectorServers/gotthardDetectorServer/firmware_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.h b/slsDetectorServers/gotthardDetectorServer/firmware_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.h rename to slsDetectorServers/gotthardDetectorServer/firmware_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfo.txt b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfo.txt rename to slsDetectorServers/gotthardDetectorServer/gitInfo.txt diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h rename to slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h rename to slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor b/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor rename to slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual b/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual rename to slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/registers_g.h b/slsDetectorServers/gotthardDetectorServer/registers_g.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/registers_g.h rename to slsDetectorServers/gotthardDetectorServer/registers_g.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server.c b/slsDetectorServers/gotthardDetectorServer/server.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server.c rename to slsDetectorServers/gotthardDetectorServer/server.c diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_defs.h b/slsDetectorServers/gotthardDetectorServer/server_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_defs.h rename to slsDetectorServers/gotthardDetectorServer/server_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.c b/slsDetectorServers/gotthardDetectorServer/server_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.c rename to slsDetectorServers/gotthardDetectorServer/server_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.h b/slsDetectorServers/gotthardDetectorServer/server_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.h rename to slsDetectorServers/gotthardDetectorServer/server_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h b/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h rename to slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h b/slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h rename to slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_receiver_defs.h b/slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_receiver_defs.h rename to slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_receiver_funcs.h b/slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_receiver_funcs.h rename to slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/stop_server.c b/slsDetectorServers/gotthardDetectorServer/stop_server.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/stop_server.c rename to slsDetectorServers/gotthardDetectorServer/stop_server.c diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh b/slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh rename to slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh b/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh rename to slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/versionAPI.h b/slsDetectorServers/gotthardDetectorServer/versionAPI.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/versionAPI.h rename to slsDetectorServers/gotthardDetectorServer/versionAPI.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/AD9257.h b/slsDetectorServers/jctbDetectorServer/AD9257.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/AD9257.h rename to slsDetectorServers/jctbDetectorServer/AD9257.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/Makefile b/slsDetectorServers/jctbDetectorServer/Makefile similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/Makefile rename to slsDetectorServers/jctbDetectorServer/Makefile diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/ansi.h b/slsDetectorServers/jctbDetectorServer/ansi.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/ansi.h rename to slsDetectorServers/jctbDetectorServer/ansi.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/bf_init.sh b/slsDetectorServers/jctbDetectorServer/bf_init.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/bf_init.sh rename to slsDetectorServers/jctbDetectorServer/bf_init.sh diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.c b/slsDetectorServers/jctbDetectorServer/blackfin.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.c rename to slsDetectorServers/jctbDetectorServer/blackfin.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.h b/slsDetectorServers/jctbDetectorServer/blackfin.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.h rename to slsDetectorServers/jctbDetectorServer/blackfin.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/commonServerFunctions.h b/slsDetectorServers/jctbDetectorServer/commonServerFunctions.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/commonServerFunctions.h rename to slsDetectorServers/jctbDetectorServer/commonServerFunctions.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.c b/slsDetectorServers/jctbDetectorServer/communication_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.c rename to slsDetectorServers/jctbDetectorServer/communication_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.h b/slsDetectorServers/jctbDetectorServer/communication_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.h rename to slsDetectorServers/jctbDetectorServer/communication_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c b/slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c rename to slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.c b/slsDetectorServers/jctbDetectorServer/firmware_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.c rename to slsDetectorServers/jctbDetectorServer/firmware_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.h b/slsDetectorServers/jctbDetectorServer/firmware_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.h rename to slsDetectorServers/jctbDetectorServer/firmware_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/get_server.sh b/slsDetectorServers/jctbDetectorServer/get_server.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/get_server.sh rename to slsDetectorServers/jctbDetectorServer/get_server.sh diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfo.txt b/slsDetectorServers/jctbDetectorServer/gitInfo.txt similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfo.txt rename to slsDetectorServers/jctbDetectorServer/gitInfo.txt diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoench.h b/slsDetectorServers/jctbDetectorServer/gitInfoMoench.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoench.h rename to slsDetectorServers/jctbDetectorServer/gitInfoMoench.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h b/slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h rename to slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer b/slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer rename to slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.c b/slsDetectorServers/jctbDetectorServer/mcb_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.c rename to slsDetectorServers/jctbDetectorServer/mcb_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.h b/slsDetectorServers/jctbDetectorServer/mcb_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.h rename to slsDetectorServers/jctbDetectorServer/mcb_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh b/slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh rename to slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c b/slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c rename to slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/test.p b/slsDetectorServers/jctbDetectorServer/patternGenerator/test.p similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/test.p rename to slsDetectorServers/jctbDetectorServer/patternGenerator/test.p diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/program_fpga.sh b/slsDetectorServers/jctbDetectorServer/program_fpga.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/program_fpga.sh rename to slsDetectorServers/jctbDetectorServer/program_fpga.sh diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/registers_m.h b/slsDetectorServers/jctbDetectorServer/registers_m.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/registers_m.h rename to slsDetectorServers/jctbDetectorServer/registers_m.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server.c b/slsDetectorServers/jctbDetectorServer/server.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server.c rename to slsDetectorServers/jctbDetectorServer/server.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_defs.h b/slsDetectorServers/jctbDetectorServer/server_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_defs.h rename to slsDetectorServers/jctbDetectorServer/server_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.c b/slsDetectorServers/jctbDetectorServer/server_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.c rename to slsDetectorServers/jctbDetectorServer/server_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.h b/slsDetectorServers/jctbDetectorServer/server_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.h rename to slsDetectorServers/jctbDetectorServer/server_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.c b/slsDetectorServers/jctbDetectorServer/sharedmemory.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.c rename to slsDetectorServers/jctbDetectorServer/sharedmemory.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.h b/slsDetectorServers/jctbDetectorServer/sharedmemory.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.h rename to slsDetectorServers/jctbDetectorServer/sharedmemory.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/slow_adc.c b/slsDetectorServers/jctbDetectorServer/slow_adc.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/slow_adc.c rename to slsDetectorServers/jctbDetectorServer/slow_adc.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/slow_adc.h b/slsDetectorServers/jctbDetectorServer/slow_adc.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/slow_adc.h rename to slsDetectorServers/jctbDetectorServer/slow_adc.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_detector_defs.h b/slsDetectorServers/jctbDetectorServer/sls_detector_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_detector_defs.h rename to slsDetectorServers/jctbDetectorServer/sls_detector_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_detector_funcs.h b/slsDetectorServers/jctbDetectorServer/sls_detector_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_detector_funcs.h rename to slsDetectorServers/jctbDetectorServer/sls_detector_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_receiver_defs.h b/slsDetectorServers/jctbDetectorServer/sls_receiver_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_receiver_defs.h rename to slsDetectorServers/jctbDetectorServer/sls_receiver_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_receiver_funcs.h b/slsDetectorServers/jctbDetectorServer/sls_receiver_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_receiver_funcs.h rename to slsDetectorServers/jctbDetectorServer/sls_receiver_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/stop_server.c b/slsDetectorServers/jctbDetectorServer/stop_server.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/stop_server.c rename to slsDetectorServers/jctbDetectorServer/stop_server.c diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/updateGitVersion.sh b/slsDetectorServers/jctbDetectorServer/updateGitVersion.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/updateGitVersion.sh rename to slsDetectorServers/jctbDetectorServer/updateGitVersion.sh diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/AD9257.h b/slsDetectorServers/jungfrauDetectorServer/AD9257.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/AD9257.h rename to slsDetectorServers/jungfrauDetectorServer/AD9257.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile b/slsDetectorServers/jungfrauDetectorServer/Makefile similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile rename to slsDetectorServers/jungfrauDetectorServer/Makefile diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile.virtual b/slsDetectorServers/jungfrauDetectorServer/Makefile.virtual similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile.virtual rename to slsDetectorServers/jungfrauDetectorServer/Makefile.virtual diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h rename to slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/ansi.h b/slsDetectorServers/jungfrauDetectorServer/ansi.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/ansi.h rename to slsDetectorServers/jungfrauDetectorServer/ansi.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor rename to slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual rename to slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/blackfin.h b/slsDetectorServers/jungfrauDetectorServer/blackfin.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/blackfin.h rename to slsDetectorServers/jungfrauDetectorServer/blackfin.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h b/slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h rename to slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/communication_funcs.c b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/communication_funcs.c rename to slsDetectorServers/jungfrauDetectorServer/communication_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/communication_funcs.h b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/communication_funcs.h rename to slsDetectorServers/jungfrauDetectorServer/communication_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt b/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt rename to slsDetectorServers/jungfrauDetectorServer/gitInfo.txt diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h rename to slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrauTmp.h b/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrauTmp.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrauTmp.h rename to slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrauTmp.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/programfpga.h b/slsDetectorServers/jungfrauDetectorServer/programfpga.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/programfpga.h rename to slsDetectorServers/jungfrauDetectorServer/programfpga.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h b/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h rename to slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h b/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h rename to slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h b/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h rename to slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h b/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h rename to slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/updateAPIVersion.sh b/slsDetectorServers/jungfrauDetectorServer/updateAPIVersion.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/updateAPIVersion.sh rename to slsDetectorServers/jungfrauDetectorServer/updateAPIVersion.sh diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh b/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh rename to slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/versionAPI.h b/slsDetectorServers/jungfrauDetectorServer/versionAPI.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/versionAPI.h rename to slsDetectorServers/jungfrauDetectorServer/versionAPI.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/AD9257.h b/slsDetectorServers/mythen3DetectorServer/AD9257.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/AD9257.h rename to slsDetectorServers/mythen3DetectorServer/AD9257.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/Makefile b/slsDetectorServers/mythen3DetectorServer/Makefile similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/Makefile rename to slsDetectorServers/mythen3DetectorServer/Makefile diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/Makefile.virtual b/slsDetectorServers/mythen3DetectorServer/Makefile.virtual similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/Makefile.virtual rename to slsDetectorServers/mythen3DetectorServer/Makefile.virtual diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h b/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h rename to slsDetectorServers/mythen3DetectorServer/RegisterDefs.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/ansi.h b/slsDetectorServers/mythen3DetectorServer/ansi.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/ansi.h rename to slsDetectorServers/mythen3DetectorServer/ansi.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/blackfin.h b/slsDetectorServers/mythen3DetectorServer/blackfin.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/blackfin.h rename to slsDetectorServers/mythen3DetectorServer/blackfin.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/commonServerFunctions.h b/slsDetectorServers/mythen3DetectorServer/commonServerFunctions.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/commonServerFunctions.h rename to slsDetectorServers/mythen3DetectorServer/commonServerFunctions.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/communication_funcs.c b/slsDetectorServers/mythen3DetectorServer/communication_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/communication_funcs.c rename to slsDetectorServers/mythen3DetectorServer/communication_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/communication_funcs.h b/slsDetectorServers/mythen3DetectorServer/communication_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/communication_funcs.h rename to slsDetectorServers/mythen3DetectorServer/communication_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfo.txt b/slsDetectorServers/mythen3DetectorServer/gitInfo.txt similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfo.txt rename to slsDetectorServers/mythen3DetectorServer/gitInfo.txt diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3.h b/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3.h rename to slsDetectorServers/mythen3DetectorServer/gitInfoMythen3.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3Tmp.h b/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3Tmp.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3Tmp.h rename to slsDetectorServers/mythen3DetectorServer/gitInfoMythen3Tmp.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/mythen3Server b/slsDetectorServers/mythen3DetectorServer/mythen3Server similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/mythen3Server rename to slsDetectorServers/mythen3DetectorServer/mythen3Server diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/mythen3Server.gdb b/slsDetectorServers/mythen3DetectorServer/mythen3Server.gdb similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/mythen3Server.gdb rename to slsDetectorServers/mythen3DetectorServer/mythen3Server.gdb diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/programfpga.h b/slsDetectorServers/mythen3DetectorServer/programfpga.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/programfpga.h rename to slsDetectorServers/mythen3DetectorServer/programfpga.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c rename to slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h rename to slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer.c rename to slsDetectorServers/mythen3DetectorServer/slsDetectorServer.c diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h rename to slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.c rename to slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.h rename to slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_detector_defs.h b/slsDetectorServers/mythen3DetectorServer/sls_detector_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_detector_defs.h rename to slsDetectorServers/mythen3DetectorServer/sls_detector_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_detector_funcs.h b/slsDetectorServers/mythen3DetectorServer/sls_detector_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_detector_funcs.h rename to slsDetectorServers/mythen3DetectorServer/sls_detector_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_receiver_defs.h b/slsDetectorServers/mythen3DetectorServer/sls_receiver_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_receiver_defs.h rename to slsDetectorServers/mythen3DetectorServer/sls_receiver_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_receiver_funcs.h b/slsDetectorServers/mythen3DetectorServer/sls_receiver_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_receiver_funcs.h rename to slsDetectorServers/mythen3DetectorServer/sls_receiver_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/updateGitVersion.sh b/slsDetectorServers/mythen3DetectorServer/updateGitVersion.sh similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/updateGitVersion.sh rename to slsDetectorServers/mythen3DetectorServer/updateGitVersion.sh diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/AD9257.h b/slsDetectorServers/slsDetectorServer/AD9257.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/AD9257.h rename to slsDetectorServers/slsDetectorServer/AD9257.h diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/Makefile b/slsDetectorServers/slsDetectorServer/Makefile similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/Makefile rename to slsDetectorServers/slsDetectorServer/Makefile diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/blackfin.h b/slsDetectorServers/slsDetectorServer/blackfin.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/blackfin.h rename to slsDetectorServers/slsDetectorServer/blackfin.h diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/commonServerFunctions.h b/slsDetectorServers/slsDetectorServer/commonServerFunctions.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/commonServerFunctions.h rename to slsDetectorServers/slsDetectorServer/commonServerFunctions.h diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/communication_funcs.c b/slsDetectorServers/slsDetectorServer/communication_funcs.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/communication_funcs.c rename to slsDetectorServers/slsDetectorServer/communication_funcs.c diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/communication_funcs.h b/slsDetectorServers/slsDetectorServer/communication_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/communication_funcs.h rename to slsDetectorServers/slsDetectorServer/communication_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/programfpga.h b/slsDetectorServers/slsDetectorServer/programfpga.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/programfpga.h rename to slsDetectorServers/slsDetectorServer/programfpga.h diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.c rename to slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.c diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h rename to slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer.c rename to slsDetectorServers/slsDetectorServer/slsDetectorServer.c diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/slsDetectorServer/slsDetectorServer_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_defs.h rename to slsDetectorServers/slsDetectorServer/slsDetectorServer_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c similarity index 99% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c rename to slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c index 2c9d70a7b..e0e0f9d8f 100755 --- a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c @@ -92,7 +92,8 @@ int decode_function(int file_des) { n = receiveData(file_des,&fnum,sizeof(fnum),INT32); if (n <= 0) { #ifdef VERBOSE - printf("ERROR reading from socket %d, %d %d (%s)\n", n, fnum, file_des, getFunctionName((enum detFuncs)fnum)); + printf("ERROR reading from socket %d, %d %d (%s)\n", + n, fnum, file_des, getFunctionName((enum detFuncs)fnum)); #endif return FAIL; } @@ -101,24 +102,31 @@ int decode_function(int file_des) { printf("size of data received %d\n",n); #endif -#ifdef VERBOSE - printf(" calling function fnum=%d, (%s) located at 0x%x\n", fnum, getFunctionName((enum detFuncs)fnum), (unsigned int)flist[fnum]); -#endif #ifdef JUNGFRAUD - if ((debugflag == PROGRAMMING_MODE) && - ((fnum != F_PROGRAM_FPGA) && (fnum != F_GET_DETECTOR_TYPE) && - (fnum != F_RESET_FPGA) && (fnum != F_UPDATE_CLIENT) && (fnum != F_CHECK_VERSION))) { - sprintf(mess,"This Function %s cannot be executed. ", getFunctionName((enum detFuncs)fnum)); + if ((debugflag == PROGRAMMING_MODE) && ( + (fnum != F_PROGRAM_FPGA) && + (fnum != F_GET_DETECTOR_TYPE) && + (fnum != F_RESET_FPGA) && + (fnum != F_UPDATE_CLIENT) && + (fnum != F_CHECK_VERSION))) { + sprintf(mess,"This Function %s cannot be executed. ", + getFunctionName((enum detFuncs)fnum)); ret=(M_nofuncMode)(file_des); } else #endif if (fnum<0 || fnum>=NUM_DET_FUNCTIONS) { cprintf(BG_RED,"Unknown function enum %d\n", fnum); ret=(M_nofunc)(file_des); - }else + }else { +#ifdef VERBOSE + printf(" calling function fnum=%d, (%s) located at 0x%x\n", + fnum, getFunctionName((enum detFuncs)fnum), (unsigned int)flist[fnum]); +#endif ret=(*flist[fnum])(file_des); - if (ret == FAIL) - cprintf(RED, "Error executing the function = %d (%s)\n", fnum, getFunctionName((enum detFuncs)fnum)); + if (ret == FAIL) + cprintf(RED, "Error executing the function = %d (%s)\n", + fnum, getFunctionName((enum detFuncs)fnum)); + } return ret; } @@ -251,7 +259,7 @@ void function_table() { flist[F_SOFTWARE_TRIGGER] = &software_trigger; // check - if (NUM_DET_FUNCTIONS >= TOO_MANY_FUNCTIONS_DEFINED) { + if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) { cprintf(BG_RED,"The last detector function enum has reached its limit\nGoodbye!\n"); exit(EXIT_FAILURE); } @@ -260,7 +268,8 @@ void function_table() { { int i=0; for (i = 0; i < NUM_DET_FUNCTIONS ; i++) { - printf("function fnum=%d, (%s) located at 0x%x\n", i, getFunctionName((enum detFuncs)i), (unsigned int)flist[i]); + printf("function fnum=%d, (%s) located at 0x%x\n", i, + getFunctionName((enum detFuncs)i), (unsigned int)flist[i]); } } #endif diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h rename to slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetector_stopServer.c b/slsDetectorServers/slsDetectorServer/slsDetector_stopServer.c similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetector_stopServer.c rename to slsDetectorServers/slsDetectorServer/slsDetector_stopServer.c diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/sls_detector_defs.h b/slsDetectorServers/slsDetectorServer/sls_detector_defs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/sls_detector_defs.h rename to slsDetectorServers/slsDetectorServer/sls_detector_defs.h diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/sls_detector_funcs.h b/slsDetectorServers/slsDetectorServer/sls_detector_funcs.h similarity index 100% rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/sls_detector_funcs.h rename to slsDetectorServers/slsDetectorServer/sls_detector_funcs.h diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 1c744e668..53b993d33 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: def79807f6f40ed1797b8154240adbc0e35c95e0 -Revision: 2044 +Repsitory UUID: c24a9b223cbb066d3851599f4d977ae835feffe4 +Revision: 2098 Branch: refactor Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4039 -Last Changed Date: 2018-10-02 15:03:24.000000002 +0200 ./CMakeLists.txt +Last Changed Rev: 4099 +Last Changed Date: 2018-10-11 13:56:19.000000002 +0200 ./doxy.config diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index fbb980f19..ab7cbff4d 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "def79807f6f40ed1797b8154240adbc0e35c95e0" +#define GITREPUUID "c24a9b223cbb066d3851599f4d977ae835feffe4" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4039 -#define GITDATE 0x20181002 +#define GITREV 0x4099 +#define GITDATE 0x20181011 #define GITBRANCH "refactor" diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfo.txt deleted file mode 100644 index 7426425d3..000000000 --- a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfo.txt +++ /dev/null @@ -1,9 +0,0 @@ -Path: slsDetectorPackage/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer -URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: b9f97f42a6a369dfb5c484bffeaa7a417e9cbca1 -Revision: 1 -Branch: refactor -Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4067 -Last Changed Date: 2018-10-08 11:18:41.000000002 +0200 ./Makefile diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/ansi.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/ansi.h deleted file mode 120000 index 1f2dbc999..000000000 --- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/ansi.h +++ /dev/null @@ -1 +0,0 @@ -../../../slsSupportLib/include/ansi.h \ No newline at end of file diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c deleted file mode 120000 index 19b563862..000000000 --- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c +++ /dev/null @@ -1 +0,0 @@ -../../../slsSupportLib/include/communication_funcs.c \ No newline at end of file diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h deleted file mode 120000 index 7f8c3d192..000000000 --- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h +++ /dev/null @@ -1 +0,0 @@ -../../../slsSupportLib/include/communication_funcs.h \ No newline at end of file diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h deleted file mode 120000 index 108fdd66a..000000000 --- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h +++ /dev/null @@ -1 +0,0 @@ -../../../slsSupportLib/include/sls_detector_defs.h \ No newline at end of file diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h deleted file mode 120000 index a21957495..000000000 --- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h +++ /dev/null @@ -1 +0,0 @@ -../../../slsSupportLib/include/sls_detector_funcs.h \ No newline at end of file diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h deleted file mode 120000 index fbea73b31..000000000 --- a/slsDetectorSoftware/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/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h deleted file mode 120000 index 8f221c967..000000000 --- a/slsDetectorSoftware/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/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/versionAPI.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/versionAPI.h deleted file mode 120000 index 5336e713b..000000000 --- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/versionAPI.h +++ /dev/null @@ -1 +0,0 @@ -../../../slsSupportLib/include/versionAPI.h \ No newline at end of file diff --git a/slsSupportLib/include/sls_detector_funcs.h b/slsSupportLib/include/sls_detector_funcs.h index 2f3ee8516..e44df8fb2 100644 --- a/slsSupportLib/include/sls_detector_funcs.h +++ b/slsSupportLib/include/sls_detector_funcs.h @@ -70,6 +70,7 @@ enum detFuncs{ F_SOFTWARE_TRIGGER,/** < software trigger */ NUM_DET_FUNCTIONS, + RECEIVER_ENUM_START = 128, /**< detector function should not exceed this (detector server should not compile anyway) */ F_EXEC_RECEIVER_COMMAND,/**< command is executed */ F_EXIT_RECEIVER,/**< turn off receiver server */ F_LOCK_RECEIVER,/**< Locks/Unlocks server communication to the given client */ diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 09cedecb6..f9f45cea5 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -1,6 +1,6 @@ /** API versions */ #define APIRECEIVER 0x180927 -#define APIEIGER 0x180820 +#define APIEIGER 0x181008 #define APIJUNGFRAU 0x180925 #define APIGOTTHARD 0x180928 From 32924def331e065c3955c593c07ceef2955e89e6 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 11 Oct 2018 14:33:13 +0200 Subject: [PATCH 2/3] updated jungfrau server binary --- .../jungfrauDetectorServer/ansi.h | 2 +- .../bin/jungfrauDetectorServer_refactor | Bin 106952 -> 107016 bytes .../communication_funcs.c | 2 +- .../communication_funcs.h | 2 +- .../jungfrauDetectorServer/gitInfo.txt | 8 ++++---- .../jungfrauDetectorServer/gitInfoJungfrau.h | 6 +++--- .../sls_detector_defs.h | 2 +- .../sls_detector_funcs.h | 2 +- .../sls_receiver_defs.h | 1 - .../sls_receiver_funcs.h | 1 - .../updateGitVersion.sh | 6 +++--- .../jungfrauDetectorServer/versionAPI.h | 2 +- slsSupportLib/include/versionAPI.h | 2 +- 13 files changed, 17 insertions(+), 19 deletions(-) delete mode 120000 slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h 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 2066138882eb525a8e7e37237c1bdb095336164e..49afdb4481382caee7a8b06aceef4af426e54938 100755 GIT binary patch delta 34900 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 delta 34716 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 KaD5?k=>Gwc!+t^l 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 From 302f31678f13d0e71cbc215c46370b2f3288cf5c Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 11 Oct 2018 14:40:52 +0200 Subject: [PATCH 3/3] updated gotthard binary, not run --- .../gotthardDetectorServer/ansi.h | 2 +- .../communication_funcs.c | 2 +- .../communication_funcs.h | 2 +- .../gotthardDetectorServer/gitInfo.txt | 10 +++++----- .../gotthardDetectorServer/gitInfoGotthard.h | 6 +++--- .../gotthardDetectorServer_refactor | Bin 86112 -> 86044 bytes .../sls_detector_defs.h | 2 +- .../sls_detector_funcs.h | 2 +- .../sls_receiver_defs.h | 1 - .../sls_receiver_funcs.h | 1 - .../updateGitVersion.sh | 6 +++--- .../gotthardDetectorServer/versionAPI.h | 2 +- slsSupportLib/include/versionAPI.h | 2 +- 13 files changed, 18 insertions(+), 20 deletions(-) delete mode 120000 slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h delete mode 120000 slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h 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 2258a891c2ec21d373c313fed238da49000a809e..fdd03de642eb707d066019b47e1eaa08f0d2fd21 100755 GIT binary patch delta 27661 zcmb`v4P2E~*8jaPJO>YOz@ws|q8{D^5%ox5fT#yVMFc@b#rGqklA~o!FV;96GVjK^ zod&v0)U2>EGqV{KQxTd!IZjzQ4VibhHP&!>HD-+!niV-F&v##k14pCg`TU>f^KtpR z_S$Rjz4lsb@4c>jSOFC|^0n4D+l*lTuRJ)yybkWV%1=jzuZzvpuEkM^RlpK4MZ0h@08&RN zsY-u!g)%JD`Gul6zYzNEbA;7yYpJu8u7BOOzO~v?XiKtHW@>rV=Y5f-U5N67gq|@| zSOaZNt?&yWNe@-uQ$`J2gVdTY?Ap%mEj3vVp%+ZuS%-GWKzicT1Z_iG)jV1AzBY+iJropn&nF&Nq-@?b*VTSXBYbHem1*T+EyvtdO}ijeKSpL{TdD2 zeoJFrq?X!dv3$|nM^Ha>i&G1yJ4i3j6)tg998oSvf0miWg+SrdVyK1mJ9C{{GS|sp zMrwXGKbO!?=d{$f)TJ8ca#927i*hZl#`@s3cBfVh3({w))4L6D|0c)g@N+1xT&b3fJ>(Z>jHqa*!_0~|@GM}4)}l;pjvFeQ60-|DXJxD;2#fp-sdHkTY*?etn-P9Yt}j|$Y{)vwLJifqLckbW#jxSH#Q ztEIkmX(QBBPaIQsM*W?CRqxQR6fN|t%XKX^iX+g`8{_U&)4E5GDg25x^;M>}fcgbr z2|YN+2vVzs_2!}u(tn*ZG0LfJq_h#qLL_OW-=$V{k96;$wCAe?t@V1?JpTWoYTo6B zOh+O8Cl^X?)x1ot2AP_#t}x!N^`zZPXvAC(g_rZ&k6b(!iYGMh z@yNN+=rn?-4Z-a`f{6$wBDkcZ!)D}~4Y@~rMt@N6&4_6)og>vPwfLy!nbL7f1i=JG0)a=ET zN0Hu@lQq|+?$DK*QLnDqzkmPb{kI(G?g(-8L7|pO-r%%VTC9)S1>9+q0vQf5uEw%ous@Zxg+thDtPtOWR)A0Bs)zTQDT!+R>51MUK zhbUp=$QSw`@(|%V!baRFE$e#;q5F$=%`v$U?GoyzJ-1Ev^ycZ=)6P~IZVd?c_F}7y zbXhC`%+Oogra#*j!bolUQ*D8m+~`4lqt{gTWBD?oQqQkzOFRGTHm4TPT;jj(+?E$i zXs-7x56?1aL$iIkG93mmhoGC6q<$V80eG5nW zSG}bSyIQEWfW`~HPS9FtlIf7U+En%V-eUtwQ3TR0>c4tN_Pd)Bq~DSiXn&VHse&@3 z4^v}9XNK;hk9}YJo-wVN>ZZ`--WRC2a6`pu^}WzhLGf3Z<&{g!;*i>-�hPlvf$$ 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

6$a0UQTrfeez)AY-uF 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 e+mra`IE3I}6O;m#KpP+$9!#ad=S@nI>Hh 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