248 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	fa7536e1d1	merge with 2.1.1-rc to be latest	2016-10-20 07:38:08 +02:00
Dhanya Maliakal	81d96a047d	slsDetector/slsDetectorCommand.cpp	2016-10-20 07:31:53 +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	13cff71faf	got rid of activate function definition redeclaration in receiver funcs	2016-10-04 14:43:02 +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	0979d04693	works for deactivated server and receiver	2016-10-04 07:35:52 +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
Gemma Tinti	8a80cb489d	change server with new boundary for counts above teh max	2016-09-27 20:47:59 +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	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	aad1885bf5	updaterev	2016-08-30 16:13:18 +02:00
Dhanya Maliakal	079c7dc169	removed setup_beb.txt not required	2016-08-24 16:47:05 +02:00
Dhanya Maliakal	08fd848504	updatereveiger	2016-08-18 10:31:10 +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	7239ce083b	updaterev	2016-08-12 11:17:39 +02:00
Dhanya Maliakal	6f5e15f60a	changed executable name	2016-08-12 11:08:03 +02:00
Dhanya Maliakal	56aaaaf182	fixed rate correction to not include 16 bit dr	2016-08-08 15:52:09 +02:00
Dhanya Maliakal	6a87d9e40a	forgot to add server executable	2016-08-04 17:28:55 +02:00
Dhanya Maliakal	ef9d64de64	got rid of <0.00015 rate correction error check	2016-08-04 17:27:45 +02:00
Dhanya Maliakal	29ba1f4042	changed transmission delay commands to go through network parameters and included 10g flow control	2016-08-04 17:21:16 +02:00
Gemma Tinti	1e30a6a16a	add server to previous change	2016-08-04 09:31:11 +02:00
Gemma Tinti	dd2a0c50e0	rate corr atble changes	2016-08-03 18:07:21 +02:00
Dhanya Maliakal	d28d737fb9	transmission delay added	2016-08-03 17:03:37 +02:00
Dhanya Maliakal	1db5ef4fd4	added 2 gain settings to eigeR	2016-08-03 10:35:11 +02:00
Dhanya Maliakal	e1d54b72f8	created the function to set transmission delay	2016-08-03 09:26:52 +02:00
Dhanya Maliakal	a4e5db038d	updaterev	2016-08-02 10:35:08 +02:00
Dhanya Maliakal	89966ae4fe	forgot deactivate server for prev commit, added	2016-08-02 10:34:34 +02:00
Dhanya Maliakal	c0db1a89a8	deactivate for eiger	2016-08-02 10:32:37 +02:00
Dhanya Maliakal	ffaf62176f	updaterev	2016-07-22 15:30:34 +02:00
Dhanya Maliakal	183563ca0c	check firmware version and api version upon server startup	2016-07-22 15:27:46 +02:00
Dhanya Maliakal	ac7063a1a5	check firmware version and api version upon server startup	2016-07-22 15:26:26 +02:00
Dhanya Maliakal	f4a7a5a032	updaterev	2016-07-22 10:42:34 +02:00
Dhanya Maliakal	ee26339fd7	added more accurate temperature sensors for eiger, and to gui	2016-07-22 10:40:58 +02:00
Dhanya Maliakal	6a245d2a98	updatereveiger	2016-07-20 16:05:55 +02:00
Dhanya Maliakal	3f157b8f62	fixed bug where settings complain if tau not in file even if its is not activated	2016-07-20 14:39:43 +02:00
Dhanya Maliakal	b693279388	updaterev	2016-07-18 18:16:52 +02:00
Dhanya Maliakal	9c9d946d70	fixed bug subexptime >=2.2 was set to weird value, was a int to int64_t error in server	2016-07-18 13:37:13 +02:00
Dhanya Maliakal	bdf725be48	fixed the update on detector udpating acq period with subexptime	2016-07-15 15:45:40 +02:00
Dhanya Maliakal	4939e47305	fixed dimensions, fixed rate corr bug, moved rate corr to server because config resets memory and ratecorr depends on client variables	2016-07-14 16:23:03 +02:00
Dhanya Maliakal	b06a1e5a3c	print correctly the software versiondate	2016-07-06 11:29:26 +02:00
Dhanya Maliakal	9c8137d892	updating versions	2016-07-06 10:32:57 +02:00
Dhanya Maliakal	418ff63999	updating versions	2016-07-05 17:24:44 +02:00
Dhanya Maliakal	e5fe5eab0d	updating versions	2016-07-05 17:23:04 +02:00
Dhanya Maliakal	1423c87275	feature: tau is now read from calib file. if not there, it is set to defalt in server value, but switched off. load trimbits will not touch rate correction	2016-07-05 12:02:34 +02:00