maliakal_d b58c3e8951 solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

..

.target-makefrag

…

AD9257.h

…

ansi.h

…

commonServerFunctions.h

…

communication_funcs.c

…

communication_funcs.h

…

config.txt

jungfrau 25um server, added start acq delay to server config file

2018-02-08 15:16:23 +01:00

firmware_funcs.c

gotthard server: red in stopping server for debugging

2018-02-26 17:34:35 +01:00

firmware_funcs.h

gotthard server simplified trigger, remove synchronization and master for 50um, changed measurement time, fixed compiler bugs

2018-02-08 11:40:35 +01:00

gitInfo.txt

gotthard server : bugfix for getting id

2018-02-27 14:33:58 +01:00

gitInfoGotthard.h

gotthard server : bugfix for getting id

2018-02-27 14:33:58 +01:00

gitInfoGotthardTmp.h

changed all variables from svn to git, included --version for receiver binary

2017-12-06 10:29:57 +01:00

gotthardDetectorServer_developer

merge from 3.0.1 for gotthard 25um server start acq delay

2018-02-08 15:17:52 +01:00

gotthardDetectorServer_virtual

updated binaries

2018-02-27 14:37:46 +01:00

Makefile

…

Makefile.propix

…

Makefile.virtual

updated binaries

2018-02-27 14:37:46 +01:00

mcb_funcs.c

…

mcb_funcs.h

…

registers_g.h

jungfrau 25um server, added start acq delay to server config file

2018-02-08 15:16:23 +01:00

server_defs.h

…

server_funcs.c

gotthard server : bugfix for getting id

2018-02-27 14:33:58 +01:00

server_funcs.h

changes to gotthard server to include write adc, and also changes to fix the dma=dma+1

2017-07-11 10:54:21 +02:00

server.c

…

sharedmemory.c

…

sharedmemory.h

…

sls_detector_defs.h

…

sls_detector_funcs.h

…

sls_receiver_defs.h

…

sls_receiver_funcs.h

…

stop_server.c

…

trimming_funcs.c

…

trimming_funcs.h

…

updateGitVersion.sh

changed all variables from svn to git, included --version for receiver binary

2017-12-06 10:29:57 +01:00