Merge branch 'master' into 'master'

enabled LLRF / ILK S10CB05, 06

The configuration was changed by kalt_r

See merge request !53
This commit is contained in:
maerki_f
2017-04-20 16:13:32 +02:00
2 changed files with 5 additions and 5 deletions
+3 -3
View File
@@ -2,7 +2,7 @@
/*LLRF IOC's with bsdata streaming from real time application (=port:20000)*/
"sources": [
/*injector*/
{"stream": "tcp://SINEG01-CVME-LLRF1:20000"}
{"stream": "tcp://SINEG01-CVME-LLRF1:20000"}
,{"stream": "tcp://SINEG01-CVME-LLRF2:20000"}
,{"stream": "tcp://SINSB01-CVME-LLRF1:20000"}
,{"stream": "tcp://SINSB01-CVME-LLRF2:20000"}
@@ -25,12 +25,12 @@
,{"stream": "tcp://S10CB03-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB03-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB04-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB04-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB04-CVME-LLRF2:20000"}*/
,{"stream": "tcp://S10CB05-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB05-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB06-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB06-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB07-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S10CB07-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB07-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB08-CVME-LLRF2:20000"}
+2 -2
View File
@@ -13,10 +13,10 @@
,{"stream": "tcp://S10CB01-CVME-ILK:9999"}
/*,{"stream": "tcp://S10CB02-CVME-ILK:9999"}
,{"stream": "tcp://S10CB03-CVME-ILK:9999"}
,{"stream": "tcp://S10CB04-CVME-ILK:9999"}
,{"stream": "tcp://S10CB04-CVME-ILK:9999"}*/
,{"stream": "tcp://S10CB05-CVME-ILK:9999"}
,{"stream": "tcp://S10CB06-CVME-ILK:9999"}
,{"stream": "tcp://S10CB07-CVME-ILK:9999"}
/*,{"stream": "tcp://S10CB07-CVME-ILK:9999"}
,{"stream": "tcp://S10CB08-CVME-ILK:9999"}
,{"stream": "tcp://S10CB09-CVME-ILK:9999"}*/
/*linac 2*/