2172 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	25023f6971	Merge remote branch 'slsDetectorSoftware/developer' into developer	2017-12-04 16:48:30 +01:00
Dhanya Maliakal	12348ac76c	merge conflict fix	2017-12-01 09:20:44 +01:00
Dhanya Maliakal	18422ce215	setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked	2017-12-01 09:18:42 +01:00
Dhanya Maliakal	5b88203bd9	merge conflict from 3.0.1 to restream stop from recieveR	2017-11-30 19:05:35 +01:00
Dhanya Maliakal	ca855e6d39	restream stop from receiver	2017-11-30 18:37:11 +01:00
Dhanya Maliakal	2227265357	removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire	2017-11-30 16:25:23 +01:00
Dhanya Maliakal	1edb41242c	ensure gui gets measurement finished after dummy packet received from receiver/ext process	2017-11-29 15:22:10 +01:00
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	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	6a41b5ce3a	using file index from zmq	2017-11-28 14:45:29 +01:00
Dhanya Maliakal	1e85482d09	make updated	2017-11-28 11:30:23 +01:00
Dhanya Maliakal	130f3d2e6f	Merge branch '3.0.1' into developer	2017-11-28 11:18:43 +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	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	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	ca19993149	makng the zmq work without external flag	2017-11-27 17:06:18 +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	3439ccbec9	updates for merge for r_readfreq without reciever	2017-11-23 18:30:48 +01:00
Dhanya Maliakal	65d7922286	merge solved	2017-11-23 18:24:24 +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	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	a57e8edd88	jctb setting dr correctly	2017-11-23 16:15:38 +01:00
Dhanya Maliakal	8538604c0f	somewhere	2017-11-23 14:53:37 +01:00
Dhanya Maliakal	2ac170db98	removed data streaming shutdown from command line to allow external gui	2017-11-23 11:52:46 +01:00
Dhanya Maliakal	ab93835ce2	merge conflict to include datastreaming in client comment	2017-11-23 10:29:08 +01:00
Dhanya Maliakal	3b292bdeb6	need to enable data streaming for client	2017-11-23 10:27:59 +01:00
Dhanya Maliakal	43140811bd	one measurement in users class	2017-11-23 10:25:35 +01:00
Dhanya Maliakal	34908edd6a	Merge branch '3.0.1' into developer	2017-11-23 10:22:03 +01:00
Dhanya Maliakal	856ad76247	included setreceiver online in users class, so that one can start using users without config file	2017-11-23 10:21:54 +01:00
Dhanya Maliakal	29f3387d73	Merge branch '3.0.1' into developer	2017-11-23 09:34:22 +01:00
Dhanya Maliakal	4749e8c4e4	modified users client to work without config and better print out	2017-11-23 09:34:12 +01:00
Dhanya Maliakal	a1d325a115	Merge branch '3.0.1' into developer	2017-11-23 09:20:22 +01:00
Dhanya Maliakal	3034cf87d0	changes that might be reverted in detser	2017-11-23 09:20:20 +01:00
Dhanya Maliakal	447451231c	modified users client to work without config and better print out	2017-11-22 18:09:16 +01:00