From 0ee7f67965610d28de35b86f99eb1f47be29027a Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 11 Oct 2018 14:20:50 +0200 Subject: [PATCH] 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