403 Commits

Author	SHA1	Message	Date
Dhanya Thattil	a74e8f68f7	size change in receiver call back API now streamed, gui allows smaller packet size than expected to be caught and replaced the rest with 0xFF	2018-03-21 17:08:38 +01:00
Dhanya Thattil	dd6301d66d	updated for compilation	2018-03-14 16:19:30 +01:00
Dhanya Thattil	b58c3e8951	solving merging conflicts from 3.1.0 to developer	2018-03-14 15:45:35 +01:00
Dhanya Thattil	72970c9669	updated binaries, updated manuals, updated git versioning	2018-03-12 14:21:02 +01:00
Dhanya Thattil	61e7c0148f	updating versions to 3.1.0	2018-02-27 12:40:53 +01:00
Andrä Marie	3aeb3f58d1	first mythen3Server commit	2018-01-22 14:01:46 +01:00
Andrä Marie	92b4b3324e	first mythen3 server commit	2018-01-18 09:25:06 +01:00
Dhanya Maliakal	65a91c519e	Merge branch '3.0.1' into developer	2017-12-14 14:29:16 +01:00
Dhanya Maliakal	0649626842	made the color fix for black/white backgrounds	2017-12-14 14:29:07 +01:00
Dhanya Maliakal	24c305ec59	solved conflicts from merge of version being used to binary	2017-12-06 19:07:06 +01:00
Dhanya Maliakal	c4a242e10a	changed all variables from svn to git, included --version for receiver binary	2017-12-06 10:29:57 +01:00
Dhanya Maliakal	2f3dc8d109	Merge branch '3.0.1' into developer	2017-12-06 08:44:21 +01:00
Dhanya Maliakal	7436d6c8d3	updaterev	2017-12-06 08:44:07 +01:00
Dhanya Maliakal	0ef52138e1	merge conflict sorted, removing rest	2017-12-05 11:25:10 +01:00
Dhanya Maliakal	65b4c69847	REST implementation removed from slsReceiver	2017-12-05 11:03:52 +01:00
Dhanya Maliakal	6f3898441e	merge conflict from 3.0.1 to restream stop from recieveR	2017-11-30 19:05:47 +01:00
Dhanya Maliakal	70bf6eb4cb	restream stop from receiver	2017-11-30 18:39:08 +01:00
Dhanya Maliakal	e17e4c3171	Merge branch '3.0.1' into developer	2017-11-28 18:50:27 +01:00
Dhanya Maliakal	b75985088d	twice connect bug fix in zmq	2017-11-28 18:50:18 +01:00
Dhanya Maliakal	8bba57e77d	fix to not have sls_receiver_defs in zmqSocket.h incldue	2017-11-28 16:32:15 +01:00
Dhanya Maliakal	8388d1f503	using file index from zmq	2017-11-28 14:45:48 +01:00
Dhanya Maliakal	a89847538d	merge ocnflict for white background	2017-11-28 11:29:15 +01:00
Dhanya Maliakal	a351fa8f28	switching from black to white background for receiver	2017-11-28 11:18:30 +01:00
Dhanya Maliakal	4466213882	makng the zmq work without external flag	2017-11-27 17:06:27 +01:00
Dhanya Maliakal	2c276db579	solved merge conflict in changes to use ZmqSocket.h externally	2017-11-23 16:35:31 +01:00
Dhanya Maliakal	b14ea217ee	Merge branch '3.0.1' into zmqchange	2017-11-23 16:34:14 +01:00
Dhanya Maliakal	da3ca9f306	changes to use ZmqSocket.h externally without further changes	2017-11-23 16:28:02 +01:00
Dhanya Maliakal	ad64df01c7	somewhere	2017-11-23 14:53:40 +01:00
Dhanya Maliakal	114c45c04a	making gui work temporarily for jctb	2017-11-22 09:27:42 +01:00
Dhanya Maliakal	3a26c95c0d	Merge branch '3.0.1' into developer	2017-11-21 15:46:21 +01:00
Dhanya Maliakal	8c45f94496	updated npixelsy for jungfrau effecting hdf5 mapping	2017-11-21 15:46:10 +01:00
Dhanya Maliakal	5d34358f44	changin zmqip in rxr should also restart streaming	2017-11-21 15:11:29 +01:00
Dhanya Maliakal	a0ad1fb3a3	Merge branch '3.0.1' into developer	2017-11-21 14:15:59 +01:00
Dhanya Maliakal	d00df32e49	changing zmq rxr port should restart data streaming	2017-11-21 13:39:49 +01:00
Dhanya Maliakal	662f502d4c	zmq always needs an ip in header	2017-11-17 17:40:57 +01:00
Dhanya Maliakal	1dee950870	merge conflict from 3.0.1	2017-11-17 11:35:15 +01:00
Dhanya Maliakal	823d537825	fixed warnings	2017-11-17 09:26:20 +01:00
Dhanya Maliakal	c69ae52e76	somewhere	2017-11-16 09:12:57 +01:00
Dhanya Maliakal	32d32dbcdc	in between separating datastreaming in client and receiver	2017-11-15 16:16:59 +01:00
Dhanya Maliakal	db2fef5d69	conflict resolved in merge from 3.0.1 to include file index in zmq streaming	2017-11-14 12:14:26 +01:00
Dhanya Maliakal	0ae706d9a5	file index sent along with zmq stream	2017-11-14 12:13:06 +01:00
Dhanya Maliakal	6fa4e4cef8	Merge branch '3.0.1' into gappixels	2017-11-10 16:37:28 +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	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	589a5c7852	Merge branch '3.0.1' into gappixels	2017-11-02 10:55:05 +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	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	ce7386e230	merge solved from developer, xcoord from detector if given	2017-10-23 17:21:45 +02:00