2610 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Thattil	8f9155e578	Merge branch 'main-rc' into b2.3.0 2.3.0	2020-11-30 16:23:50 +01:00
Dhanya Thattil	9df1eac3c1	Merge branch 'main-rc' into b2.2.0 2.2.0	2020-11-30 15:46:45 +01:00
Dhanya Thattil	5ededf9be4	Merge branch 'main-rc' into b2.1.1 2.1.1	2020-11-30 15:16:57 +01:00
Dhanya Thattil	3e8774798a	Merge branch 'main-rc' into b2.1.0 2.1.0	2020-11-30 15:13:43 +01:00
Dhanya Maliakal	1e6c6dea71	Merge remote branch 'slsDetectorCalibration/2.3' into 2.3	2017-12-12 11:14:05 +01:00
Dhanya Maliakal	0e5d4d1d8e	Merge remote branch 'slsDetectorCalibration/2.2' into 2.2	2017-12-12 11:14:01 +01:00
Dhanya Maliakal	a2986784d3	Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1	2017-12-12 11:13:34 +01:00
Dhanya Maliakal	975cbb576e	Merge remote branch 'slsDetectorCalibration/2.1' into 2.1	2017-12-12 11:06:15 +01:00
Dhanya Maliakal	e48a92d9cd	Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5 2.0.5	2017-12-12 11:02:57 +01:00
Dhanya Maliakal	081b809078	Merge remote branch 'slsDetectorGui/2.3' into 2.3	2017-12-04 16:47:35 +01:00
Dhanya Maliakal	9263567cd8	Merge remote branch 'slsReceiverSoftware/2.3' into 2.3	2017-12-04 16:47:34 +01:00
Dhanya Maliakal	58e90a85be	Merge remote branch 'slsDetectorSoftware/2.3' into 2.3	2017-12-04 16:47:33 +01:00
Dhanya Maliakal	025c836e25	Merge remote branch 'slsDetectorGui/2.2' into 2.2	2017-12-04 16:47:28 +01:00
Dhanya Maliakal	5d5abae3f4	Merge remote branch 'slsReceiverSoftware/2.2' into 2.2	2017-12-04 16:47:28 +01:00
Dhanya Maliakal	e2ad46386e	Merge remote branch 'slsDetectorSoftware/2.2' into 2.2	2017-12-04 16:47:26 +01:00
Dhanya Maliakal	308d44e452	Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1	2017-12-04 16:47:22 +01:00
Dhanya Maliakal	69da61b1fb	Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1	2017-12-04 16:47:22 +01:00
Dhanya Maliakal	460168ce04	Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1	2017-12-04 16:47:21 +01:00
Dhanya Maliakal	4e429c0d77	Merge remote branch 'slsDetectorGui/2.1' into 2.1	2017-12-04 16:45:34 +01:00
Dhanya Maliakal	bf4fab549d	Merge remote branch 'slsReceiverSoftware/2.1' into 2.1	2017-12-04 16:45:34 +01:00
Dhanya Maliakal	f7705eb1da	Merge remote branch 'slsDetectorSoftware/2.1' into 2.1	2017-12-04 16:45:32 +01:00
Dhanya Maliakal	a2217e2066	Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5	2017-12-04 15:33:33 +01:00
Dhanya Maliakal	aaa02706fc	Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5	2017-12-04 15:31:52 +01: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