3926 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	428855d801	in between	2017-11-17 14:02:00 +01:00
Dhanya Maliakal	2e234f1bbd	Merge branch '3.0.1' into developer	2017-11-17 11:36:02 +01:00
Dhanya Maliakal	a79864a5ae	bugfix enabledata streaming send int for update	2017-11-17 11:35:54 +01:00
Dhanya Maliakal	1dee950870	merge conflict from 3.0.1	2017-11-17 11:35:15 +01:00
Dhanya Maliakal	51499fa503	merge conflict from 3.0.1	2017-11-17 11:35:02 +01:00
Dhanya Maliakal	dcf4d98a75	show warnings, update binaries conflict from merge	2017-11-17 11:33:52 +01:00
Dhanya Maliakal	28e2ebf75a	merge conflict resolved from 3.0.1	2017-11-17 09:40:42 +01:00
Dhanya Maliakal	823d537825	fixed warnings	2017-11-17 09:26:20 +01:00
Dhanya Maliakal	d7137e0c75	fixed segmentation fault issue of xputsn the right way, fixed warnings	2017-11-17 09:26:05 +01:00
Dhanya Maliakal	2569ffbf10	fixed warnings, back to int warning in debugstream due to 64 bit	2017-11-17 08:53:05 +01:00
Dhanya Maliakal	b020270734	edited cmake to show warnings	2017-11-17 08:46:59 +01:00
Dhanya Maliakal	f647bdaa48	updated users class to reflect zmq changes (separation), fixed warnings	2017-11-17 08:46:43 +01:00
Dhanya Maliakal	c1e735c1b4	fixed a few warnings	2017-11-17 08:46:04 +01:00
Dhanya Maliakal	4097c37b31	in between	2017-11-16 16:01:31 +01:00
Dhanya Maliakal	a89265faf8	Merge branch '3.0.1' into zmqseparate	2017-11-16 15:09:14 +01:00
Dhanya Maliakal	8e0414d1b9	separating zmqport, enabling in client and receiver works	2017-11-16 15:01:22 +01:00
Dhanya Maliakal	bbcf75bc09	separating zmqport, enabling in client and receiver works	2017-11-16 15:00:59 +01:00
Dhanya Maliakal	065b4a8e0f	including zmq port change in gui	2017-11-16 13:50:30 +01:00
Dhanya Maliakal	2fca426ec0	Merge branch '3.0' into zmqseparate	2017-11-16 13:49:11 +01:00
Dhanya Maliakal	bf89dd44f3	updated binaries	2017-11-16 12:34:12 +01:00
Dhanya Maliakal	d9fcac0236	updated merge from 3.0 hotfix setdac	2017-11-16 12:32:38 +01:00
Dhanya Maliakal	875ca44c0b	updated server hotfix binary	2017-11-16 12:30:41 +01:00
Dhanya Maliakal	4c9cc1b477	Merge branch '3.0' into 3.0.1	2017-11-16 12:29:34 +01:00
Dhanya Maliakal	f340eef4bc	updated server hotfix binary	2017-11-16 12:29:09 +01:00
Dhanya Maliakal	f192164e32	fixed setdac bug that comes rarely, moved serialize spi to 32bit	2017-11-16 12:27:58 +01:00
Dhanya Maliakal	c69ae52e76	somewhere	2017-11-16 09:12:57 +01:00
Dhanya Maliakal	7dee07b9c5	somewhere	2017-11-16 09:12:54 +01:00
Dhanya Maliakal	0e8d2de253	somewhere	2017-11-16 09:12:49 +01:00
Dhanya Maliakal	fd34bab34b	in between separating datastreaming in client and receiver	2017-11-15 17:19:07 +01:00
Dhanya Maliakal	2b0d07387a	in between separating datastreaming in client and receiver	2017-11-15 17:16:47 +01:00
Dhanya Maliakal	eb4ab306c7	in between separating datastreaming in client and receiver	2017-11-15 17:16:37 +01:00
Dhanya Maliakal	32d32dbcdc	in between separating datastreaming in client and receiver	2017-11-15 16:16:59 +01:00
Anna Bergamaschi	7f256c868b	fixed bug for 1D detector in slsDetectorData	2017-11-15 14:39:35 +01:00
Anna Bergamaschi	06b9efd229	modifications for on the fly analysis working at cSAXS	2017-11-15 12:23:21 +01:00
Anna Bergamaschi	9ad0fd0bc9	modifications for on the fly analysis working at cSAXS	2017-11-15 12:21:58 +01:00
Dhanya Maliakal	7c9958db04	updated binary merge from 3.0 regarding settings	2017-11-15 10:36:55 +01:00
Dhanya Maliakal	956625bb50	Merge branch '3.0' into developer	2017-11-15 10:35:20 +01:00
Dhanya Maliakal	6d6133be59	Merge branch '3.0' into zmqseparate	2017-11-15 10:34:30 +01:00
Dhanya Maliakal	bee751cebb	updated binaries	2017-11-15 09:31:49 +01:00
Dhanya Maliakal	fee95d228e	Merge branch '3.0' into 3.0.1	2017-11-15 09:29:05 +01:00
Dhanya Maliakal	ea0c436fc8	updated binaries	2017-11-15 08:07:59 +01:00
Dhanya Maliakal	90fb8258ca	updated binaries	2017-11-14 17:52:51 +01:00
Dhanya Maliakal	dd1cf42a73	proper fix for settings, including dacs	2017-11-14 17:51:13 +01:00
Dhanya Maliakal	dda86cfe9b	somewhere in separating zmq rxr and client	2017-11-14 16:26:17 +01:00
Gemma Tinti	4f74f6d08f	Merge branch '3.0.1' into developer	2017-11-14 15:19:14 +01:00
Gemma Tinti	a3a30d9b50	manual	2017-11-14 15:18:39 +01:00
Gemma Tinti	2d962dfead	Merge branch '3.0.1' into developer	2017-11-14 12:43:19 +01:00
Gemma Tinti	b814515d0a	manual	2017-11-14 12:42:30 +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