From de5b5edc903b072bbcd9958abb13308c3726ba4c Mon Sep 17 00:00:00 2001
From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Thu, 10 Aug 2017 16:32:03 +0200
Subject: [PATCH] VACOM_MVC3: generalized .proto getPressureValue()

---
 .../VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template |  2 +-
 VACOM_MVC3/protocols/VACOM_MVC3.proto            | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template b/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template
index c912e64..3d535a4 100644
--- 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 6695875..5ff3e41 100644
--- 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";
 }
 
-- 
2.43.0