Merge branch 'master' into 'master'

add port 20000 for LLRF bsdata IOCs, add but comment out other RF stations Test für den Workflow manuell See merge request !1
2016-04-20 11:29:39 +02:00
parent 3b64c3dfff 21b50c3823
commit b263b60a79
1 changed files with 78 additions and 6 deletions
--- a/llrf.config
+++ b/llrf.config
@@ -1,6 +1,78 @@
-SINEG01-CVME-LLRF1
-SINEG01-CVME-LLRF2
-SINSB01-CVME-LLRF1
-SINSB01-CVME-LLRF2
-SINSB02-CVME-LLRF1
-SINSB02-CVME-LLRF2
+# LLRF IOC's with bsdata streaming from real time application (=port 20000)
+
+# injector
+SINEG01-CVME-LLRF1 20000
+SINEG01-CVME-LLRF2 20000
+SINSB01-CVME-LLRF1 20000
+SINSB01-CVME-LLRF2 20000
+SINSB02-CVME-LLRF1 20000
+SINSB02-CVME-LLRF2 20000
+#SINSB03-CVME-LLRF1 20000
+#SINSB03-CVME-LLRF2 20000
+#SINSB04-CVME-LLRF1 20000
+#SINSB04-CVME-LLRF2 20000
+#SINXB01-CVME-LLRF1 20000
+#SINXB01-CVME-LLRF2 20000
+#SINDI01-CVME-LLRF1 20000
+#SINDI01-CVME-LLRF2 20000
+
+# linac 1
+#S10CB01-CVME-LLRF1 20000
+#S10CB01-CVME-LLRF2 20000
+#S10CB02-CVME-LLRF1 20000
+#S10CB02-CVME-LLRF2 20000
+#S10CB03-CVME-LLRF1 20000
+#S10CB03-CVME-LLRF2 20000
+#S10CB04-CVME-LLRF1 20000
+#S10CB04-CVME-LLRF2 20000
+#S10CB05-CVME-LLRF1 20000
+#S10CB05-CVME-LLRF2 20000
+#S10CB06-CVME-LLRF1 20000
+#S10CB06-CVME-LLRF2 20000
+#S10CB07-CVME-LLRF1 20000
+#S10CB07-CVME-LLRF2 20000
+#S10CB08-CVME-LLRF1 20000
+#S10CB08-CVME-LLRF2 20000
+#S10CB09-CVME-LLRF1 20000
+#S10CB09-CVME-LLRF2 20000
+
+# linac 2
+#S20CB01-CVME-LLRF1 20000
+#S20CB01-CVME-LLRF2 20000
+#S20CB02-CVME-LLRF1 20000
+#S20CB02-CVME-LLRF2 20000
+#S20CB03-CVME-LLRF1 20000
+#S20CB03-CVME-LLRF2 20000
+#S20CB04-CVME-LLRF1 20000
+#S20CB04-CVME-LLRF2 20000
+
+# linac 3
+#S30CB01-CVME-LLRF1 20000
+#S30CB01-CVME-LLRF2 20000
+#S30CB02-CVME-LLRF1 20000
+#S30CB02-CVME-LLRF2 20000
+#S30CB03-CVME-LLRF1 20000
+#S30CB03-CVME-LLRF2 20000
+#S30CB04-CVME-LLRF1 20000
+#S30CB04-CVME-LLRF2 20000
+#S30CB05-CVME-LLRF1 20000
+#S30CB05-CVME-LLRF2 20000
+#S30CB06-CVME-LLRF1 20000
+#S30CB06-CVME-LLRF2 20000
+#S30CB07-CVME-LLRF1 20000
+#S30CB07-CVME-LLRF2 20000
+#S30CB08-CVME-LLRF1 20000
+#S30CB08-CVME-LLRF2 20000
+#S30CB09-CVME-LLRF1 20000
+#S30CB09-CVME-LLRF2 20000
+#S30CB10-CVME-LLRF1 20000
+#S30CB10-CVME-LLRF2 20000
+#S30CB11-CVME-LLRF1 20000
+#S30CB11-CVME-LLRF2 20000
+#S30CB12-CVME-LLRF1 20000
+#S30CB12-CVME-LLRF2 20000
+#S30CB13-CVME-LLRF1 20000
+#S30CB13-CVME-LLRF2 20000
+#S30CB14-CVME-LLRF1 20000
+#S30CB14-CVME-LLRF2 20000
+