3489 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	02c193118b	Merge branch '3.0' into developer	2017-08-23 09:41:27 +02:00
Dhanya Maliakal	33894509e6	Merge branch '3.0' into developer	2017-08-23 09:41:26 +02:00
Dhanya Maliakal	b208acf4a0	moved doxy.config to here	2017-08-23 09:41:10 +02:00
Dhanya Maliakal	02f4b5f546	manual-main fixed, detaildoc not, but for developers and in next release	2017-08-23 09:40:53 +02:00
Dhanya Maliakal	b2513cad23	Merge branch '3.0' into developer	2017-08-22 19:43:49 +02:00
Dhanya Maliakal	4f28df03ab	trials	2017-08-22 19:43:26 +02:00
Dhanya Maliakal	a7dab9a257	updating user documentation. another update required	2017-08-22 19:42:52 +02:00
Dhanya Maliakal	ca756dbeee	Merge branch '3.0' into developer	2017-08-22 19:40:47 +02:00
Dhanya Maliakal	760ca98ee4	updating user documentation. another update required	2017-08-22 19:40:20 +02:00
Dhanya Maliakal	960dc5c62f	removing the print	2017-08-21 10:40:15 +02:00
Dhanya Maliakal	03d9e1d182	check should be before and after the push or pull	2017-08-21 09:24:26 +02:00
Dhanya Maliakal	25886044ab	Merge branch '3.0' into developer	2017-08-21 09:21:41 +02:00
Dhanya Maliakal	4dd7cafe32	Merge branch '3.0' into developer	2017-08-21 09:21:41 +02:00
Dhanya Maliakal	f78a7b201b	updated master file to reflect all files(not just eiger)	2017-08-18 18:35:55 +02:00
Dhanya Maliakal	4e374eb2cd	updaterev	2017-08-18 18:35:30 +02:00
Dhanya Maliakal	5b80ef6d04	changes to release	2017-08-18 18:35:04 +02:00
Dhanya Maliakal	cc5862533e	changes for the statistic moved to listener	2017-08-18 17:57:31 +02:00
Dhanya Maliakal	d58dd1d035	reset fifo statistic at measurement startup	2017-08-18 17:24:56 +02:00
Dhanya Maliakal	3b497eca36	reset fifo statistic at measurement startup	2017-08-18 17:23:52 +02:00
Dhanya Maliakal	f4a11533be	removed prints	2017-08-18 17:02:09 +02:00
Dhanya Maliakal	fe24c8fb86	changed check	2017-08-18 17:00:28 +02:00
Dhanya Maliakal	608f292e4f	moved statistics to listener	2017-08-18 16:50:19 +02:00
Dhanya Maliakal	9868ca3eca	Merge branch '3.0-rc' into developer	2017-08-18 16:13:51 +02:00
Dhanya Maliakal	de3c62fea4	Merge branch '3.0-rc' into developer	2017-08-18 16:13:51 +02:00
Dhanya Maliakal	4b6144c489	updated server binaries	2017-08-18 16:13:33 +02:00
Dhanya Maliakal	4838d6c037	updated server binaries	2017-08-18 16:13:09 +02:00
Dhanya Maliakal	ec4be4f2c0	bugfix: framesl was not conected, exptime default time is 10 us	2017-08-18 16:11:49 +02:00
Dhanya Maliakal	e93f53f459	changes for min fifo level	2017-08-18 15:59:18 +02:00
Dhanya Maliakal	efad86335f	made fifo bound volatile	2017-08-18 15:29:15 +02:00
Dhanya Maliakal	70c2165df4	check of fifo level before trying to push in successfully	2017-08-18 15:21:30 +02:00
Dhanya Maliakal	c1ea73d21c	some changes for release txt	2017-08-18 14:03:11 +02:00
Dhanya Maliakal	181616fb67	Merge branch '3.0-rc' into developer	2017-08-17 17:24:30 +02:00
Dhanya Maliakal	ed8e41a02c	Merge branch '3.0-rc' into developer	2017-08-17 17:24:30 +02:00
Dhanya Maliakal	37f881017a	updating command line docu.	2017-08-17 17:24:20 +02:00
Dhanya Maliakal	cda7814c21	timing put for delay and period	2017-08-17 17:23:13 +02:00
Dhanya Maliakal	c87cb5d051	Merge branch '3.0-rc' into developer	2017-08-17 17:16:59 +02:00
Dhanya Maliakal	70a55428bc	removed 2 files in doxygen always generated	2017-08-17 17:16:41 +02:00
Dhanya Maliakal	8c0b4ac216	Merge branch '3.0-rc' into developer	2017-08-17 17:13:40 +02:00
Dhanya Maliakal	60292ca0f8	added to .gitignore	2017-08-17 17:13:30 +02:00
Dhanya Maliakal	fecac2c4d2	Merge branch '3.0-rc' into developer	2017-08-17 17:10:52 +02:00
Dhanya Maliakal	9167d113dc	command line doc. done	2017-08-17 17:10:32 +02:00
Dhanya Maliakal	04ebc85fcc	command line doc. done	2017-08-17 17:09:59 +02:00
Dhanya Maliakal	de5986e5dd	Merge branch '3.0-rc' into developer	2017-08-17 17:09:05 +02:00
Dhanya Maliakal	7cfc6a9fd9	Merge branch '3.0-rc' into developer	2017-08-17 17:09:04 +02:00
Dhanya Maliakal	e0c29190a2	command line doc. done	2017-08-17 17:08:55 +02:00
Anna Bergamaschi	ff7b6c5abe	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc	2017-08-17 17:04:57 +02:00
Dhanya Maliakal	269227b093	Merge branch '3.0-rc' into developer	2017-08-17 17:04:30 +02:00
Dhanya Maliakal	355c0a8c11	command line docu. more coming up	2017-08-17 17:04:29 +02:00
Anna Bergamaschi	be95de0963	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc	2017-08-17 17:04:27 +02:00
Anna Bergamaschi	0dd6567ce4	changed some sections in the documentation	2017-08-17 17:04:07 +02:00