FLOW: Generalized flow() total() functions in .proto

diff --git a/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.template b/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.template
index 83d3eb333e45208dd2e7b5c00117ccde654f03ef..b1c5e4dbaa5a8f79b25471bb428ff96a444d6054 100644 (file)
--- a/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.template
+++ b/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.template
@@ -16,7 +16,7 @@
 
 record (ai, "$(sys):$(sub):COOLING:$(csys):FLOW:$(CONN_NAME):Flow") {
   field (DTYP, "stream")
-  field (INP,  "@FLOW_METER.proto flow_$(CONN) $(PORT)")
+  field (INP,  "@FLOW_METER.proto flow($(CONN)) $(PORT)")
   field (SCAN, "I/O Intr")
   field (EGU,  "l/min")
   field (PREC, "3")
@@ -26,7 +26,7 @@ record (ai, "$(sys):$(sub):COOLING:$(csys):FLOW:$(CONN_NAME):Flow") {
 
 record (ai, "$(sys):$(sub):COOLING:$(csys):FLOW:$(CONN_NAME):Total") {
   field (DTYP, "stream")
-  field (INP,  "@FLOW_METER.proto total_$(CONN) $(PORT)")
+  field (INP,  "@FLOW_METER.proto total($(CONN)) $(PORT)")
   field (SCAN, "I/O Intr")
   field (EGU, "l")
   field (PREC, "3")

diff --git a/FLOW_METER/protocols/FLOW_METER.proto b/FLOW_METER/protocols/FLOW_METER.proto
index 88a5762112c7aee00b970965720fd3bb59d9a652..e919694e332cfc0ebb12bbf7b11fdf4e49749dda 100644 (file)
--- a/FLOW_METER/protocols/FLOW_METER.proto
+++ b/FLOW_METER/protocols/FLOW_METER.proto
@@ -23,17 +23,9 @@ ExtraInput    = Ignore;
 #####################
 
 
-flow_A {
-  in  "F A %f";
+flow {
+  in  "F \$1 %f";
 }
-total_A {
-  in  "T A %f";
+total {
+  in  "T \$1 %f";
 }
-
-flow_B {
-  in  "F B %f";
-}
-total_B {
-  in  "T B %f";
-}
-