6469 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	28f96f4b51	included a febl and febr temp read	2016-10-07 15:44:13 +02:00
Dhanya Maliakal	f751e060b9	fixed bug that it does not display image 2	2016-10-07 15:13:20 +02:00
Dhanya Maliakal	47516cafde	works	2016-10-07 14:26:53 +02:00
Dhanya Maliakal	6751132466	works	2016-10-07 14:26:41 +02:00
Dhanya Maliakal	dce9911164	ask only 1 for frames caught for 9m	2016-10-07 13:48:45 +02:00
Dhanya Maliakal	4d1c6a1940	ask only 1 for frames caught for 9m	2016-10-07 13:48:19 +02:00
Dhanya Maliakal	d4122726ec	ask only 1 for frames caught for 9m	2016-10-07 13:16:12 +02:00
Dhanya Maliakal	16adb444b9	changed back the delay between framescaught	2016-10-07 13:12:57 +02:00
Dhanya Maliakal	d54392c6eb	increased delay to get framescaught from receiver for acquire form command line	2016-10-07 12:45:34 +02:00
Dhanya Maliakal	51e45baeff	removing check for read out	2016-10-07 12:14:08 +02:00
Dhanya Maliakal	125c3a789a	locking improved	2016-10-07 11:56:04 +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	1545d37f36	some changes for quitting gui and continuing with acquire from command line	2016-10-07 11:40:51 +02:00
Dhanya Maliakal	dc16d52d49	switching off gui, and acqire should work	2016-10-07 10:21:22 +02:00
Dhanya Maliakal	59f3aef703	back to subscriber publisher	2016-10-07 10:15:19 +02:00
Dhanya Maliakal	b1dde586e1	back to subscriber publisher	2016-10-07 10:15:12 +02:00
Dhanya Maliakal	cce93ebbcf	removing the check for receiver to update data threads upon configuration	2016-10-07 07:54:26 +02:00
Dhanya Maliakal	e6db70354c	thread starting if rxr closed and others	2016-10-06 15:50:11 +02:00
Dhanya Maliakal	ed8a779f7f	thread starting if rxr closed and others	2016-10-06 15:50:02 +02:00
Dhanya Maliakal	6f6199ad20	moved created socket outside innner and outer loop	2016-10-06 14:43:56 +02:00
Dhanya Maliakal	54b78363b0	enabling datastream back to qdrawplot	2016-10-06 14:22:08 +02:00
Dhanya Maliakal	65acd118c5	looks done	2016-10-06 13:51:23 +02:00
Dhanya Maliakal	c5e7d44b15	looks done	2016-10-06 13:49:40 +02:00
Dhanya Maliakal	2fdc4389e2	Merge branch '2.1' into 2.1.1-rc	2016-10-06 08:51:06 +02:00
Dhanya Maliakal	5082435501	fixed bug in gui that overwrites the individual sls file path values with the multi value	2016-10-06 08:50:08 +02:00
Dhanya Maliakal	de2de6315c	somewhere	2016-10-06 08:44:00 +02:00
Dhanya Maliakal	723df0e9fb	somewhere	2016-10-06 08:43:14 +02:00
Dhanya Maliakal	09e8bf4144	somewhere	2016-10-05 15:27:25 +02:00
Dhanya Maliakal	6da59ca382	somewhere, but weird threads	2016-10-05 15:26:58 +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	39baeade37	Merge branch 'developer' into zmqdata	2016-10-04 14:43:31 +02:00
Dhanya Maliakal	13cff71faf	got rid of activate function definition redeclaration in receiver funcs	2016-10-04 14:43:02 +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	7ead69a761	merged with developer after it merged with 2.1.1-rc(deactivate)	2016-10-04 14:10:52 +02:00
Dhanya Maliakal	a4bb3fe4dd	merged with 2.1.1-rc inclding deactivate detectr and receiver	2016-10-04 14:06:47 +02:00
Dhanya Maliakal	984698efad	merged with developer a lot of bug fixes from 14 sep to 30 sep	2016-10-04 13:36:04 +02:00
Dhanya Maliakal	2a4bd8022e	works for deactivated server and receiver	2016-10-04 07:36:00 +02:00
Dhanya Maliakal	0979d04693	works for deactivated server and receiver	2016-10-04 07:35:52 +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	f513fb06fb	switching the gpio definitions into function implementation	2016-09-30 07:56:54 +02:00
Gemma Tinti	dcee737faf	documentation	2016-09-29 15:45:43 +02:00
Dhanya Maliakal	d3c4d52118	updaterev	2016-09-29 10:29:48 +02:00
Dhanya Maliakal	01ed24263f	updaterev	2016-09-29 10:29:24 +02:00
Dhanya Maliakal	5ae3522028	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2016-09-29 10:28:37 +02:00
Dhanya Maliakal	813b7ba6e7	added prgoramfpga functionality, currently gpio definitions required in /etc/rc file, will rectify in later commits	2016-09-29 10:28:27 +02:00