675 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	9c8f663b8e	done	2016-09-16 12:49:39 +02:00
Dhanya Maliakal	58713a90aa	works, need to do json header and send dataready	2016-09-15 17:16:00 +02:00
Dhanya Maliakal	7d86e62045	almost	2016-09-15 12:16:08 +02:00
wang_x1	c80b1c9a91	add missing preprossor macros	2016-09-14 11:58:39 +02:00
Dhanya Maliakal	3ed738b949	almost done	2016-09-09 17:52:07 +02:00
Dhanya Maliakal	258e671420	Merge branch 'cmake' into zmqdata	2016-09-05 10:43:13 +02:00
Dhanya Maliakal	5f6b4c1b79	in between	2016-09-05 10:09:49 +02:00
Dhanya Maliakal	4eceb3b5f7	kinda	2016-09-02 15:47:28 +02:00
Dhanya Maliakal	5b3ab9a2b4	soewhere	2016-09-01 13:34:02 +02:00
Dhanya Maliakal	eea2809136	in between	2016-09-01 11:22:28 +02:00
wang_x1	6152ca66b4	add cmake configuration	2016-08-31 20:55:00 +02:00
Dhanya Maliakal	a3369a7d21	separated	2016-08-31 17:23:44 +02:00
Dhanya Maliakal	fbf6e2bff1	not done	2016-08-31 10:23:58 +02:00
Dhanya Maliakal	8eea853a9a	updaterev	2016-08-30 16:13:24 +02:00
Dhanya Maliakal	be2bc15ab5	not done	2016-08-30 16:10:46 +02:00
Dhanya Maliakal	e9b7a11cf6	in between	2016-08-24 16:23:43 +02:00
Dhanya Maliakal	f17a2ba2b8	in between	2016-08-24 11:54:15 +02:00
Dhanya Maliakal	0a2a88e23f	in between	2016-08-17 09:33:59 +02:00
Dhanya Maliakal	b440c11a46	in between	2016-08-16 13:42:29 +02:00
Dhanya Maliakal	f50f4752dd	in between	2016-08-16 11:44:20 +02:00
Dhanya Maliakal	7a3e08406a	in between	2016-08-15 17:32:27 +02:00
Dhanya Maliakal	46b23dba24	in between	2016-08-15 16:59:30 +02:00
Dhanya Maliakal	3fbcbd5153	in between	2016-08-15 15:11:46 +02:00
Dhanya Maliakal	b64af8dc8d	starting	2016-08-15 12:10:16 +02:00
Dhanya Maliakal	882202c2bc	fixed bug show nth frame as in 2nd, 4th etc.	2016-08-12 13:48:30 +02:00
Dhanya Maliakal	e452bccea2	updaterev	2016-08-12 11:18:11 +02:00
Dhanya Maliakal	b3ad45b1c9	wrongly put func def in receiver_funcs	2016-08-04 17:19:31 +02:00
Dhanya Maliakal	658f3459ca	changes to get rid of warnings	2016-08-03 17:02:40 +02:00
Dhanya Maliakal	c852463de1	updaterev	2016-07-18 18:18:08 +02:00
Dhanya Maliakal	56a0bbfcc1	bug filename with respect to frame number	2016-07-14 17:10:28 +02:00
Dhanya Maliakal	eda342911f	update versions	2016-07-14 16:23:29 +02:00
Dhanya Maliakal	3fd3a5dc10	last frame number caught added to log	2016-07-12 16:21:50 +02:00
Dhanya Maliakal	79e3cdd183	receiver crashing at file write disabled taking acquistion	2016-07-12 16:02:23 +02:00
Dhanya Maliakal	779d8d1094	updating versions	2016-07-06 10:32:58 +02:00
Dhanya Maliakal	96a88f9de2	added timestamp	2016-07-06 10:31:30 +02:00
Dhanya Maliakal	347ecb9bb5	updating versions	2016-07-05 17:24:45 +02:00
Dhanya Maliakal	980c1c02e6	updating versions	2016-07-05 17:23:05 +02:00
Dhanya Maliakal	a65920377c	feature with header in file	2016-07-05 17:17:34 +02:00
Dhanya Maliakal	df04d9fb07	updating versions	2016-07-04 15:51:18 +02:00
Dhanya Maliakal	d88253f643	versions update	2016-06-13 19:10:14 +02:00
Dhanya Maliakal	75a50a7ae0	receiver udp parameters should be sent to receiver everytime if rx_hostname is set	2016-05-10 17:13:27 +02:00
Dhanya Maliakal	d88b104aa8	bug fix for receiver call back	2016-03-15 15:28:50 +01:00
Dhanya Maliakal	83f3ab145e	resolved conflict in merging with release	2016-02-25 14:17:32 +01:00
Dhanya Maliakal	d4b388f434	unresolved conflict	2016-02-25 14:13:42 +01:00
Dhanya Maliakal	bda8b69e05	Merge branch 'master' into release	2016-02-25 14:01:22 +01:00
Dhanya Maliakal	683ea31963	removed comment entering missing zone	2016-02-25 13:56:23 +01:00
Dhanya Maliakal	1ef91414d6	Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_receiver_software into release	2016-02-25 13:51:34 +01:00
Dhanya Maliakal	e508050be8	bug fix: converts any receiver other than eiger into a jungfrau receiver	2016-02-25 12:11:05 +01:00
Anna Bergamaschi	f113b1afbb	Added status stopped	2016-02-22 15:07:05 +01:00
Anna Bergamaschi	66eddb1afe	Added stopped status	2016-02-22 14:00:22 +01:00