From d0225d6b9d096194d5f8fc830365e4bcf08969bb Mon Sep 17 00:00:00 2001
From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Tue, 8 Aug 2017 16:23:48 +0200
Subject: [PATCH] HAMEG_HMP4030: {Get,Set}Output {Get,Set}GeneralOutput

---
 .../HAMEG_HMP4030App/Db/HAMEG_HMP4030.db      | 15 ++++++----
 .../Db/HAMEG_HMP4030_CHANNEL.template         | 20 +++++++------
 HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto   | 29 ++++++++-----------
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030.db b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030.db
index 27bbd14..9ebcf38 100644
--- a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030.db
+++ b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030.db
@@ -1,14 +1,19 @@
 
-record (bo, "$(sys):$(sub):POWER:$(vsys):ActivateAllChannel") {
+record (bo, "$(sys):$(sub):POWER:$(vsys):SetGeneralOutput") {
   field (DTYP, "stream")
-  field (OUT,  "@HAMEG_HMP4030.proto ActivateAllChannel $(PORT)")
-  field (SCAN, "2 second")
+  field (OUT,  "@HAMEG_HMP4030.proto SetGeneralOutput $(PORT)")
+  field (ZNAM, "OFF")
+  field (ONAM, "ON")
+  field (PINI, "YES")
 }
 
-record (bo, "$(sys):$(sub):POWER:$(vsys):DeactivateAllChannel") {
+record (bi, "$(sys):$(sub):POWER:$(vsys):GetGeneralOutput") {
   field (DTYP, "stream")
-  field (OUT,  "@HAMEG_HMP4030.proto DeactivateAllChannel $(PORT)")
+  field (INP,  "@HAMEG_HMP4030.proto GetGeneralOutput $(PORT)")
+  field (ZNAM, "OFF")
+  field (ONAM, "ON")
   field (SCAN, "2 second")
+  field (PINI, "YES")
 }
 
 record (stringin, "$(sys):$(sub):POWER:$(vsys):Identification") {
diff --git a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
index f966462..8b0557e 100644
--- a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
+++ b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template
@@ -70,19 +70,21 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetCurrentStepSize") {
   field (MDEL, "0.001")
 }
 
-record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ActivateChannel") {
+record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetOutput") {
   field (DTYP, "stream")
-  field (OUT,  "@HAMEG_HMP4030.proto ActivateChannel($(CHAN)) $(PORT)")
+  field (OUT,  "@HAMEG_HMP4030.proto SetOutput($(CHAN)) $(PORT)")
+  field (ZNAM, "OFF")
+  field (ONAM, "ON")
+  field (PINI, "YES")
 }
 
-record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):DeactivateChannel") {
+record (bi, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOutput") {
   field (DTYP, "stream")
-  field (OUT,  "@HAMEG_HMP4030.proto DeactivateChannel($(CHAN)) $(PORT)")
-}
-
-record (bi, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ReadChannelMode") {
-  field (DTYP, "stream")
-  field (INP,  "@HAMEG_HMP4030.proto ReadChannelMode($(CHAN)) $(PORT)")
+  field (INP,  "@HAMEG_HMP4030.proto GetOutput($(CHAN)) $(PORT)")
+  field (ZNAM, "OFF")
+  field (ONAM, "ON")
+  field (SCAN, "2 second")
+  field (PINI, "YES")
 }
 
 record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ActivateFuse") {
diff --git a/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto b/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
index 95dae4c..f15edfa 100644
--- a/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
+++ b/HAMEG_HMP4030/protocols/HAMEG_HMP4030.proto
@@ -30,12 +30,14 @@ GetIdentification {
   in "%s";
 }
 
-ActivateAllChannel {
-  out "OUTP:GEN ON";
+GetGeneralOutput {
+  out "OUTP:GEN?";
+  in "%i";
 }
 
-DeactivateAllChannel {
-  out "OUTP:GEN OFF";
+SetGeneralOutput {
+  out "OUTP:GEN %i";
+  @init { GetGeneralOutput; }
 }
 
 #---VOLTAGE---------------------------------------------------------------------------
@@ -92,23 +94,16 @@ SetCurrentStepSize {
  
 #---CHANNELMODE-----------------------------------------------------------------------
 
-ActivateChannel {
-  out "INST OUT\$1";
-  out "OUTP ON";
-  out "OUTP:SEL ON";
-}
-
-DeactivateChannel {
+GetOutput {
   out "INST OUT\$1";
-  out "OUTP OFF";
-  out "OUTP:SEL OFF";
-
+  out "OUTP:SEL?";
+  in "%i";
 }
 
-ReadChannelMode {
+SetOutput {
   out "INST OUT\$1";
-  out "OUTP?";
-  in "%i";
+  out "OUTP:SEL %i";
+  @init { GetOutput; }
 }
 
 #---FUSE------------------------------------------------------------------------------
-- 
2.43.0