Merge branch 'master' into 'master'

Lieber Fabian, bitte nimm nun S20CB01 in den DataBuffer auf!

The configuration was changed by hauff

See merge request !42
This commit is contained in:
maerki_f
2017-02-22 07:51:32 +01:00

View File

@@ -36,9 +36,9 @@
,{"stream": "tcp://S10CB09-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB09-CVME-LLRF2:20000"}*/
/*linac 2*/
/*,{"stream": "tcp://S20CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB01-CVME-LLRF2:20000"}
,{"stream": "tcp://S20CB02-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S20CB02-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB02-CVME-LLRF2:20000"}
,{"stream": "tcp://S20CB03-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB03-CVME-LLRF2:20000"}