351 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	9d106f6c93	changed clock for jungfrau, maybe other debugging stuff outside this folder	2016-11-21 09:21:30 +01:00
Dhanya Maliakal	c639477f28	adding exptime to receiver for file header	2016-11-14 11:57:29 +01:00
Dhanya Maliakal	44d6b0ffc0	fixed time interval in receiveR	2016-11-10 14:37:18 +01:00
Dhanya Maliakal	e4dcd1cb6b	setting and getting printouts, changed the rx mess to 1000	2016-11-07 15:34:47 +01:00
Dhanya Maliakal	8caa9d8779	fixed jungfrau problem, changed set receiver to updatedetector before	2016-11-04 17:14:47 +01:00
Dhanya Maliakal	4b99ff7fbe	reset fpga implemented, changed receiver configuration warning prints, powerchip implemented	2016-11-03 12:31:34 +01:00
Dhanya Maliakal	55c35b6669	merged	2016-11-02 14:36:21 +01:00
Dhanya Maliakal	1f3a418d93	make t crash	2016-11-01 15:02:14 +01:00
Dhanya Maliakal	7fc82723b5	some changes	2016-11-01 14:04:31 +01:00
Dhanya Maliakal	7374a37115	back with checking online, got rid of getframescaught altogether	2016-11-01 10:03:38 +01:00
Dhanya Maliakal	59b5844de6	got rid of check if online	2016-11-01 09:55:38 +01:00
Dhanya Maliakal	cf8bbad937	got rid of check if online	2016-11-01 09:46:29 +01:00
Dhanya Maliakal	2edeb74213	got rid of check if online	2016-11-01 09:21:26 +01:00
Dhanya Maliakal	2a7a11b80f	changes	2016-11-01 09:12:58 +01:00
Dhanya Maliakal	5b4528925d	some changes	2016-11-01 08:10:52 +01:00
Dhanya Maliakal	d6d6a050bd	some changes	2016-11-01 08:06:21 +01:00
Dhanya Maliakal	a7288dc0de	some changes	2016-11-01 08:03:43 +01:00
Dhanya Maliakal	58228ed00f	trying	2016-10-31 16:43:45 +01:00
Dhanya Maliakal	5cc17a77c7	Merge branch 'developer' into jungfrauchange	2016-10-28 08:14:06 +02:00
Dhanya Maliakal	7541c2bcf0	some more change	2016-10-27 08:28:30 +02:00
Dhanya Maliakal	18c6e8208a	removed bug, setting dr24 sets dr 32 also for eiger, also added server executable	2016-10-25 12:01:31 +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	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	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	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	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
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
Dhanya Maliakal	04f2a5c5ed	temporarily removed parallel start to debug bug, fixed flat channel bug, fixed bad channel bug	2016-08-12 10:53:26 +02:00
Dhanya Maliakal	509c4845c2	got rid of annoying get status message	2016-08-08 17:11:30 +02:00
Dhanya Maliakal	56aaaaf182	fixed rate correction to not include 16 bit dr	2016-08-08 15:52:09 +02:00