Remove \n in e36xx and fix readVoltageCurrent

dcpwr/keysight/e36xx/basechannel.go

@@ -42,7 +42,7 @@ func (ch *Channel) CurrentLimit() (float64, error) {
 // Attribute Current Limit described in Section 4.2.1 of IVI-4.4: IviDCPwr
 // Class Specification.
 func (ch *Channel) SetCurrentLimit(limit float64) error {
-	return ivi.Set(ch.inst, "INST %s;:CURR %f\n", ch.name, limit)
+	return ch.inst.Command("INST %s;:CURR %f", ch.name, limit)
 }
 
 // CurrentLimitBehavior determines the behavior of the power supply when the
@@ -77,7 +77,7 @@ func (ch *Channel) SetCurrentLimitBehavior(behavior dcpwr.CurrentLimitBehavior)
 // OutputEnabled is the getter for the read-write IviDCPwrBase Attribute Output
 // Enabled described in Section 4.2.3 of IVI-4.4: IviDCPwr Class Specification.
 func (ch *Channel) OutputEnabled() (bool, error) {
-	return query.Bool(ch.inst, "OUTP?\n")
+	return query.Bool(ch.inst, "OUTP?")
 }
 
 // SetOutputEnabled sets all three output channels to enabled or disabled.
@@ -87,9 +87,9 @@ func (ch *Channel) OutputEnabled() (bool, error) {
 // Specification.
 func (ch *Channel) SetOutputEnabled(v bool) error {
 	if v {
-		return ivi.Set(ch.inst, "OUTP ON\n")
+		return ch.inst.Command("OUTP ON")
 	}
-	return ivi.Set(ch.inst, "OUTP OFF\n")
+	return ch.inst.Command("OUTP OFF")
 }
 
 // DisableOutput is a convenience function for setting the Output Enabled
@@ -168,7 +168,7 @@ func (ch *Channel) VoltageLevel() (float64, error) {
 // Voltage Level described in Section 4.2.6 of IVI-4.4: IviDCPwr Class
 // Specification.
 func (ch *Channel) SetVoltageLevel(amp float64) error {
-	return ivi.Set(ch.inst, "APPL %s, %f\n", ch.name, amp)
+	return ch.inst.Command("inst %s; volt %.2f", ch.name, amp)
 }
 
 // ConfigureCurrentLimit configures the current limit. It specifies the output
@@ -279,10 +279,13 @@ func (ch *Channel) MeasureCurrent() (float64, error) {
 // is the voltage limit value and the second number 1.000000 is the current
 // limit value for the specified output.
 func (ch *Channel) readVoltageCurrent() (float64, float64, error) {
-	s, err := query.Stringf(ch.inst, "APPL? %s", ch)
+	s, err := query.Stringf(ch.inst, "appl? %s", ch.name)
 	if err != nil {
 		return 0.0, 0.0, err
 	}
+	// The E3631A returns the voltage and current inside double quotes, separated
+	// by a comma, so we need to strip those.
+	s = convert.StripDoubleQuotes(s)
 	floats, err := convert.StringToNFloats(s, ",", 2)
 	if err != nil {
 		return 0.0, 0.0, err

go.mod

@@ -3,6 +3,6 @@ module github.com/gotmc/ivi
 go 1.21
 
 require (
-	github.com/gotmc/convert v0.2.0
-	github.com/gotmc/query v0.5.0
+	github.com/gotmc/convert v0.4.0
+	github.com/gotmc/query v0.5.1
 )

go.sum

@@ -1,4 +1,4 @@
-github.com/gotmc/convert v0.2.0 h1:aWOTiy1PfaXoyPcqHyinGKkHgrdENTybUvrH7AOZLS0=
-github.com/gotmc/convert v0.2.0/go.mod h1:ZuXbN0TaRi0AStPHR7iz2h2kgr1wlxYo2kTTNxwA1QU=
-github.com/gotmc/query v0.5.0 h1:3du4felYwincLk1iFN26hkTv+yPajI3AxIwsEpdqRdc=
-github.com/gotmc/query v0.5.0/go.mod h1:5Fe+Q3az2zfXXa4pdvQ95mgieY6Bf/XFEOyMtdKjukE=
+github.com/gotmc/convert v0.4.0 h1:RI7J96V99HsQDGRMVOUdwczd7tDAk4FVttqOuLcBEwE=
+github.com/gotmc/convert v0.4.0/go.mod h1:ClVdnU/ZcOFgUQWXgHexlLqE9/AFEeo5uZDf9kkAtyw=
+github.com/gotmc/query v0.5.1 h1:bPa09woaMPDGwzvLHrPL89Vd2+hjbz7BNq8ccMdV0Ds=
+github.com/gotmc/query v0.5.1/go.mod h1:5Fe+Q3az2zfXXa4pdvQ95mgieY6Bf/XFEOyMtdKjukE=

inherent.go

@@ -8,7 +8,6 @@ package ivi
 import (
 	"errors"
 	"fmt"
-	"log"
 	"strings"
 	"time"
 
@@ -72,7 +71,6 @@ func (inherent *Inherent) InstrumentManufacturer() (string, error) {
 // attribute Instrument Model described in Section 5.20 of IVI-3.2: Inherent
 // Capabilities Specification.
 func (inherent *Inherent) InstrumentModel() (string, error) {
-	log.Print("Executing InstrumentModel() IVI query")
 	return inherent.queryIdentification(modelID)
 }
 
@@ -84,7 +82,6 @@ func (inherent *Inherent) InstrumentSerialNumber() (string, error) {
 
 // Reset resets the instrument.
 func (inherent *Inherent) Reset() error {
-	log.Println("Sending inherent Reset() command.")
 	err := inherent.inst.Command("*rst")
 	// Need to wait until the device resets.
 	// FIXME: The duration should be device dependent instead of hard coded.

ivi.go

@@ -44,5 +44,5 @@ type Querier interface {
 }
 
 type Commander interface {
-	Command(format string, a ...interface{}) error
+	Command(format string, a ...any) error
 }