Merge branch 'master' into 'master'

please add injector virtual rf station

The configuration was changed by jurcevic_m

See merge request !49
This commit is contained in:
maerki_f
2017-03-15 11:06:21 +01:00

View File

@@ -16,6 +16,7 @@
,{"stream": "tcp://SINXB01-CVME-LLRF2:20000"}
,{"stream": "tcp://SINDI01-CVME-LLRF1:20000"}
,{"stream": "tcp://SINDI01-CVME-LLRF2:20000"}
,{"stream": "tcp://SIN-CVME-LLRF:20000"}
/*linac 1*/
,{"stream": "tcp://S10CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB01-CVME-LLRF2:20000"}