Dhanya Thattil def79807f6 merge conflict resolved from 4.0.0

2018-09-28 16:28:21 +02:00

..

communication_funcs.c

merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file

2018-02-07 11:02:36 +01:00

communication_funcs.h

jungfrau server making it uniform, left to do: register confirmation and server_defs

2016-02-04 16:18:01 +01:00

error_defs.h

bit field for missing packets, added commands r_padding and r_discardpolicy, hdf5 bitfield metadata left to do

2018-07-05 13:47:20 +02:00

sls_detector_defs.h

client: moved shortenable to roi in reciever, roi not yet written in master file

2018-09-19 17:35:26 +02:00

sls_detector_funcs.h

slsDetectorSoftware: Eiger server, added 3 commands, measuredperiod,measuredsubperiod, status trigger. measured period is in 10ns in det server, status trigger reads reg,sets bit and unsets bit

2018-08-10 19:14:05 +02:00

versionAPI.h

merge conflict resolved from 4.0.0

2018-09-28 16:28:21 +02:00