2107 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	6c797988c7	Merge remote branch 'slsReceiverSoftware/2.3.1' into 2.3.1	2017-12-04 16:47:41 +01:00
Dhanya Maliakal	215c262981	Merge remote branch 'slsDetectorSoftware/2.3.1' into 2.3.1	2017-12-04 16:47:39 +01:00
Dhanya Maliakal	9468b9ca1e	updaterev	2017-04-11 13:39:59 +02:00
Dhanya Maliakal	d7982e178e	updaterev	2017-04-11 13:39:53 +02:00
Dhanya Maliakal	9cf5714a5b	removing warnings shown from esrf debian	2017-04-11 13:39:35 +02:00
Dhanya Maliakal	0c9ac8911a	removing warnings shown from esrf debian	2017-04-11 13:39:28 +02:00
Dhanya Maliakal	4730c8c0a9	updaterev	2017-04-11 13:31:49 +02:00
Dhanya Maliakal	43efb8acfd	removing warnings shown from esrf debian	2017-04-11 13:31:32 +02:00
Dhanya Maliakal	6ecca8fcb0	updaterev	2017-04-11 09:03:26 +02:00
Dhanya Maliakal	17cb63a57f	updaterev	2017-04-11 09:03:19 +02:00
Dhanya Maliakal	ab94af6d29	removed verbose etc	2017-04-07 15:08:40 +02:00
Dhanya Maliakal	7c725cc69b	.c_str() must not access global variables from thread	2017-04-07 14:57:19 +02:00
Dhanya Maliakal	f0198d2d2e	alejandro's changes from ESRF	2017-04-07 14:50:17 +02:00
Dhanya Maliakal	5ddccbdee4	changed all -lpthread to -pthread	2017-04-07 14:28:00 +02:00
Dhanya Maliakal	8fb39b8c7e	changed all -lpthread to -pthread	2017-04-07 14:27:27 +02:00
Dhanya Maliakal	bd5293f4b1	changed all -lpthread to -pthread	2017-04-07 14:26:09 +02:00
Dhanya Maliakal	b91180f5b2	changed all -lpthread to -pthread	2017-04-07 14:26:03 +02:00
Dhanya Maliakal	9aef802bea	changed all -lpthread to -pthread	2017-04-07 14:24:49 +02:00
Dhanya Maliakal	f7d85231f2	solved warnings except sscanf for uint64_t	2017-04-07 14:12:21 +02:00
Dhanya Maliakal	5b3a911e8d	solved warnings except sscanf for uint64_t	2017-04-07 14:11:34 +02:00
Dhanya Maliakal	65f5e1c1ab	strtok is not thread safe..used to set receiver udp ip etc to detector, fixed	2017-04-06 15:04:33 +02:00
Gemma Tinti	1afb9e3e48	manual	2017-03-29 11:23:44 +02:00
Gemma Tinti	09d3372cc0	manual	2017-03-29 10:11:16 +02:00
Dhanya Maliakal	cacb4c9d93	updaterev	2017-03-24 13:42:11 +01:00
Dhanya Maliakal	86490226ed	removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled	2017-03-24 13:41:56 +01:00
Dhanya Maliakal	eb203c93b2	removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled	2017-03-24 13:41:30 +01:00
Dhanya Maliakal	44be9829d4	removed anna from support as she prefered it	2017-03-23 15:38:24 +01:00
Dhanya Maliakal	e450f5ec6a	updaterev	2017-03-23 15:17:34 +01:00
Dhanya Maliakal	70a7217353	changed the header size to a better number	2017-03-23 15:17:21 +01:00
Dhanya Maliakal	7dfb1b7192	added a release text	2017-03-23 15:17:03 +01:00
Dhanya Maliakal	da8d535dae	updaterev	2017-03-23 14:09:01 +01:00
Dhanya Maliakal	404be013a2	changes to new callback arguments without filepointer	2017-03-23 14:08:43 +01:00
Dhanya Maliakal	6d4c0d0d46	modified users for new callback argument without filepointer	2017-03-23 14:07:56 +01:00
Dhanya Maliakal	54371bc6be	updaterev	2017-03-23 13:48:18 +01:00
Dhanya Maliakal	5c230e2ac5	updaterev	2017-03-23 13:48:12 +01:00
Dhanya Maliakal	0814f6369d	udpaterev	2017-03-23 13:46:16 +01:00
Dhanya Maliakal	9e658e7947	udpaterev	2017-03-23 13:46:02 +01:00
Dhanya Maliakal	bf57be309f	updated server	2017-03-23 13:44:44 +01:00
Dhanya Maliakal	6f34dddb5a	changed the file header size t0 1kb and changed its description in the header	2017-03-23 13:41:37 +01:00
Dhanya Maliakal	c47f2f3449	solved the gui 4 bit bug where no data was displayed: due to byterperchannel being int and a 0	2017-03-23 13:31:22 +01:00
Dhanya Maliakal	5dcacaae2a	frame and packet counters for the delay was buggy, not looking at lsb and msb, fixed	2017-03-23 12:38:19 +01:00
Dhanya Maliakal	aae4e3f993	removed unnessary printout	2017-03-20 11:22:35 +01:00
Dhanya Maliakal	78958c7699	updaterev	2017-03-20 09:30:15 +01:00
Dhanya Maliakal	575c9617c7	fixed gui for new header	2017-03-20 09:28:15 +01:00
Dhanya Maliakal	1ab80b0517	updaterev	2017-03-20 09:28:02 +01:00
Dhanya Maliakal	4b388f56b2	fixed gui for new header	2017-03-20 09:27:38 +01:00
Dhanya Maliakal	fb91ba25f3	uncomment gui. insignificant	2017-03-20 09:26:13 +01:00
Dhanya Maliakal	1413244617	update rev	2017-03-15 15:02:28 +01:00
Dhanya Maliakal	dc77b07c92	update rev	2017-03-15 15:02:22 +01:00
Dhanya Maliakal	9f68fc6f3b	fixed call backs with new standard header	2017-03-15 15:00:25 +01:00