7142 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Thattil	e7eee67fed	Update RELEASE.txt	2019-06-13 11:44:43 +02:00
Dhanya Thattil	fade48dcfa	updated release.rxt	2019-06-13 11:43:06 +02:00
Dhanya Thattil	8e58e7f8bf	Updated release.txt : eiger firmware version 23	2019-06-13 11:41:50 +02:00
Erik Frojdh	c8f56ee23c	qwt	2019-06-13 10:44:45 +02:00
Dhanya Thattil	ca9fca88c4	Merge branch 'developer' into gui	2019-06-13 09:37:54 +02:00
Dhanya Thattil	359970dfc2	bug fix from 4.0.2: powerchip multi should have delays, burst trigger added to users	2019-06-13 09:37:44 +02:00
Dhanya Thattil	32d951e28a	Merge branch '4.0.2' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.2	2019-06-13 09:01:47 +02:00
Dhanya Thattil	5c63c8fc8f	gui bug fix: switching to tab plot while acquiring produced error messages	2019-06-13 09:01:39 +02:00
Dhanya Thattil	7b70274d4f	checking online when refreshing (during acquire) is removed	2019-06-13 08:56:29 +02:00
Erik Frojdh	1cd905c08b	disable gui	2019-06-12 16:02:43 +02:00
Dhanya Thattil	13e809acd4	updated versions	2019-06-12 15:40:19 +02:00
Dhanya Thattil	46533b0411	updated server binaries	2019-06-12 15:37:17 +02:00
Erik Frojdh	4f4de15d3a	1s sleep for large JF during powerchip	2019-06-12 14:53:52 +02:00
Dhanya Thattil	5d2567005d	WIP	2019-06-12 14:40:04 +02:00
Dhanya Thattil	e6361c73fc	WIP	2019-06-12 11:24:05 +02:00
Erik Frojdh	55229f77a3	python	2019-06-12 10:41:50 +02:00
Dhanya Thattil	afb6d6bf3a	WIP	2019-06-12 10:40:56 +02:00
Dhanya Thattil	b922b79232	WIP	2019-06-11 16:36:02 +02:00
Dhanya Thattil	3c1df02414	merge resolved	2019-06-11 15:56:13 +02:00
Dhanya Thattil	d3467432a9	WIP	2019-06-11 15:43:24 +02:00
Dhanya Thattil	cb2c39c62f	WIP	2019-06-11 15:38:04 +02:00
Dhanya Thattil	111c48e3fa	WIP	2019-06-11 11:29:45 +02:00
Dhanya Thattil	d2d25cdd69	WIP	2019-06-11 11:19:07 +02:00
Dhanya Thattil	1bab010d0b	WIP	2019-06-11 10:15:40 +02:00
Dhanya Thattil	f0872174cf	WIP	2019-06-07 18:53:57 +02:00
Erik Frojdh	1fed3553b9	cleaning up tcp	2019-06-07 16:13:34 +02:00
Dhanya Thattil	ca5a0b4cc8	WIP Settings	2019-06-07 10:58:47 +02:00
Dhanya Thattil	48dd0fb084	WIP	2019-06-06 18:41:31 +02:00
Erik Frojdh	893805e6fd	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2019-06-06 18:17:12 +02:00
Erik Frojdh	170aca0e1f	zmqip now uint	2019-06-06 18:17:04 +02:00
Gemma Tinti	0c6304bdf8	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2019-06-06 17:53:52 +02:00
Gemma Tinti	2eaf7edd46	manual	2019-06-06 17:53:45 +02:00
Erik Frojdh	c86a1e7d48	WIP	2019-06-06 17:00:05 +02:00
Dhanya Thattil	bb760f3210	WIP datatoutput	2019-06-06 15:04:05 +02:00
Erik Frojdh	fc5306f7cc	Merge branch 'sockettest' into developer	2019-06-06 10:37:11 +02:00
Erik Frojdh	3cfeb74529	minor	2019-06-06 10:36:40 +02:00
Erik Frojdh	5944957977	cleaning up socket	2019-06-06 10:34:57 +02:00
Erik Frojdh	7a11c6c986	hash	2019-06-06 08:51:46 +02:00
Erik Frojdh	2c7d78ff56	include	2019-06-06 08:46:11 +02:00
Erik Frojdh	c4ea181811	test	2019-06-06 08:41:50 +02:00
Erik Frojdh	45dc48721e	server	2019-06-06 08:41:19 +02:00
Erik Frojdh	72e0d7e168	clang format on receiver TCP and Implementation	2019-06-06 08:07:40 +02:00
Dhanya Thattil	e4546c6121	WIP	2019-06-05 17:54:56 +02:00
Erik Frojdh	e46f3f9a2c	WIP	2019-06-05 17:45:02 +02:00
Erik Frojdh	6c64bdb04a	fixing tests for gcc 4.8	2019-06-05 17:40:48 +02:00
Erik Frojdh	03f8b389ad	WIP	2019-06-05 17:30:21 +02:00
Erik Frojdh	3d6404952a	fix sending	2019-06-05 15:51:21 +02:00
Erik Frojdh	b5e4d7d8fb	fixed reading and double print in client	2019-06-05 15:40:28 +02:00
Erik Frojdh	8cf94537c8	minor	2019-06-05 15:29:12 +02:00
Erik Fröjdh	1db7521cfa	exceptions TCP (#31) ... * WIP * first test * format * test frames * also 0: * WIP * WIP * first test * format * test frames * also 0: * test and less local * pass ret by value * level * WIP * WIP * cleaning up interface * removed ref * another * updated api version * cleanup * cleanup * WIP * fixes * fixed tests	2019-06-05 15:25:18 +02:00