BALZERS: CONTROLLER_A / CONTROLLER_B macros

diff --git a/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.substitutions b/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.substitutions
index cff37a3788bab4fa7dd3b05662668cb97430d1c8..e8495b38406ee1f106e7269bab4c5290111616bd 100644 (file)
--- a/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.substitutions
+++ b/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.substitutions
@@ -1,8 +1,8 @@
 file BALZERS_PKG020_CHANNEL.template {
 
-pattern { SIDE, GAUGE, CHAN }
-        { "A"   "TPR2"  "1" }
-        { "A"   "IKR"  "2" }
-        { "B"   "TPR2"  "3" }
-        { "B"   "IKR"  "4" }
+pattern { CONTROLLER,       GAUGE, CHAN  }
+        { "$(CONTROLLER_A)"  "TPR2"  "1" }
+        { "$(CONTROLLER_A)"  "IKR"   "2" }
+        { "$(CONTROLLER_B)"  "TPR2"  "3" }
+        { "$(CONTROLLER_B)"  "IKR"   "4" }
 }

diff --git a/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.template b/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.template
index 3cf8dcbc61eea32a049d1269922479f8e4dce25f..8876387375ba920f71ec006f5372f3c77a06d42c 100644 (file)
--- a/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.template
+++ b/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.template
@@ -1,4 +1,4 @@
-record (ai, "$(sys):$(sub):VACUUM:$(vsys):$(SIDE):$(GAUGE):Voltage") {
+record (ai, "$(sys):$(sub):VACUUM:$(vsys):$(CONTROLLER):$(GAUGE):Voltage") {
   field (DTYP, "stream")
   field (INP,  "@BALZERS_PKG020.proto getVoltage($(CHAN)) $(PORT)")
   field (SCAN, "2 second")

diff --git a/BALZERS_PKG020/iocBoot/iocBALZERS_PKG020/st.cmd b/BALZERS_PKG020/iocBoot/iocBALZERS_PKG020/st.cmd
index fb5dd055e626c096cd1aa5a2d337f8ca84e1c683..048bbc275105d342ba1be4de09e69d83f94446b5 100755 (executable)
--- a/BALZERS_PKG020/iocBoot/iocBALZERS_PKG020/st.cmd
+++ b/BALZERS_PKG020/iocBoot/iocBALZERS_PKG020/st.cmd
@@ -25,7 +25,7 @@ asynSetOption ("BALZERS_PORT", 0, "crtscts", "N")
 #dbLoadRecords("db/xxx.db","user=scs")
 
 dbLoadRecords("dbd/bptBALZERS_PKG020.dbd")
-dbLoadRecords("db/BALZERS_PKG020_CHANNEL.db", "PORT=BALZERS_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT")
+dbLoadRecords("db/BALZERS_PKG020_CHANNEL.db", "PORT=BALZERS_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CONTROLLER_A=SIDE_A,CONTROLLER_B=SIDE_B")
 
 cd "${TOP}/iocBoot/${IOC}"
 iocInit