BALZERS: .proto .db .template .substitutions for new ADCuC

diff --git a/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020.db b/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020.db
index 7f95f06a3909f732258fcd6d856d4af455789434..beb07182945a4812ac544d64bd9514fad29ca0a0 100644 (file)
--- a/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020.db
+++ b/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020.db
@@ -17,7 +17,7 @@
 
 record (ai, "$(sys):$(sub):VACUUM:$(vsys):TPR:Pressure") {
   field (DTYP, "stream")
-  field (INP,  "@BALZERS_PKG020.proto getVoltage5 $(PORT)")
+  field (INP,  "@BALZERS_PKG020.proto getVoltage1 $(PORT)")
   field (SCAN, "I/O Intr")
   field (EGU,  "mbar")
   field (LINR, "tpr2")
@@ -28,7 +28,7 @@ record (ai, "$(sys):$(sub):VACUUM:$(vsys):TPR:Pressure") {
 
 record (ai, "$(sys):$(sub):VACUUM:$(vsys):IKR:Pressure") {
   field (DTYP, "stream")
-  field (INP,  "@BALZERS_PKG020.proto getVoltage7 $(PORT)")
+  field (INP,  "@BALZERS_PKG020.proto getVoltage2 $(PORT)")
   field (SCAN, "I/O Intr")
   field (EGU, "mbar")
   field (LINR, "ikr")
@@ -39,7 +39,7 @@ record (ai, "$(sys):$(sub):VACUUM:$(vsys):IKR:Pressure") {
 
 record (ai, "$(sys):$(sub):VACUUM:$(vsys):TPR:Voltage") {
   field (DTYP, "stream")
-  field (INP,  "@BALZERS_PKG020.proto getVoltage5 $(PORT)")
+  field (INP,  "@BALZERS_PKG020.proto getVoltage1 $(PORT)")
   field (SCAN, "I/O Intr")
   field (EGU, "V")
   field (PREC, "3")
@@ -49,7 +49,7 @@ record (ai, "$(sys):$(sub):VACUUM:$(vsys):TPR:Voltage") {
 
 record (ai, "$(sys):$(sub):VACUUM:$(vsys):IKR:Voltage") {
   field (DTYP, "stream")
-  field (INP,  "@BALZERS_PKG020.proto getVoltage7 $(PORT)")
+  field (INP,  "@BALZERS_PKG020.proto getVoltage2 $(PORT)")
   field (SCAN, "I/O Intr")
   field (EGU, "V")
   field (PREC, "3")

diff --git a/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.substitutions b/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.substitutions
new file mode 100644 (file)
index 0000000..cff37a3
--- /dev/null
+++ b/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.substitutions
@@ -0,0 +1,8 @@
+file BALZERS_PKG020_CHANNEL.template {
+
+pattern { SIDE, GAUGE, CHAN }
+        { "A"   "TPR2"  "1" }
+        { "A"   "IKR"  "2" }
+        { "B"   "TPR2"  "3" }
+        { "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
new file mode 100644 (file)
index 0000000..0cffa83
--- /dev/null
+++ b/BALZERS_PKG020/BALZERS_PKG020App/Db/BALZERS_PKG020_CHANNEL.template
@@ -0,0 +1,22 @@
+record (ai, "$(sys):$(sub):VACUUM:$(vsys):$(SIDE):$(GAUGE):Voltage") {
+  field (DTYP, "stream")
+  field (INP,  "@BALZERS_PKG020.proto getVoltage$(CHAN) $(PORT)")
+  field (SCAN, "2 second")
+  field (EGU, "V")
+  field (PREC, "4")
+  field (ADEL, "0.005")
+  field (MDEL, "0.001")
+}
+
+#record (ai, "$(sys):$(sub):VACUUM:$(vsys):$(SIDE):$(GAUGE):Pressure") {
+#  field (DTYP, "stream")
+#  field (INP,  "@BALZERS_PKG020.proto getVoltage$(CHAN) $(PORT)")
+#  field (SCAN, "2 second")
+#  field (EGU, "mbar")
+#  field (PREC, "4")
+#  field (ADEL, "0.005")
+#  field (MDEL, "0.001")
+#}
+
+
+

diff --git a/BALZERS_PKG020/BALZERS_PKG020App/Db/Makefile b/BALZERS_PKG020/BALZERS_PKG020App/Db/Makefile
index 415bdcb1c80fe9e07b54a3f5d74fe002bebae62f..326c13ed396ec510e74d64f7cb7ad0984e21582e 100644 (file)
--- a/BALZERS_PKG020/BALZERS_PKG020App/Db/Makefile
+++ b/BALZERS_PKG020/BALZERS_PKG020App/Db/Makefile
@@ -11,7 +11,7 @@ include $(TOP)/configure/CONFIG
 # Create and install (or just install) into <top>/db
 # databases, templates, substitutions like this
 #DB += xxx.db
-DB += BALZERS_PKG020.db
+DB += BALZERS_PKG020_CHANNEL.db
 
 #----------------------------------------------------
 # If <anyname>.db template is not named <anyname>*.template add

diff --git a/BALZERS_PKG020/protocols/BALZERS_PKG020.proto b/BALZERS_PKG020/protocols/BALZERS_PKG020.proto
index 62086bb0041477386a05627378252f07e2441213..9ba7a51887b9a416eb3448b907df4776ef3a5cde 100644 (file)
--- a/BALZERS_PKG020/protocols/BALZERS_PKG020.proto
+++ b/BALZERS_PKG020/protocols/BALZERS_PKG020.proto
@@ -25,30 +25,18 @@ ExtraInput    = Ignore;
 
 
 getVoltage1 {
-  in  "%f %*f %*f %*f %*f %*f %*f %*f %*f";
+  out "V 1?";
+  in "V 1 %f";
 }
 getVoltage2 {
-  in  "%*f %f %*f %*f %*f %*f %*f %*f %*f";
+  out "V 2?";
+  in "V 2 %f";
 }
 getVoltage3 {
-  in  "%*f %*f %f %*f %*f %*f %*f %*f %*f";
+  out "V 3?";
+  in "V 3 %f";
 }
 getVoltage4 {
-  in  "%*f %*f %*f %f %*f %*f %*f %*f %*f";
+  out "V 4?";
+  in "V 4 %f";
 }
-getVoltage5 {
-  in  "%*f %*f %*f %*f %f %*f %*f %*f %*f";
-}
-getVoltage6 {
-  in  "%*f %*f %*f %*f %*f %f %*f %*f %*f";
-}
-getVoltage7 {
-  in  "%*f %*f %*f %*f %*f %*f %f %*f %*f";
-}
-getVoltage8 {
-  in  "%*f %*f %*f %*f %*f %*f %*f %f %*f";
-}
-getVoltage9 {
-  in  "%*f %*f %*f %*f %*f %*f %*f %*f %f";
-}
-