VACOM_MVC3: generalized .proto getPressureValue()

diff --git a/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template b/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template
index c912e64813fc9068a04fb54d16bb48ecac8b0920..3d535a4773b6e108b53d013e89a110bc14f3e370 100644 (file)
--- a/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template
+++ b/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template
@@ -1,6 +1,6 @@
 record (ai, "$(sys):$(sub):VACUUM:$(vsys):$(REC):Pressure") {
   field (DTYP, "stream")
-  field (INP,  "@VACOM_MVC3.proto getPressureValue$(REC)($(sys):$(sub):VACUUM:$(vsys):$(REC)) $(PORT)")
+  field (INP,  "@VACOM_MVC3.proto getPressureValue($(REC),$(sys):$(sub):VACUUM:$(vsys):$(REC)) $(PORT)")
   field (SCAN, "10 second")
   field (EGU, "mbar")
 }

diff --git a/VACOM_MVC3/protocols/VACOM_MVC3.proto b/VACOM_MVC3/protocols/VACOM_MVC3.proto
index 6695875bdebe029532ff995142024fe764b54ce0..5ff3e4193bb3dbfca89b184213d3e3b81b3e4e57 100644 (file)
--- a/VACOM_MVC3/protocols/VACOM_MVC3.proto
+++ b/VACOM_MVC3/protocols/VACOM_MVC3.proto
@@ -23,18 +23,8 @@ ExtraInput    = Ignore;
 # ### Protocols ### #
 #####################
 
-getPressureValue1 {
-  out "RPV1";
-  in  "%(\$1:Status.VAL)d,\t%e";
-}
-
-getPressureValue2 {
-  out "RPV2";
-  in  "%(\$1:Status.VAL)d,\t%e";
-}
-
-getPressureValue3 {
-  out "RPV3";
-  in  "%(\$1:Status.VAL)d,\t%e";
+getPressureValue {
+  out "RPV\$1";
+  in  "%(\$2:Status.VAL)d,\t%e";
 }