Commit Graph

64 Commits

Author SHA1 Message Date
ebner 6c15157737 use of 25Gb interface instead of 1Gb 2019-05-09 11:31:55 +02:00
root 7d3ba1133f remove comment 2019-04-25 14:41:20 +02:00
ebner f3bd2e5f13 remove esb cameras 2019-04-25 14:00:01 +02:00
zamofing_t b8f250178d Update image.sources 2019-04-25 08:27:13 +02:00
stubbs_s 6a0852539b Add new ESA PCO Edges, only one currently operational 2019-04-18 17:33:44 +02:00
brands 489019b10a Basler CL Camera (TEST) for ESB 2019-03-06 09:50:04 +01:00
Fabian Märki 85fccbdfd5 Set back to other interface. 2019-02-22 09:34:20 +01:00
Fabian Märki d224ef9196 Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git 2019-02-19 08:03:38 +01:00
Fabian Märki ace4508e2c ensure connection to daqsync-02 over image network 2019-02-19 08:02:16 +01:00
divall_e bb73048880 ESB laser cam 511 added 2019-01-25 11:07:38 +01:00
divall_e 4c224cba0f add C104 2019-01-21 13:19:04 +01:00
Fabian Märki 2971d2abf0 Add another Edwin camera. 2019-01-14 08:10:44 +01:00
Fabian Märki d5a8040f0a Add image source from Henrik. 2018-12-11 17:06:04 +01:00
Fabian Märki bda1a305b1 Readd image sources. 2018-10-23 10:21:31 +02:00
Fabian Märki 473f72f5a2 Disable channels not needed for tests. 2018-10-23 10:06:40 +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 dfcecdad82 No type anymore. 2018-08-23 12:08:55 +02:00
brands 9b6d96e2c5 ESB cameras 2018-07-24 13:40:39 +02:00
Fabian Märki 8dbfd57b65 Formatting. 2018-07-19 13:49:01 +02:00
brands 9a4519da9c add virtual cathode 2018-07-19 13:42:09 +02:00
Fabian Märki 1041678c60 Readd sources used for tests. 2018-06-29 12:20:20 +02:00
Fabian Märki 67a3e1da85 Disable some cameras for testing. 2018-06-29 10:05:34 +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 1a2c3e9f1b try all netty 2018-06-28 08:14:30 +02:00
Fabian Märki 306361a429 Move psen source since no image anymore. 2018-05-18 07:58:07 +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
Fabian Märki f6417135cb Activate images. 2018-04-12 12:07:50 +02:00
Fabian Märki b722dc3f7d Disable cams 2018-03-27 11:42:23 +02:00
Fabian Märki 5631694b63 New image sources 2018-02-12 08:53:24 +01:00
Fabian Märki 33264c9805 Remove for Nicole test. 2017-12-13 08:08:45 +01:00
Fabian Märki 1f85ce5325 More images. 2017-12-12 15:15:12 +01:00
Fabian Märki d112e13870 Add S10BC02-DSRM310:FPICTURE 2017-11-17 08:05:01 +01:00
Fabian Märki 5887c36fb3 Add new image. 2017-11-16 12:23:50 +01:00
Fabian Märki 37c9f1ceac Add new camera. 2017-11-16 07:48:48 +01:00
Fabian Märki 22dc762ff2 Reenable images. 2017-10-12 08:57:00 +02:00
Fabian Märki b21ad4d3b9 Disable images. 2017-10-12 08:54:29 +02:00
Fabian Märki ad9fceadde enable auto image config. 2017-10-10 16:54:59 +02:00
Fabian Märki a6ad31227f sort by host and port 2017-09-25 13:43:04 +02:00
brands adf883b48f Merge branch 'master' of git.psi.ch:sf_config/sf_daq_sources 2017-09-25 08:40:07 +02:00
Fabian Märki 20bc280902 Remove image used by Andrej 2017-09-22 15:36:20 +02:00