1429 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	81d96a047d	slsDetector/slsDetectorCommand.cpp	2016-10-20 07:31:53 +02:00
Dhanya Maliakal	44a69e2aee	improved locking a bit	2016-10-19 10:46:03 +02:00
Dhanya Maliakal	121e9faf56	trying with the actual 1 getframescaught	2016-10-19 10:32:11 +02:00
Dhanya Maliakal	673e7c8f20	removed asking only 1 for framescaugh	2016-10-19 10:22:35 +02:00
Dhanya Maliakal	749c64204e	done showing error when detectors not added in sharedmemory due to connect failure	2016-10-19 08:15:52 +02:00
Dhanya Maliakal	e49f97a03c	done showing error when detectors not added in sharedmemory due to connect failure	2016-10-19 08:10:42 +02:00
Dhanya Maliakal	f535e11bba	check not done	2016-10-18 15:31:48 +02:00
Dhanya Maliakal	028ba57876	check for giving an error in gui if cannot connect to hostname	2016-10-18 15:06:01 +02:00
Dhanya Maliakal	ca89835035	check for giving an error in gui if cannot connect to hostname	2016-10-18 15:03:44 +02:00
Dhanya Maliakal	1e9ebc6f37	check for giving an error in gui if cannot connect to hostname	2016-10-18 14:50:25 +02:00
Dhanya Maliakal	4bfbd24144	check for giving an error in gui if cannot connect to hostname	2016-10-18 14:47:52 +02:00
Dhanya Maliakal	18046379ab	bugfix:seg fault for giving an error in gui if cannot connect to hostname	2016-10-18 14:44:13 +02:00
Dhanya Maliakal	8502a7b79f	giving	2016-10-18 14:36:04 +02:00
Dhanya Maliakal	a7e8ff1c42	back	2016-10-18 14:05:05 +02:00
Dhanya Maliakal	eec812f92c	switched	2016-10-18 12:33:47 +02:00
Dhanya Maliakal	de5037ae2b	switched	2016-10-18 12:19:20 +02:00
Dhanya Maliakal	208c12b72c	trying	2016-10-18 12:12:08 +02:00
Dhanya Maliakal	3a6d97b4f3	trying	2016-10-18 12:08:11 +02:00
Dhanya Maliakal	9f28cc686c	done	2016-10-18 11:10:42 +02:00
Dhanya Maliakal	1bade91254	almost there	2016-10-18 08:43:16 +02:00
Dhanya Maliakal	03cdda99ae	fixed bug in temp front fpga	2016-10-07 15:54:46 +02:00
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	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	125c3a789a	locking improved	2016-10-07 11:56:04 +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	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	ed8a779f7f	thread starting if rxr closed and others	2016-10-06 15:50:02 +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	6da59ca382	somewhere, but weird threads	2016-10-05 15:26:58 +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	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	0979d04693	works for deactivated server and receiver	2016-10-04 07:35:52 +02:00
Dhanya Maliakal	f513fb06fb	switching the gpio definitions into function implementation	2016-09-30 07:56:54 +02:00
Dhanya Maliakal	d3c4d52118	updaterev	2016-09-29 10:29:48 +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