From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Fri, 4 Aug 2017 09:13:37 +0000 (+0200)
Subject: FLOW: Mapping/naming CONNector -> Position
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=144622b35c3a1167cbbb54f529e6fcb53eb3d9cb;p=mvd_epics.git

FLOW: Mapping/naming CONNector -> Position
---

diff --git a/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.substitutions b/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.substitutions
index 8df2b9e..d080ba1 100644
--- a/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.substitutions
+++ b/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.substitutions
@@ -1,8 +1,8 @@
 
 file FLOW_METER.template {
 
-pattern { REC }
-        { "A" }
-        { "B" }
+pattern { CONN_NAME, CONN }
+        { $(CONN_A)  "A"  }
+        { $(CONN_B)  "B"  }
 }
 
diff --git a/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.template b/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.template
index 4662b2f..83d3eb3 100644
--- a/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.template
+++ b/FLOW_METER/FLOW_METERApp/Db/FLOW_METER.template
@@ -14,9 +14,9 @@
 # ###         PORT  Asyn Interface      ### #
 #############################################
 
-record (ai, "$(sys):$(sub):COOLING:$(csys):FLOW:$(REC):Flow") {
+record (ai, "$(sys):$(sub):COOLING:$(csys):FLOW:$(CONN_NAME):Flow") {
   field (DTYP, "stream")
-  field (INP,  "@FLOW_METER.proto flow_$(REC) $(PORT)")
+  field (INP,  "@FLOW_METER.proto flow_$(CONN) $(PORT)")
   field (SCAN, "I/O Intr")
   field (EGU,  "l/min")
   field (PREC, "3")
@@ -24,9 +24,9 @@ record (ai, "$(sys):$(sub):COOLING:$(csys):FLOW:$(REC):Flow") {
   #field (MDEL, "0.01")
 }
 
-record (ai, "$(sys):$(sub):COOLING:$(csys):FLOW:$(REC):Total") {
+record (ai, "$(sys):$(sub):COOLING:$(csys):FLOW:$(CONN_NAME):Total") {
   field (DTYP, "stream")
-  field (INP,  "@FLOW_METER.proto total_$(REC) $(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/iocBoot/iocFLOW_METER/st.cmd b/FLOW_METER/iocBoot/iocFLOW_METER/st.cmd
index d8ae047..e0526f5 100755
--- a/FLOW_METER/iocBoot/iocFLOW_METER/st.cmd
+++ b/FLOW_METER/iocBoot/iocFLOW_METER/st.cmd
@@ -24,7 +24,7 @@ asynSetOption ("FLOW_METER_PORT", 0, "crtscts", "N")
 ## Load record instances
 #dbLoadRecords("db/xxx.db","user=scs")
 
-dbLoadRecords("db/FLOW_METER.db", "PORT=FLOW_METER_PORT,sys=CBM,sub=MVD,csys=CC405")
+dbLoadRecords("db/FLOW_METER.db", "PORT=FLOW_METER_PORT,sys=CBM,sub=MVD,csys=CC405,CONN_A=IN,CONN_B=OUT")
 
 cd "${TOP}/iocBoot/${IOC}"
 iocInit
diff --git a/FLOW_METER/protocols/FLOW_METER.proto b/FLOW_METER/protocols/FLOW_METER.proto
index acb240d..88a5762 100644
--- a/FLOW_METER/protocols/FLOW_METER.proto
+++ b/FLOW_METER/protocols/FLOW_METER.proto
@@ -24,16 +24,16 @@ ExtraInput    = Ignore;
 
 
 flow_A {
-  in  "F %*X %f";
+  in  "F A %f";
 }
 total_A {
-  in  "T %*X %f";
+  in  "T A %f";
 }
 
 flow_B {
-  in  "F %*X %f";
+  in  "F B %f";
 }
 total_B {
-  in  "T %*X %f";
+  in  "T B %f";
 }