From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Thu, 10 Aug 2017 16:18:33 +0000 (+0200)
Subject: VACOM_MVC3: .proto @mismatch & Status severity
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=10c3324b5730e90eb2aa88b374aca446c7d20a1c;p=mvd_epics.git

VACOM_MVC3: .proto @mismatch & Status severity
---

diff --git a/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template b/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template
index 3d535a4..135b274 100644
--- a/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template
+++ b/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3_CHANNEL.template
@@ -2,25 +2,63 @@ 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 (SCAN, "10 second")
+  field (PINI, "YES")
   field (EGU, "mbar")
 }
 
 record (mbbi, "$(sys):$(sub):VACUUM:$(vsys):$(REC):Status") {
-  field (DTYP, "Raw Soft Channel")
+  field (DTYP, "Soft Channel")
+  # Unknown State Severity:
+  #field (UNSV, "")
+  # Change of State Severity:
+  #field (COSV, "")
+
+  # 0 State:
   field (ZRST, "OK")
+  field (ZRSV, "NO_ALARM")
+
   field (ONST, "URANGE")
+  field (ONSV, "NO_ALARM")
+
   field (TWST, "ORANGE")
+  field (TWSV, "NO_ALARM")
+
   field (THST, "ERR_LO")
+  field (THSV, "NO_ALARM")
+
   field (FRST, "ERR_HI")
+  field (FRSV, "NO_ALARM")
+
   field (FVST, "OFF")
+  field (FVSV, "MINOR")
+
   field (SXST, "HV_ON")
+  field (SXSV, "NO_ALARM")
+
   field (SVST, "SENS_ERR")
+  field (SVSV, "MAJOR")
+
   field (EIST, "BA_ERR")
+  field (EISV, "MAJOR")
+
   field (NIST, "NO_SENS")
+  field (NISV, "MINOR")
+
   field (TEST, "NOTRIG")
+  field (TESV, "MAJOR")
+
   field (ELST, "ERR_P")
+  field (ELSV, "MAJOR")
+
   field (TVST, "ERR_PI")
+  field (TVSV, "MAJOR")
+
   field (TTST, "VOLTAGE_BREAKDOWN")
+  field (TTSV, "MAJOR")
+
   field (FTST, "FILAMENT_BROKEN")
-}
+  field (FTSV, "MAJOR")
 
+  field (FFST, "NO_SENSOR")
+  field (FFSV, "MINOR")
+}
diff --git a/VACOM_MVC3/protocols/VACOM_MVC3.proto b/VACOM_MVC3/protocols/VACOM_MVC3.proto
index 5ff3e41..d0603af 100644
--- a/VACOM_MVC3/protocols/VACOM_MVC3.proto
+++ b/VACOM_MVC3/protocols/VACOM_MVC3.proto
@@ -25,6 +25,8 @@ ExtraInput    = Ignore;
 
 getPressureValue {
   out "RPV\$1";
-  in  "%(\$2:Status.VAL)d,\t%e";
+  in  "%(\$2:Status.VAL)#{0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|?=15},\t%e";
+  @mismatch {
+    in "?\t%(\$2:Status.VAL)#{S=15}.,\t\$2";
+  }
 }
-