3484 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Dhanya Maliakal	c093da38ae	updaterev	2016-09-29 08:29:39 +02:00
Gemma Tinti	4b7743b8ad	update manual	2016-09-28 14:25:24 +02:00
Gemma Tinti	8a80cb489d	change server with new boundary for counts above teh max	2016-09-27 20:47:59 +02:00
Dhanya Maliakal	5c81abdce0	jungfrau programming change	2016-09-26 12:00:23 +02:00
Dhanya Maliakal	5f4a4b0d90	maybe fixed 16 bit rate corr eiger	2016-09-23 17:15:16 +02:00
Dhanya Maliakal	1b61e10e36	forgot to add eiger binary	2016-09-23 14:32:21 +02:00
Dhanya Maliakal	d904f7b32e	adding 16 bit rate correction in eiger	2016-09-23 14:28:20 +02:00
Dhanya Maliakal	c678199802	Merge branch '2.1-rc' into developer	2016-09-22 17:19:10 +02:00
Dhanya Maliakal	953e513a2d	updatereveiger	2016-09-22 17:18:35 +02:00
Dhanya Maliakal	a7c180eb1c	settings initially at UNINITIALIZED in eiger server	2016-09-22 17:16:49 +02:00
Dhanya Maliakal	44870480be	merging for gotthard, not done	2016-09-22 13:17:17 +02:00
Dhanya Maliakal	1aff36efb8	small print out change	2016-09-21 16:37:52 +02:00
Dhanya Maliakal	d0501c3139	creating and destroying sockets for each receiver start and stop in a single acquisition (to deal with scans etc)	2016-09-21 16:37:29 +02:00
Dhanya Maliakal	d6ca7ecbc4	done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc	2016-09-20 15:12:26 +02:00
Dhanya Maliakal	a1df8bdc15	done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc	2016-09-20 15:11:39 +02:00
Dhanya Maliakal	acb5e50870	Merge branch 'developer' into zmqdata	2016-09-20 14:42:20 +02:00
Dhanya Maliakal	9f2430cace	enablingdatastream name change	2016-09-20 14:42:01 +02:00
Dhanya Maliakal	7745bf5e0c	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer	2016-09-20 10:44:11 +02:00
Dhanya Maliakal	8c88de899a	added in gitignore to ignore build and tests	2016-09-20 10:43:59 +02:00
Dhanya Maliakal	bdcbdba2ab	done with eiger	2016-09-20 10:42:49 +02:00
Dhanya Maliakal	d751c626b3	done with eiger	2016-09-20 10:42:43 +02:00
Dhanya Maliakal	611f3a26c2	only missing data left to be handled in zmqthread in receiver	2016-09-19 17:21:28 +02:00
Dhanya Maliakal	904d21d0be	only missing data left to be handled in zmqthread in receiver	2016-09-19 17:21:23 +02:00
Dhanya Maliakal	6a244c1057	bug fixed, rapidjson parse error	2016-09-19 12:34:38 +02:00
Dhanya Maliakal	38d477a1ad	bug fixed, rapidjson parse error	2016-09-19 12:34:31 +02:00
wang_x1	189834bb53	autorcc is not available for cmake 2.8, use manual instead	2016-09-19 11:59:47 +02:00
Dhanya Maliakal	82669103af	added rapidjson lib	2016-09-16 17:22:44 +02:00
Dhanya Maliakal	57e741c36c	included json example with dummy values	2016-09-16 17:19:55 +02:00
Dhanya Maliakal	f517eb7a41	included json example with dummy values	2016-09-16 17:19:37 +02:00
Dhanya Maliakal	6abb1d2ae9	included json example with dummy values	2016-09-16 17:19:29 +02:00
Dhanya Maliakal	e9a3310042	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_receiver_software into zmqdata	2016-09-16 15:41:20 +02:00
Dhanya Maliakal	c16f251442	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata	2016-09-16 15:41:05 +02:00
Dhanya Maliakal	9c8f663b8e	done	2016-09-16 12:49:39 +02:00
Dhanya Maliakal	1263e80d21	done	2016-09-16 12:49:27 +02:00
Dhanya Maliakal	895dae6d68	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_gui into zmqdata	2016-09-16 12:48:57 +02:00