174 Commits

Author	SHA1	Message	Date
Fabian Märki	bda1a305b1	Readd image sources.	2018-10-23 10:21:31 +02:00
Fabian Märki	f5dc54e6bc	Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git	2018-10-23 10:13:59 +02:00
Fabian Märki	473f72f5a2	Disable channels not needed for tests.	2018-10-23 10:06:40 +02:00
stubbs_s	8a48078eb8	Adding Flex IoXoS crate, for reals	2018-10-01 19:42:19 +02:00
stubbs_s	4a198d6b7a	Add FLEX IoXoS crate - not ready yet, but will be soon	2018-09-28 15:13:24 +02:00
Fabian Märki	f2a89acf2b	Remove on Andrej's request.	2018-09-24 15:57:15 +02:00
Fabian Märki	0f3a4f6dfb	Add PSSS	2018-09-24 15:32:19 +02:00
Fabian Märki	6dd501d918	New source from Edwin.	2018-09-10 08:04:48 +02:00
Fabian Märki	dfcecdad82	No type anymore.	2018-08-23 12:08:55 +02:00
Simon Ebner	664e478cc6	fix another comma	2018-07-25 07:50:43 +02:00
Simon Ebner	4ee8c9a783	fix comma	2018-07-25 07:49:42 +02:00
ebner	547946634b	Merge branch 'master' into 'master' ... ESB cameras See merge request sf_config/sf_daq_sources!85	2018-07-25 07:40:16 +02:00
ebner	2ec286f200	Merge branch 'master' into 'master' ... Athos ICTs See merge request sf_config/sf_daq_sources!81	2018-07-25 07:39:44 +02:00
Brands Helge	9b6d96e2c5	ESB cameras	2018-07-24 13:40:39 +02:00
Mario Jurcevic	2718823aae	enable S20CB04 beam synchronous modulator data	2018-07-23 14:15:40 +02:00
Fabian Märki	8dbfd57b65	Formatting.	2018-07-19 13:49:01 +02:00
Brands Helge	9a4519da9c	add virtual cathode	2018-07-19 13:42:09 +02:00
Fabian Märki	0f50ffd96a	change sources	2018-07-18 15:46:19 +02:00
Fabian Märki	18bcb96d8f	Formatting	2018-07-09 15:39:21 +02:00
Thierry Zamofing	dc40247347	restructure edwin stuff in gunlaser, esa and esb	2018-07-09 15:16:19 +02:00
Daniel Llorente	ee5978ffd7	2x New IOCs for ICTs	2018-07-06 11:26:21 +02:00
Fabian Märki	5f1a85108e	replace	2018-07-05 15:06:24 +02:00
Roger Kalt	c9dd77403d	enable SINEGTS OSFA Physiklabor test system	2018-06-29 09:44:47 +02:00
Roger Kalt	c05fd3dd49	enable SINEGTS OSFA Physiklabor test system	2018-06-29 09:43:19 +02:00
Fabian Märki	0a0121c59a	Back to jeromq.	2018-06-28 11:46:54 +02:00
Fabian Märki	f0241f5a0f	back to normal	2018-06-28 08:30:40 +02:00
Fabian Märki	557d10534a	Test all jeromq	2018-06-28 08:21:57 +02:00
Fabian Märki	c79a4d73f1	Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git	2018-06-28 08:15:36 +02:00
Fabian Märki	1a2c3e9f1b	try all netty	2018-06-28 08:14:30 +02:00
Roger Kalt	518d4388f6	enable S30CB04 HV modulator source	2018-06-27 14:21:14 +02:00
Fabian Märki	96311a1f0f	Activate S30CB12-CVME-ILK by request of Roger.	2018-06-20 11:48:59 +02:00
Fabian Märki	0888e7bd73	Activate S30CB12 by request of Roger.	2018-06-20 11:45:16 +02:00
Fabian Märki	28821cb33a	remove old and add new.	2018-06-15 11:16:46 +02:00
Fabian Märki	0483c7e805	Deactivate since not reachable by DHCP.	2018-06-15 08:38:44 +02:00
Roger Kalt	1bc46485ba	add LLRF OSFA Physiklabor test system in machine network - only short TTL	2018-06-14 17:56:32 +02:00
Fabian Märki	0f8a96c352	New sources.	2018-06-11 10:02:55 +02:00
Fabian Märki	4e3023af70	Add timing event sources.	2018-05-29 09:58:53 +02:00
Fabian Märki	61d918e357	Disable test sources.	2018-05-29 09:58:33 +02:00
Fabian Märki	306361a429	Move psen source since no image anymore.	2018-05-18 07:58:07 +02:00
Fabian Märki	3086b9a69d	test sources	2018-05-17 15:01:43 +02:00
Fabian Märki	fa60673a33	disable test source	2018-05-17 09:09:47 +02:00
Fabian Märki	61a5c6c6d1	test sources.	2018-05-17 08:13:50 +02:00
Fabian Märki	f97e721f16	New image.	2018-05-15 11:25:39 +02:00
Fabian Märki	27ae63c524	Re-add Andrej's test channel.	2018-05-03 14:13:03 +02:00
Fabian Märki	040e673ea8	Back to netty	2018-04-26 16:11:14 +02:00
Fabian Märki	c3d3035da5	All jeromq	2018-04-26 15:50:02 +02:00
Fabian Märki	e574e0730e	Netty and jmq.	2018-04-26 13:52:32 +02:00
Fabian Märki	3831c0d6fb	use all netty	2018-04-26 13:29:17 +02:00
Fabian Märki	3b7c591325	Use netty and jmq.	2018-04-26 12:43:50 +02:00
Fabian Märki	10202c7b42	New image sources and receiver type option.	2018-04-26 08:01:55 +02:00