3826 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	a51f4f1252	Merge branch '3.0.1' into developer	2017-12-05 14:49:32 +01:00
Dhanya Maliakal	7b1f935da2	allowing to read adcs/temp during acquire	2017-12-05 14:49:20 +01:00
Dhanya Maliakal	2d14da545d	Merge branch '3.0.1' into developer	2017-12-05 13:47:09 +01:00
Dhanya Maliakal	ce1ec97571	some indentation in writing config file	2017-12-05 13:47:01 +01:00
Dhanya Maliakal	9150556209	merge from 3.0.1 added more to write config/paramters	2017-12-05 13:42:35 +01:00
Dhanya Maliakal	3b684c4662	Merge branch '3.0.1' into developer	2017-12-05 13:41:26 +01:00
Dhanya Maliakal	d00c837977	updated write config and write parameters list	2017-12-05 13:41:16 +01:00
Dhanya Maliakal	0ef52138e1	merge conflict sorted, removing rest	2017-12-05 11:25:10 +01:00
Dhanya Maliakal	28211af5af	Makefile for Receiver merged incorrectly sometime back, also in archived project	2017-12-05 11:23:35 +01:00
Dhanya Maliakal	536203b6dc	one repo so need for gitall.sh	2017-12-05 11:16:22 +01:00
Dhanya Maliakal	65b4c69847	REST implementation removed from slsReceiver	2017-12-05 11:03:52 +01:00
Dhanya Maliakal	2ae5a959fe	fix in receiver merge conflict (before the respos merge)	2017-12-04 18:35:57 +01:00
Dhanya Maliakal	263d702535	Merge remote branch 'slsDetectorGui/developer' into developer	2017-12-04 16:48:32 +01:00
Dhanya Maliakal	7512f818cb	Merge remote branch 'slsReceiverSoftware/developer' into developer	2017-12-04 16:48:32 +01:00
Dhanya Maliakal	25023f6971	Merge remote branch 'slsDetectorSoftware/developer' into developer	2017-12-04 16:48:30 +01:00
Dhanya Maliakal	61791c078c	Merge remote branch 'slsDetectorGui/3.0.1' into 3.0.1	2017-12-04 16:48:17 +01:00
Dhanya Maliakal	36802cdb14	Merge remote branch 'slsReceiverSoftware/3.0.1' into 3.0.1	2017-12-04 16:48:17 +01:00
Dhanya Maliakal	e26cf3b673	Merge remote branch 'slsDetectorSoftware/3.0.1' into 3.0.1	2017-12-04 16:48:15 +01:00
Dhanya Maliakal	aab62fccc1	Merge remote branch 'slsDetectorGui/3.0' into 3.0	2017-12-04 16:48:09 +01:00
Dhanya Maliakal	73ce4abd58	Merge remote branch 'slsReceiverSoftware/3.0' into 3.0	2017-12-04 16:48:08 +01:00
Dhanya Maliakal	c12b137b79	Merge remote branch 'slsDetectorSoftware/3.0' into 3.0	2017-12-04 16:48:07 +01:00
Dhanya Maliakal	9f152ce1f3	merge conflict resolved	2017-12-01 12:44:34 +01:00
Dhanya Maliakal	d1e3d50a87	cosmetic print outs	2017-12-01 12:43:14 +01:00
Dhanya Maliakal	a06f29f473	minor cosmetics	2017-12-01 11:23:17 +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	0e26734023	restreaming stop fix	2017-11-30 19:13:55 +01:00
Dhanya Maliakal	fd64ba289e	Merge branch '3.0.1' into developer	2017-11-30 19:07:21 +01:00
Dhanya Maliakal	e9343a5bd0	remove warning	2017-11-30 19:07:05 +01:00
Dhanya Maliakal	6f3898441e	merge conflict from 3.0.1 to restream stop from recieveR	2017-11-30 19:05:47 +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	385e6714cc	merge conflict from 3.0.1 to restream stop from recieveR	2017-11-30 19:05:19 +01:00
Dhanya Maliakal	70bf6eb4cb	restream stop from receiver	2017-11-30 18:39:08 +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	baee38802b	wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it	2017-11-30 16:20:26 +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	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