From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Fri, 4 Aug 2017 09:17:01 +0000 (+0200)
Subject: FLOW: Generalized flow() total() functions in .proto
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=9b7e283d6672398fe5fb2a3128127e9b8b8a1511;p=mvd_epics.git

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 83d3eb3..b1c5e4d 100644
--- 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 88a5762..e919694 100644
--- 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";
-}
-