From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Tue, 8 Aug 2017 13:46:33 +0000 (+0200)
Subject: HAMEG_HMP4030: Get/Set naming in PV names / protocols
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=a116828c069456ac1f7b7c5a7ff5c758ed01cfd3;p=mvd_epics.git

HAMEG_HMP4030: Get/Set naming in PV names / protocols
---

diff --git a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
index 13a4bac..f966462 100644
--- a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
+++ b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
@@ -6,9 +6,9 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetVoltage") {
   field (ADEL, "0.005")
   field (MDEL, "0.001")
 }
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ReadSetVoltage") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetVoltage") {
   field (DTYP, "stream")
-  field (INP,  "@HAMEG_HMP4030.proto ReadSetVoltage($(CHAN)) $(PORT)")
+  field (INP,  "@HAMEG_HMP4030.proto GetVoltage($(CHAN)) $(PORT)")
   field (SCAN, "2 second")
   field (EGU, "V")
   field (PREC, "4")
@@ -25,9 +25,9 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetVoltageStepSize") {
   field (MDEL, "0.001")
 }
 
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ReadSetVoltageStepSize") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetVoltageStepSize") {
   field (DTYP, "stream")
-  field (INP,  "@HAMEG_HMP4030.proto ReadSetVoltageStepSize($(CHAN)) $(PORT)")
+  field (INP,  "@HAMEG_HMP4030.proto GetVoltageStepSize($(CHAN)) $(PORT)")
   field (EGU, "V")
   field (PREC, "4")
   field (ADEL, "0.005")
@@ -42,9 +42,9 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetCurrent") {
   field (ADEL, "0.005")
   field (MDEL, "0.001")
 }
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ReadSetCurrent") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetCurrent") {
   field (DTYP, "stream")
-  field (INP,  "@HAMEG_HMP4030.proto ReadSetCurrent($(CHAN)) $(PORT)")
+  field (INP,  "@HAMEG_HMP4030.proto GetCurrent($(CHAN)) $(PORT)")
   field (SCAN, "2 second")
   field (EGU, "A")
   field (PREC, "4")
@@ -61,9 +61,9 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetCurrentStepSize") {
   field (MDEL, "0.001")
 }
 
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ReadSetCurrentStepSize") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetCurrentStepSize") {
   field (DTYP, "stream")
-  field (INP,  "@HAMEG_HMP4030.proto ReadSetCurrentStepSize($(CHAN)) $(PORT)")
+  field (INP,  "@HAMEG_HMP4030.proto GetCurrentStepSize($(CHAN)) $(PORT)")
   field (EGU, "A")
   field (PREC, "4")
   field (ADEL, "0.005")
diff --git a/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto b/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
index 1ba13e6..d64c69f 100644
--- a/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
+++ b/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
@@ -23,53 +23,70 @@ ExtraInput    = Ignore;
 # ### Protocols ### #
 #####################
 
-#---VOLTAGE---------------------------------------------------------------------------
-SetVoltage {
-  out "INST OUT\$1";
-  out "VOLT %f";
+#---GLOBAL STATE-----------------------------------------------------------------------
+
+ActivateAllChannel {
+  out "OUTP:GEN ON";
+}
+
+DeactivateAllChannel {
+  out "OUTP:GEN OFF";
 }
 
-ReadSetVoltage {
+#---VOLTAGE---------------------------------------------------------------------------
+
+GetVoltage {
   out "INST OUT\$1";
   out "VOLT?";
   in "%f";
 }
 
-SetVoltageStepSize {
+SetVoltage {
   out "INST OUT\$1";
-  out "VOLT:STEP %f";
+  out "VOLT %f";
+  @init { GetVoltage; }
 }
 
-ReadSetVoltageStepSize {
+GetVoltageStepSize {
   out "INST OUT\$1"; 
   out "VOLT:STEP?"; 
   in "%f";
 }
 
-#---CURRENT---------------------------------------------------------------------------
-SetCurrent {
+SetVoltageStepSize {
   out "INST OUT\$1";
-  out "CURR %f";
+  out "VOLT:STEP %f";
+  @init { GetVoltageStepSize; }
 }
 
-ReadSetCurrent {
+#---CURRENT---------------------------------------------------------------------------
+
+GetCurrent {
   out "INST OUT\$1";
   out "CURR?";
   in "%f";
 }
- 
-SetCurrentStepSize {
+
+ SetCurrent {
   out "INST OUT\$1";
-  out "CURR:STEP %f";
+  out "CURR %f";
+  @init { GetCurrent; }
 }
- 
-ReadSetCurrentStepSize {
+
+GetCurrentStepSize {
   out "INST OUT\$1";
   out "CURR:STEP?";
   in "%f";
 }
 
+SetCurrentStepSize {
+  out "INST OUT\$1";
+  out "CURR:STEP %f";
+  @init { GetCurrentStepSize; }
+}
+ 
 #---CHANNELMODE-----------------------------------------------------------------------
+
 ActivateChannel {
   out "INST OUT\$1";
   out "OUTP ON";
@@ -89,15 +106,8 @@ ReadChannelMode {
   in "%i";
 }
 
-ActivateAllChannel {
-  out "OUTP:GEN ON";
-}
-
-DeactivateAllChannel {
-  out "OUTP:GEN OFF";
-}
-
 #---FUSE------------------------------------------------------------------------------
+
 ActivateFuse {
   out "INST OUT\$1";
   out "FUSE ON";
@@ -115,6 +125,7 @@ ReadFuseMode {
 }
 
 #---PROTECTION------------------------------------------------------------------------
+
 SetVoltageProtection {
   out "INST OUT\$1";
   out "VOLT:PROT %f";