From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Tue, 8 Aug 2017 15:12:19 +0000 (+0200)
Subject: HAMEG_HMP4030: {Set,Get}Fuse
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=53c2760e22b44e5018cb245308dd1e5ed16b2125;p=mvd_epics.git

HAMEG_HMP4030: {Set,Get}Fuse
---

diff --git a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
index 29bf660..0c0d82c 100644
--- a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
+++ b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
@@ -107,19 +107,21 @@ record (bi, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOutput") {
   field (PINI, "YES")
 }
 
-record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ActivateFuse") {
+record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetFuse") {
   field (DTYP, "stream")
-  field (OUT,  "@HAMEG_HMP4030.proto ActivateFuse($(CHAN)) $(PORT)")
-}
-
-record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):DeactivateFuse") {
-  field (DTYP, "stream")
-  field (OUT,  "@HAMEG_HMP4030.proto DeactivateFuse($(CHAN)) $(PORT)")
+  field (OUT,  "@HAMEG_HMP4030.proto SetFuse($(CHAN)) $(PORT)")
+  field (ZNAM, "OFF")
+  field (ONAM, "ON")
+  field (PINI, "YES")
 }
 
-record (bi, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ReadFuseMode") {
+record (bi, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetFuse") {
   field (DTYP, "stream")
-  field (INP,  "@HAMEG_HMP4030.proto ReadFuseMode($(CHAN)) $(PORT)")
+  field (INP,  "@HAMEG_HMP4030.proto GetFuse($(CHAN)) $(PORT)")
+  field (ZNAM, "OFF")
+  field (ONAM, "ON")
+  field (SCAN, "2 second")
+  field (PINI, "YES")
 }
 
 record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetVoltageProtection") {
diff --git a/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto b/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
index d696ec2..379e7f6 100644
--- a/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
+++ b/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
@@ -121,20 +121,16 @@ SetOutput {
 
 #---FUSE------------------------------------------------------------------------------
 
-ActivateFuse {
+GetFuse {
   out "INST OUT\$1";
-  out "FUSE ON";
-}
-
-DeactivateFuse {
-  out "INST OUT\$1";
-  out "FUSE OFF";
+  out "FUSE?";
+  in "%i";
 }
 
-ReadFuseMode {
+SetFuse {
   out "INST OUT\$1";
-  out "FUSE?";
-  in "%i";
+  out "FUSE %i";
+  @init { GetFuse; }
 }
 
 #---PROTECTION------------------------------------------------------------------------