MKS_910_DualTrans scan all pressure readings

diff --git a/MKS_910_DualTrans/MKS_910_DualTransApp/Db/MKS_910_DualTrans.db b/MKS_910_DualTrans/MKS_910_DualTransApp/Db/MKS_910_DualTrans.db
index dd50e7e399b19a700c362155e9211f3e8328d099..c93211839851834cf67e0e5a6a5d06b3b2cd8642 100644 (file)
--- a/MKS_910_DualTrans/MKS_910_DualTransApp/Db/MKS_910_DualTrans.db
+++ b/MKS_910_DualTrans/MKS_910_DualTransApp/Db/MKS_910_DualTrans.db
@@ -1,6 +1,26 @@
-record (ai, "$(sys):$(sub):VACUUM:$(vsys):PressureP3") {
+record (ai, "$(sys):$(sub):VACUUM:$(vsys):PressureMicroPirani") {
   field (DTYP, "stream")
-  field (INP,  "@MKS_910_DualTrans.proto getPressureP3 $(PORT)")
+  field (DESC, "Pressure PR1 (MicroPirani)")
+  field (INP,  "@MKS_910_DualTrans.proto getPressure(1) $(PORT)")
+  field (SCAN, "2 second")
+  field (EGU, "mbar")
+  field (PREC, "3")
+}
+
+record (ai, "$(sys):$(sub):VACUUM:$(vsys):PressurePiezo") {
+  field (DTYP, "stream")
+  field (DESC, "Pressure PR2 (Piezo absolute)")
+  field (INP,  "@MKS_910_DualTrans.proto getPressure(2) $(PORT)")
+  field (SCAN, "2 second")
+  field (EGU, "mbar")
+  field (PREC, "3")
+}
+
+record (ai, "$(sys):$(sub):VACUUM:$(vsys):PressureCombined") {
+  alias("$(sys):$(sub):VACUUM:$(vsys):Pressure")
+  field (DTYP, "stream")
+  field (DESC, "Pressure PR3 (MicroPirani and Piezo absolute combined)")
+  field (INP,  "@MKS_910_DualTrans.proto getPressure(3) $(PORT)")
   field (SCAN, "2 second")
   field (EGU, "mbar")
   field (PREC, "3")

diff --git a/MKS_910_DualTrans/protocols/MKS_910_DualTrans.proto b/MKS_910_DualTrans/protocols/MKS_910_DualTrans.proto
index 9ba0ebe6889bedfff3810f511b6ac77d6d153b48..7dcd9022217727196c1382aba330e62159faa44e 100644 (file)
--- a/MKS_910_DualTrans/protocols/MKS_910_DualTrans.proto
+++ b/MKS_910_DualTrans/protocols/MKS_910_DualTrans.proto
@@ -23,7 +23,7 @@ ExtraInput    = Ignore;
 #####################
 
 
-getPressureP3 {
-  out "@253PR3?";
+getPressure {
+  out "@253PR\$1?";
   in  "@253ACK%e";
 }