Dhanya Maliakal 24c305ec59 solved conflicts from merge of version being used to binary

2017-12-06 19:07:06 +01:00

..

bin

updated merge from 3.0 hotfix setdac

2017-11-16 12:32:38 +01:00

AD9257.h

took out also the ADC and serialspi

2017-06-14 11:28:16 +02:00

ansi.h

added new jungfraustructure, wiht common detector tcp interface

2017-06-12 18:50:18 +02:00

blackfin.h

made some functions common

2017-06-14 10:43:15 +02:00

commonServerFunctions.h

took out also the ADC and serialspi

2017-06-14 11:28:16 +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

gitInfo.txt

solved conflicts from merge of version being used to binary

2017-12-06 19:07:06 +01:00

gitInfoJungfrau.h

solved conflicts from merge of version being used to binary

2017-12-06 19:07:06 +01:00

gitInfoJungfrauTmp.h

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

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

Makefile

some more changes to make file for automatic versioning

2017-07-10 11:18:41 +02:00

Makefile.virtual

added new jungfraustructure, wiht common detector tcp interface

2017-06-12 18:50:18 +02:00

programfpga.h

made some functions common

2017-06-14 10:43:15 +02:00

RegisterDefs.h

fixed temperature for jungfrau in server, also for negative values

2017-07-06 16:07:01 +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

slsDetectorFunctionList.c

solved conflicts from merge of version being used to binary

2017-12-06 19:07:06 +01:00

slsDetectorFunctionList.h

added new jungfraustructure, wiht common detector tcp interface

2017-06-12 18:50:18 +02:00

slsDetectorServer_defs.h

took out also the ADC and serialspi

2017-06-14 11:28:16 +02:00

slsDetectorServer_funcs.c

added new jungfraustructure, wiht common detector tcp interface

2017-06-12 18:50:18 +02:00

slsDetectorServer_funcs.h

added new jungfraustructure, wiht common detector tcp interface

2017-06-12 18:50:18 +02:00

slsDetectorServer.c

added new jungfraustructure, wiht common detector tcp interface

2017-06-12 18:50:18 +02:00

updateGitVersion.sh

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

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