419 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	266506e67f	merged with zmqdata	2016-10-20 08:54:29 +02:00
Dhanya Maliakal	d1de27992b	Merge branch '2.1.1-rc' into developer	2016-10-20 08:30:50 +02:00
Dhanya Maliakal	dd0a1f60c6	proper update of progressfile bug	2016-10-20 08:30:38 +02:00
Dhanya Maliakal	8bc2755759	Merge branch '2.1.1-rc' into developer	2016-10-20 08:25:04 +02:00
Dhanya Maliakal	e819ed26e1	proper update of progressfile bug	2016-10-20 08:24:54 +02:00
Dhanya Maliakal	7eafce87f9	fixed the print file packet loss progress bug	2016-10-20 08:13:42 +02:00
Dhanya Maliakal	8d5259d653	Merge branch '2.1.1-rc' into developer	2016-10-20 07:56:07 +02:00
Dhanya Maliakal	09c853ae26	fixed the print file packet loss progress bug	2016-10-20 07:55:56 +02:00
Dhanya Maliakal	0f8a33d71f	overwriting	2016-10-18 14:31:05 +02:00
Dhanya Maliakal	82884370b5	back	2016-10-18 14:05:05 +02:00
Dhanya Maliakal	cdaeff76d5	switched	2016-10-18 12:19:20 +02:00
Dhanya Maliakal	e00ad76e55	trying	2016-10-18 12:08:11 +02:00
Dhanya Maliakal	01366b7273	done	2016-10-18 11:10:42 +02:00
Dhanya Maliakal	37c0ea7453	almost there	2016-10-18 08:43:21 +02:00
Dhanya Maliakal	b0bedc516d	works for missing packets and image reconstruction	2016-10-14 16:08:43 +02:00
Dhanya Maliakal	5c4d55af6b	random read, the current fnum shoud be sent, not the padded frame	2016-10-12 08:53:13 +02:00
Dhanya Maliakal	e45b89695b	somewhere	2016-10-11 12:35:49 +02:00
Dhanya Maliakal	47516cafde	works	2016-10-07 14:26:53 +02:00
Dhanya Maliakal	51e45baeff	removing check for read out	2016-10-07 12:14:08 +02:00
Dhanya Maliakal	831bd8e160	some changes for quitting gui and continuing with acquire from command line	2016-10-07 11:40:56 +02:00
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