From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Tue, 8 Aug 2017 15:11:24 +0000 (+0200)
Subject: HAMEG_HMP4030: Measured{Voltage,Current} & PREC for Voltage PVs
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=51b5387a4f2bd2b8b1f39b8513a2d1c8375c13ea;p=mvd_epics.git

HAMEG_HMP4030: Measured{Voltage,Current} & PREC for Voltage PVs
---

diff --git a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
index 8b0557e..29bf660 100644
--- a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
+++ b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
@@ -2,7 +2,7 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetVoltage") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetVoltage($(CHAN)) $(PORT)")
   field (EGU, "V")
-  field (PREC, "4")
+  field (PREC, "3")
   field (ADEL, "0.005")
   field (MDEL, "0.001")
 }
@@ -11,7 +11,17 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetVoltage") {
   field (INP,  "@HAMEG_HMP4030.proto GetVoltage($(CHAN)) $(PORT)")
   field (SCAN, "2 second")
   field (EGU, "V")
-  field (PREC, "4")
+  field (PREC, "3")
+  field (ADEL, "0.005")
+  field (MDEL, "0.001")
+}
+
+record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):MeasuredVoltage") {
+  field (DTYP, "stream")
+  field (INP,  "@HAMEG_HMP4030.proto MeasuredVoltage($(CHAN)) $(PORT)")
+  field (SCAN, "2 second")
+  field (EGU, "V")
+  field (PREC, "3")
   field (ADEL, "0.005")
   field (MDEL, "0.001")
 }
@@ -20,7 +30,7 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetVoltageStepSize") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetVoltageStepSize($(CHAN)) $(PORT)")
   field (EGU, "V")
-  field (PREC, "4")
+  field (PREC, "3")
   field (ADEL, "0.005")
   field (MDEL, "0.001")
 }
@@ -29,7 +39,7 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetVoltageStepSize") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetVoltageStepSize($(CHAN)) $(PORT)")
   field (EGU, "V")
-  field (PREC, "4")
+  field (PREC, "3")
   field (ADEL, "0.005")
   field (MDEL, "0.001")
 }
@@ -52,6 +62,16 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetCurrent") {
   field (MDEL, "0.001")
 }
 
+record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):MeasuredCurrent") {
+  field (DTYP, "stream")
+  field (INP,  "@HAMEG_HMP4030.proto MeasuredCurrent($(CHAN)) $(PORT)")
+  field (SCAN, "2 second")
+  field (EGU, "A")
+  field (PREC, "4")
+  field (ADEL, "0.005")
+  field (MDEL, "0.001")
+}
+
 record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetCurrentStepSize") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetCurrentStepSize($(CHAN)) $(PORT)")
diff --git a/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto b/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
index f15edfa..d696ec2 100644
--- a/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
+++ b/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
@@ -39,8 +39,21 @@ SetGeneralOutput {
   out "OUTP:GEN %i";
   @init { GetGeneralOutput; }
 }
+ 
+#---ACTUAL (MEASURED) VOLTAGE & CURRENT ----------------------------------------------
+
+MeasuredVoltage {
+  out "INST OUT\$1";
+  out "MEAS?";
+  in "%f";
+}
 
-#---VOLTAGE---------------------------------------------------------------------------
+MeasuredCurrent {
+  out "INST OUT\$1";
+  out "MEAS:CURR?";
+  in "%f";
+}
+#---SETPOINT VOLTAGE-----------------------------------------------------------------
 
 GetVoltage {
   out "INST OUT\$1";
@@ -66,7 +79,7 @@ SetVoltageStepSize {
   @init { GetVoltageStepSize; }
 }
 
-#---CURRENT---------------------------------------------------------------------------
+#---SETPOINT CURRENT-----------------------------------------------------------------
 
 GetCurrent {
   out "INST OUT\$1";