Anna Bergamaschi 91344f54d9 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software ...

Conflicts:
	multiSlsDetector/multiSlsDetector.cpp

2014-11-25 11:46:34 +01:00

..

.target-makefrag

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

communication_funcs.c

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

communication_funcs.h

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

firmware_funcs.c

pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency

2014-11-25 11:38:19 +01:00

firmware_funcs.h

pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency

2014-11-25 11:38:19 +01:00

gitInfo.txt

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

gitInfoMoench.h

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

gitInfoMoenchTmp.h

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

jungfrauDetectorServer

pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency

2014-11-25 11:38:19 +01:00

jungfrauDetectorServer.gdb

pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency

2014-11-25 11:38:19 +01:00

Makefile

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

Makefile.virtual

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

mcb_funcs.c

pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency

2014-11-25 11:38:19 +01:00

mcb_funcs.h

pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency

2014-11-25 11:38:19 +01:00

moenchDetectorServer

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

moenchVirtualServer

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

registers_m.h

pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency

2014-11-25 11:38:19 +01:00

server_defs.h

pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency

2014-11-25 11:38:19 +01:00

server_funcs.c

pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency

2014-11-25 11:38:19 +01:00

server_funcs.h

Client and jungfrau server funcs added for pattern generator

2014-10-14 17:03:13 +02:00

server.c

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

sharedmemory.c

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

sharedmemory.h

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

sls_detector_defs.h

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

sls_detector_funcs.h

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

sls_receiver_defs.h

symbolic link corrected to point ot correct location

2014-11-17 17:00:38 +01:00

sls_receiver_funcs.h

symbolic link corrected to point ot correct location

2014-11-17 17:00:38 +01:00

stop_server.c

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

trimming_funcs.c

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00

trimming_funcs.h

Added jungfrau detector server (not functional, though)

2014-10-01 10:38:47 +02:00