3558 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	dc70c45ef2	Merge branch 'developer' into gappixels	2017-11-10 16:53:14 +01:00
Dhanya Maliakal	c0ec315b04	Merge branch 'developer' into gappixels	2017-11-10 16:53:14 +01:00
Dhanya Maliakal	6fa4e4cef8	Merge branch '3.0.1' into gappixels	2017-11-10 16:37:28 +01:00
Dhanya Maliakal	3886a0c9ad	merge fix from 3.0.1 regarding gethostbyname thread safety	2017-11-10 16:37:20 +01:00
Dhanya Maliakal	5b65d44303	Merge branch '3.0.1' into developer	2017-11-10 16:34:43 +01:00
Dhanya Maliakal	23ddb3d4b5	merge fix from 3.0.1 regarding gethostbyname thread safety	2017-11-10 16:34:31 +01:00
Dhanya Maliakal	e1c7176c00	Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_receiver_software into 3.0.1	2017-11-10 16:31:01 +01:00
Dhanya Maliakal	53caebe0f3	replaced gethostbyname with getaddrinfo as it is not thread safe	2017-11-10 16:30:48 +01:00
Dhanya Maliakal	739187943d	replaced gethostbyname with getaddrinfo as it is not thread safe	2017-11-10 16:30:38 +01:00
Dhanya Maliakal	a2210c0118	Merge branch '3.0.1' into gappixels	2017-11-09 14:08:04 +01:00
Dhanya Maliakal	6d0f751104	Merge branch '3.0.1' into developer	2017-11-09 14:07:48 +01:00
Dhanya Maliakal	fb0afc282d	gotthard server, too fast now sets stopped bit high and stops acquisition, so polling status also made aware of stopped bit	2017-11-09 14:01:36 +01:00
Dhanya Maliakal	d24ab31d87	gotthard fix	2017-11-09 13:44:38 +01:00
Dhanya Maliakal	9255cdde8a	bug fixx for the 9m gethostbyname being not thread safe	2017-11-09 13:42:57 +01:00
Xiaoqiang Wang	7c344d4a39	recompile with -fPIC flag	2017-11-08 15:14:34 +01:00
Dhanya Maliakal	3c6d572369	including dynamic range in gui call back	2017-11-02 11:02:40 +01:00
Dhanya Maliakal	7ba90f98fc	including dynamic range in gui call back	2017-11-02 11:02:22 +01:00
Dhanya Maliakal	589a5c7852	Merge branch '3.0.1' into gappixels	2017-11-02 10:55:05 +01:00
Dhanya Maliakal	0df4576874	Merge branch '3.0.1' into developer	2017-11-02 10:54:40 +01:00
Xiaoqiang Wang	7157b2817d	update to zmq 4.0.8 ... among other fixes, this fixes the tmpnam warning	2017-11-02 10:49:24 +01:00
Dhanya Maliakal	82f503aa09	dynamic range also updates offsets, 4 bit mode gap pixels work in call back from gui	2017-10-31 12:50:31 +01:00
Dhanya Maliakal	3da8bca462	allowing receiver to know of gap pixels enable even in 4 bit mode, but not doing anything useful	2017-10-31 12:39:36 +01:00
Dhanya Maliakal	9d4c14b724	gap pixels should now work for 4 bit mode and a bug fix in decoding for 4 bit mode	2017-10-31 12:38:42 +01:00
Dhanya Maliakal	6ff249c3f2	Merge branch 'developer' into gappixels	2017-10-27 16:18:52 +02:00
Dhanya Maliakal	e12229633c	update binaries	2017-10-27 16:18:21 +02:00
Dhanya Maliakal	b75dde4613	merge bug fix of set module	2017-10-27 16:17:12 +02:00
Dhanya Maliakal	f6989d5539	merge bug fix of set module	2017-10-27 16:16:38 +02:00
Dhanya Maliakal	7ff23b25b3	merge bug fix of set module	2017-10-27 16:16:29 +02:00
Dhanya Maliakal	acfd9acc6c	update binaries	2017-10-27 16:09:46 +02:00
Dhanya Maliakal	1881cb0010	updated binaries	2017-10-27 16:07:42 +02:00
Dhanya Maliakal	1420921291	Merge branch '3.0' into 3.0.1	2017-10-27 15:47:15 +02:00
Dhanya Maliakal	045a7cfcb1	removed settings bug, highvoltage returning 60 when switched off	2017-10-27 15:38:07 +02:00
Dhanya Maliakal	92f988ddc1	somewhere	2017-10-27 14:00:57 +02:00
Dhanya Maliakal	79bce5e006	4 bit mode works without gappixels	2017-10-26 16:01:18 +02:00
Dhanya Maliakal	9c82a8f726	temp in between, trying to get 4 bitmode to work without gap pixels	2017-10-26 11:19:58 +02:00
Dhanya Maliakal	6812961836	temp in between, trying to get 4 bitmode to work without gap pixels	2017-10-26 11:09:55 +02:00
Dhanya Maliakal	003239cddd	gap pixels for 4 bit mode restrictions, not completed	2017-10-24 14:16:08 +02:00
Dhanya Maliakal	ce7386e230	merge solved from developer, xcoord from detector if given	2017-10-23 17:21:45 +02:00
Dhanya Maliakal	fde4194f9b	merged with developer, receiver call back merged with no call back	2017-10-23 17:12:00 +02:00
Dhanya Maliakal	7f9ac86862	Merge branch 'developer' into gappixels	2017-10-23 17:09:13 +02:00
Dhanya Maliakal	16a939c0c0	Merge branch '3.0.1' into developer	2017-10-23 17:08:12 +02:00
Dhanya Maliakal	f4f03f659a	color code in user example depending on modID, instead of xcoord	2017-10-23 17:07:45 +02:00
Dhanya Maliakal	4084e2c31e	updated release doc	2017-10-23 17:06:12 +02:00
Dhanya Maliakal	e417885459	merge conflict in release, merged incorporating no call back and call back into one user example	2017-10-23 15:30:00 +02:00
Dhanya Maliakal	65fd5a3057	merged without call back and call back into one user example	2017-10-23 15:26:04 +02:00
Dhanya Maliakal	1f138abac1	fix in receiver as x, y and z are properly integrated with detector server for eiger and jungfrau, and handling previous versions of detector where x y and z were all 0 (hardcoding them in 1 d)	2017-10-23 12:21:41 +02:00
Dhanya Maliakal	d2fd0cbee9	x y and z coordinates are pushed into eiger server and its fixed in appropriate client side as well	2017-10-23 12:20:18 +02:00
Dhanya Maliakal	210bcb081d	xcoord should not be hardcoded for this version for eiger and jungfrau	2017-10-20 10:49:02 +02:00
Dhanya Maliakal	387b4ef457	updated release with patches notes	2017-10-19 17:09:50 +02:00
Dhanya Maliakal	673b7f1652	merge conflict fixed with developer	2017-10-19 15:36:28 +02:00