1346 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	59f3aef703	back to subscriber publisher	2016-10-07 10:15:19 +02:00
Dhanya Maliakal	e6db70354c	thread starting if rxr closed and others	2016-10-06 15:50:11 +02:00
Dhanya Maliakal	6f6199ad20	moved created socket outside innner and outer loop	2016-10-06 14:43:56 +02:00
Dhanya Maliakal	65acd118c5	looks done	2016-10-06 13:51:23 +02:00
Dhanya Maliakal	09e8bf4144	somewhere	2016-10-05 15:27:25 +02:00
Dhanya Maliakal	bf54c15560	updated to have activate function implemented	2016-10-05 09:30:08 +02:00
Dhanya Maliakal	489b623afd	trying to get in changes for activate in receiver	2016-10-05 08:24:35 +02:00
Dhanya Maliakal	39a1f16b33	Merge branch '2.1.1-rc' into developer	2016-10-04 15:16:04 +02:00
Dhanya Maliakal	94667c5dde	got rif of unnecessary usleep in lisetning	2016-10-04 15:15:08 +02:00
Dhanya Maliakal	9cfd914a3e	Merge branch '2.1.1-rc' into developer	2016-10-04 14:35:19 +02:00
Dhanya Maliakal	f6b7fd7aa3	merged thread error fix from developer	2016-10-04 14:29:25 +02:00
Dhanya Maliakal	2a4bd8022e	works for deactivated server and receiver	2016-10-04 07:36:00 +02:00
Dhanya Maliakal	1aec6a71a1	Merge branch '2.1' into developer	2016-09-30 15:13:34 +02:00
Dhanya Maliakal	572047b72d	was making 3 threads for each set detector type command, because it created standard receiver object each time	2016-09-30 15:13:12 +02:00
Dhanya Maliakal	01ed24263f	updaterev	2016-09-29 10:29:24 +02:00
Dhanya Maliakal	44870480be	merging for gotthard, not done	2016-09-22 13:17:17 +02:00
Dhanya Maliakal	1aff36efb8	small print out change	2016-09-21 16:37:52 +02:00
Dhanya Maliakal	d6ca7ecbc4	done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc	2016-09-20 15:12:26 +02:00
Dhanya Maliakal	bdcbdba2ab	done with eiger	2016-09-20 10:42:49 +02:00
Dhanya Maliakal	611f3a26c2	only missing data left to be handled in zmqthread in receiver	2016-09-19 17:21:28 +02:00
Dhanya Maliakal	6a244c1057	bug fixed, rapidjson parse error	2016-09-19 12:34:38 +02:00
Dhanya Maliakal	82669103af	added rapidjson lib	2016-09-16 17:22:44 +02:00
Dhanya Maliakal	57e741c36c	included json example with dummy values	2016-09-16 17:19:55 +02:00
Dhanya Maliakal	e9a3310042	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_receiver_software into zmqdata	2016-09-16 15:41:20 +02:00
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