Merge branch 'master' into 'master'

Basler CL Camera (TEST) for ESB

See merge request sf_config/sf_daq_sources!94
This commit is contained in:
maerki_f
2019-03-06 09:54:39 +01:00
+1
View File
@@ -66,6 +66,7 @@
,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9020","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-84.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-85.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://sf-daqsync-02:8889","split":4,"backend":"sf-imagebuffer"}
/* ,{"stream":"tcp://daqsf-daqsync-02:8889","split":4,"backend":"sf-imagebuffer"} */