VACOM_MVC3: Status as mbbi ENUM / support for 3 channels

diff --git a/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3.db b/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3.db
index f667f54e893ebabf8235370d480a3fa36a708d27..92c40fb4d79e303edf96dfbc32592418a610d687 100644 (file)
--- a/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3.db
+++ b/VACOM_MVC3/VACOM_MVC3App/Db/VACOM_MVC3.db
@@ -15,16 +15,82 @@
 # ###         PORT  Asyn Interface      ### #
 #############################################
 
-record (ai, "$(sys):$(sub):VACUUM:$(vsys):Pressure") {
+
+record (ai, "$(sys):$(sub):VACUUM:$(vsys):1:Pressure") {
   field (DTYP, "stream")
-  field (INP,  "@VACOM_MVC3.proto getPressureValue2 $(PORT)")
+  field (INP,  "@VACOM_MVC3.proto getPressureValue1($(sys):$(sub):VACUUM:$(vsys):1) $(PORT)")
   field (SCAN, "10 second")
-  #field (FLNK, "PANDA:$(subsys):COOLING:$(sector):getExtTemp")
   field (EGU, "mbar")
-  #field (PREC, "2")
-  #field (ADEL, "1")
-  #field (MDEL, "1")
-  #field (ASLO, "0.01")
-  #field (AOFF, "0")
+}
+
+record (mbbi, "$(sys):$(sub):VACUUM:$(vsys):1:Status") {
+  field (DTYP, "Raw Soft Channel")
+  field (ZRST, "OK")
+  field (ONST, "URANGE")
+  field (TWST, "ORANGE")
+  field (THST, "ERR_LO")
+  field (FRST, "ERR_HI")
+  field (FVST, "OFF")
+  field (SXST, "HV_ON")
+  field (SVST, "SENS_ERR")
+  field (EIST, "BA_ERR")
+  field (NIST, "NO_SENS")
+  field (TEST, "NOTRIG")
+  field (ELST, "ERR_P")
+  field (TVST, "ERR_PI")
+  field (TTST, "VOLTAGE_BREAKDOWN")
+  field (FTST, "FILAMENT_BROKEN")
+}
+
+record (ai, "$(sys):$(sub):VACUUM:$(vsys):2:Pressure") {
+  field (DTYP, "stream")
+  field (INP,  "@VACOM_MVC3.proto getPressureValue2($(sys):$(sub):VACUUM:$(vsys):2) $(PORT)")
+  field (SCAN, "10 second")
+  field (EGU, "mbar")
+}
+
+record (mbbi, "$(sys):$(sub):VACUUM:$(vsys):2:Status") {
+  field (DTYP, "Raw Soft Channel")
+  field (ZRST, "OK")
+  field (ONST, "URANGE")
+  field (TWST, "ORANGE")
+  field (THST, "ERR_LO")
+  field (FRST, "ERR_HI")
+  field (FVST, "OFF")
+  field (SXST, "HV_ON")
+  field (SVST, "SENS_ERR")
+  field (EIST, "BA_ERR")
+  field (NIST, "NO_SENS")
+  field (TEST, "NOTRIG")
+  field (ELST, "ERR_P")
+  field (TVST, "ERR_PI")
+  field (TTST, "VOLTAGE_BREAKDOWN")
+  field (FTST, "FILAMENT_BROKEN")
+}
+
+record (ai, "$(sys):$(sub):VACUUM:$(vsys):3:Pressure") {
+  field (DTYP, "stream")
+  field (INP,  "@VACOM_MVC3.proto getPressureValue3($(sys):$(sub):VACUUM:$(vsys):3) $(PORT)")
+  field (SCAN, "10 second")
+  field (EGU, "mbar")
+}
+
+record (mbbi, "$(sys):$(sub):VACUUM:$(vsys):3:Status") {
+  field (DTYP, "Raw Soft Channel")
+  field (ZRST, "OK")
+  field (ONST, "URANGE")
+  field (TWST, "ORANGE")
+  field (THST, "ERR_LO")
+  field (FRST, "ERR_HI")
+  field (FVST, "OFF")
+  field (SXST, "HV_ON")
+  field (SVST, "SENS_ERR")
+  field (EIST, "BA_ERR")
+  field (NIST, "NO_SENS")
+  field (TEST, "NOTRIG")
+  field (ELST, "ERR_P")
+  field (TVST, "ERR_PI")
+  field (TTST, "VOLTAGE_BREAKDOWN")
+  field (FTST, "FILAMENT_BROKEN")
 }
 

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