3839 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	397344a264	Merge branch '3.0.1' into developer	2017-11-29 12:13:09 +01:00
Dhanya Maliakal	712c9a4524	zmq connect earlier in gui to prevent losing first messages	2017-11-29 12:13:02 +01:00
Dhanya Maliakal	e17e4c3171	Merge branch '3.0.1' into developer	2017-11-28 18:50:27 +01:00
Dhanya Maliakal	b75985088d	twice connect bug fix in zmq	2017-11-28 18:50:18 +01:00
Dhanya Maliakal	8bba57e77d	fix to not have sls_receiver_defs in zmqSocket.h incldue	2017-11-28 16:32:15 +01:00
Dhanya Maliakal	7c1423d654	zmqip fix to restart reciever streaming form command line, fix to not have sls_receiver_defs in zmqSocket.h incldue	2017-11-28 16:31:43 +01:00
Dhanya Maliakal	8388d1f503	using file index from zmq	2017-11-28 14:45:48 +01:00
Dhanya Maliakal	6a41b5ce3a	using file index from zmq	2017-11-28 14:45:29 +01:00
Dhanya Maliakal	1c606df752	using file index from zmq	2017-11-28 14:45:01 +01:00
Dhanya Maliakal	1e85482d09	make updated	2017-11-28 11:30:23 +01:00
Dhanya Maliakal	a89847538d	merge ocnflict for white background	2017-11-28 11:29:15 +01:00
Dhanya Maliakal	130f3d2e6f	Merge branch '3.0.1' into developer	2017-11-28 11:18:43 +01:00
Dhanya Maliakal	a351fa8f28	switching from black to white background for receiver	2017-11-28 11:18:30 +01:00
Dhanya Maliakal	4825ace129	switching from black to white background for receiver	2017-11-28 11:18:22 +01:00
Dhanya Maliakal	57fc89a6bb	comment users	2017-11-28 10:51:05 +01:00
Dhanya Maliakal	ba71529ff2	comment in users	2017-11-28 10:50:35 +01:00
Dhanya Maliakal	f49998ccd9	Merge branch '3.0.1' into developer	2017-11-28 10:35:24 +01:00
Dhanya Maliakal	1fce54ec4b	zmqport in users fixed	2017-11-28 10:35:06 +01:00
Dhanya Maliakal	41f24489bc	zmqip in users fixed	2017-11-28 10:33:40 +01:00
Dhanya Maliakal	addf964901	Merge branch '3.0.1' into developer	2017-11-28 09:37:09 +01:00
Dhanya Maliakal	bca7c649d7	Merge branch '3.0.1' into developer	2017-11-28 09:37:09 +01:00
Dhanya Maliakal	1dd300f713	only call register call back which already enables streaming in client and receiver, added to postprocessing	2017-11-28 09:36:54 +01:00
Dhanya Maliakal	d5c310a2db	only call register call back which already enables streaming in client and receiveR	2017-11-28 09:36:14 +01:00
Dhanya Maliakal	747e9af431	Merge branch '3.0.1' into developer	2017-11-28 09:26:55 +01:00
Dhanya Maliakal	9f91b78696	update comments	2017-11-28 09:26:12 +01:00
Dhanya Maliakal	620f7651a0	Merge branch '3.0.1' into developer	2017-11-28 09:24:57 +01:00
Dhanya Maliakal	d1eab6f750	updated slsdetector users for zmqport set up	2017-11-28 09:24:40 +01:00
Dhanya Maliakal	4466213882	makng the zmq work without external flag	2017-11-27 17:06:27 +01:00
Dhanya Maliakal	ca19993149	makng the zmq work without external flag	2017-11-27 17:06:18 +01:00
Dhanya Maliakal	e29371ca8d	makng the zmq work without external flag	2017-11-27 17:06:11 +01:00
Dhanya Maliakal	c0a114345b	bug fix set error mask when setting wrong settings	2017-11-27 16:11:33 +01:00
Dhanya Maliakal	386ef7766c	zmq streaming should work with external gui now	2017-11-27 16:01:12 +01:00
Dhanya Maliakal	375b1c9485	not required to restart client datastreaming due to connect everytime for acquire	2017-11-27 15:40:36 +01:00
Dhanya Maliakal	3439ccbec9	updates for merge for r_readfreq without reciever	2017-11-23 18:30:48 +01:00
Dhanya Maliakal	a0c9018455	Merge branch '3.0.1' into developer	2017-11-23 18:24:34 +01:00
Dhanya Maliakal	f0431bd873	Merge branch '3.0.1' into developer	2017-11-23 18:24:33 +01:00
Dhanya Maliakal	65d7922286	merge solved	2017-11-23 18:24:24 +01:00
Dhanya Maliakal	eb89e9bf96	Merge branch '3.0.1' into zmqchange	2017-11-23 18:22:27 +01:00
Dhanya Maliakal	9f733c1dfb	Merge branch '3.0.1' into zmqchange	2017-11-23 18:22:26 +01:00
Dhanya Maliakal	59b5fe9424	receiver read freq should save value in shm even if no receiver present	2017-11-23 18:22:03 +01:00
Dhanya Maliakal	16e4fbf8dd	receiver read freq should save value in shm even if no receiver present	2017-11-23 18:21:54 +01:00
Dhanya Maliakal	d40a2e0efa	receiver read freq should save value in shm even if no receiver present	2017-11-23 18:21:29 +01:00
Dhanya Maliakal	ab5229bcbf	bugfix zmq ip was being overwritten	2017-11-23 17:48:30 +01:00
Dhanya Maliakal	5eb8402742	bugfix zmq streaming both on	2017-11-23 17:28:35 +01:00
Dhanya Maliakal	585661412c	Merge branch '3.0.1' into developer	2017-11-23 17:20:13 +01:00
Dhanya Maliakal	dc5384f0f9	copy zmq port even if receiver not online, else it is lost	2017-11-23 17:20:07 +01:00
Dhanya Maliakal	935fecefde	copy zmq ip even if receiver not online, else it is lost	2017-11-23 17:18:40 +01:00
Dhanya Maliakal	20dc338c90	when changing network parameter, switch off data streaming only if on	2017-11-23 17:00:12 +01:00
Dhanya Maliakal	2c276db579	solved merge conflict in changes to use ZmqSocket.h externally	2017-11-23 16:35:31 +01:00
Dhanya Maliakal	b14ea217ee	Merge branch '3.0.1' into zmqchange	2017-11-23 16:34:14 +01:00