526 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	899adbce5b	merge fixed	2016-10-20 09:17:32 +02:00
Dhanya Maliakal	12574f4c05	merged zmqdata to developer	2016-10-20 08:46:48 +02:00
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	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	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	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	6751132466	works	2016-10-07 14:26:41 +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	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	6da59ca382	somewhere, but weird threads	2016-10-05 15:26:58 +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	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	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	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	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	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	f517eb7a41	included json example with dummy values	2016-09-16 17:19:37 +02:00
Dhanya Maliakal	1263e80d21	done	2016-09-16 12:49:27 +02:00
Dhanya Maliakal	1da4b07e73	works, need to do json header and send dataready	2016-09-15 17:15:55 +02:00
Dhanya Maliakal	a821442b1a	almosst	2016-09-15 12:16:01 +02:00
Dhanya Maliakal	0f9a841c4a	almost done	2016-09-15 10:17:16 +02:00
Dhanya Maliakal	33807b7fac	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata	2016-09-14 10:43:33 +02:00
Dhanya Maliakal	652d29f2d9	almost done	2016-09-09 17:51:36 +02:00
Anna Bergamaschi	988426dc96	Added adc command for chiptestboard	2016-09-05 10:49:47 +02:00
Dhanya Maliakal	aad1885bf5	updaterev	2016-08-30 16:13:18 +02:00
Anna Bergamaschi	c6c11f6740	Added v_a command for chiptestboard	2016-08-22 14:32:42 +02:00
Anna Bergamaschi	b90ca7b864	Added DACs for ne chiptestboard; fixed problem on dac14/highvoltage for moench	2016-08-16 15:15:24 +02:00
Dhanya Maliakal	597f5e5d2a	got rid of unnecesaary handshaking for -1 in dynamic range in receiver	2016-08-15 11:15:52 +02:00
Dhanya Maliakal	1f9dc775f6	ensure receiver is updated when detector timer values are updated (force_update)	2016-08-12 17:44:28 +02:00