Merge branch 'master' into 'master'

enabled S10CB02 and S30CB13 LLRF and RF Interlock

The configuration was changed by kalt_r

See merge request !57
This commit is contained in:
maerki_f
2017-06-16 14:22:35 +02:00
2 changed files with 8 additions and 8 deletions

View File

@@ -20,9 +20,9 @@
/*linac 1*/
,{"stream": "tcp://S10CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB01-CVME-LLRF2:20000"}
/*,{"stream": "tcp://S10CB02-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB02-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB02-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB03-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S10CB03-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB03-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB04-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB04-CVME-LLRF2:20000"}*/
@@ -71,10 +71,10 @@
,{"stream": "tcp://S30CB11-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB11-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB12-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB12-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB12-CVME-LLRF2:20000"}*/
,{"stream": "tcp://S30CB13-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB13-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB14-CVME-LLRF2:20000"}
,{"stream": "tcp://S30-CVME-LLRF:20000"}*/
]

View File

@@ -11,8 +11,8 @@
,{"stream": "tcp://SINDI01-CVME-ILK:9999"}
/*linac 1*/
,{"stream": "tcp://S10CB01-CVME-ILK:9999"}
/*,{"stream": "tcp://S10CB02-CVME-ILK:9999"}
,{"stream": "tcp://S10CB03-CVME-ILK:9999"}
,{"stream": "tcp://S10CB02-CVME-ILK:9999"}
/*,{"stream": "tcp://S10CB03-CVME-ILK:9999"}
,{"stream": "tcp://S10CB04-CVME-ILK:9999"}*/
,{"stream": "tcp://S10CB05-CVME-ILK:9999"}
,{"stream": "tcp://S10CB06-CVME-ILK:9999"}
@@ -36,8 +36,8 @@
,{"stream": "tcp://S30CB09-CVME-ILK:9999"}
,{"stream": "tcp://S30CB10-CVME-ILK:9999"}
,{"stream": "tcp://S30CB11-CVME-ILK:9999"}
,{"stream": "tcp://S30CB12-CVME-ILK:9999"}
,{"stream": "tcp://S30CB12-CVME-ILK:9999"}*/
,{"stream": "tcp://S30CB13-CVME-ILK:9999"}
,{"stream": "tcp://S30CB14-CVME-ILK:9999"}*/
/*,{"stream": "tcp://S30CB14-CVME-ILK:9999"}*/
]
}