767 Commits

Author	SHA1	Message	Date
Dhanya Thattil	14546247e4	adding a receiver callback to be able to give modified size from the callback	2018-03-22 14:34:03 +01:00
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
Dhanya Thattil	7859df6aa3	bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui	2018-02-26 12:44:32 +01:00
Dhanya Thattil	895f8ccf81	Merge branch '3.0.1' into developer	2018-02-08 14:51:20 +01:00
Erik Frojdh	dde032acc8	reverting locations	2018-02-08 10:54:07 +01:00
Erik Frojdh	ee9996908a	test	2018-01-30 11:24:50 +01:00
Erik Frojdh	caf2548391	path	2018-01-30 11:15:31 +01:00
Erik Frojdh	8778fa0aca	all files in bin	2018-01-30 11:05:43 +01:00
Erik Frojdh	633284cbdd	hej	2018-01-29 17:28:54 +01:00
Erik Frojdh	a3293f4335	more headers	2018-01-29 17:27:32 +01:00
Erik Frojdh	2f59d58a50	receiver funcs	2018-01-29 16:33:35 +01:00
Erik Frojdh	ca059db4e9	path	2018-01-29 16:30:44 +01:00
Erik Frojdh	43a1d73522	ansi.h	2018-01-29 16:28:31 +01:00
Erik Frojdh	87d539a040	header	2018-01-29 16:18:12 +01:00
Erik Frojdh	2cc5557ec8	o	2018-01-24 10:05:45 +01:00
Erik Frojdh	7f80b77060	t	2018-01-24 09:22:55 +01:00
Erik Frojdh	ab4f364267	target zmq	2018-01-24 09:20:27 +01:00
Erik Frojdh	fd03cf5b0f	and more targets	2018-01-23 17:46:35 +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	d6bdbf8524	Merge branch '3.0.1' into developer	2017-12-11 13:51:20 +01:00
Dhanya Maliakal	bb3e5351b4	solving warnings from latest linux	2017-12-11 13:51:11 +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	bf9905ad2a	possible to use binary --version or -v to get the branch and versionid	2017-12-06 19:05:35 +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	28211af5af	Makefile for Receiver merged incorrectly sometime back, also in archived project	2017-12-05 11:23:35 +01:00
Dhanya Maliakal	65b4c69847	REST implementation removed from slsReceiver	2017-12-05 11:03:52 +01:00
Dhanya Maliakal	2ae5a959fe	fix in receiver merge conflict (before the respos merge)	2017-12-04 18:35:57 +01:00
Dhanya Maliakal	9f152ce1f3	merge conflict resolved	2017-12-01 12:44:34 +01:00
Dhanya Maliakal	d1e3d50a87	cosmetic print outs	2017-12-01 12:43:14 +01:00
Dhanya Maliakal	a06f29f473	minor cosmetics	2017-12-01 11:23:17 +01:00
Dhanya Maliakal	0e26734023	restreaming stop fix	2017-11-30 19:13:55 +01:00
Dhanya Maliakal	fd64ba289e	Merge branch '3.0.1' into developer	2017-11-30 19:07:21 +01:00
Dhanya Maliakal	e9343a5bd0	remove warning	2017-11-30 19:07:05 +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