X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fapi.c;h=a462fdcf5ef6830fac9af99ce9c3cbb3189445c4;hp=0d3c6735de1824a2d64b638b2aa9d01dc85c863a;hb=b74cc88d328eb3b7d2c0c1df8fed84131815a9f3;hpb=ce96b696b548cc936ad50779b8b317db8bd421fc

diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index 0d3c6735..a462fdcf 100644
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -54,12 +54,11 @@ static const struct scpi_command cmdset_agilent[] = {
 	{ DMM_CMD_QUERY_FUNC, "CONF?", },
 	{ DMM_CMD_START_ACQ, "INIT", },
 	{ DMM_CMD_STOP_ACQ, "ABORT", },
-	{ DMM_CMD_QUERY_VALUE, "READ?", },
+	{ DMM_CMD_QUERY_VALUE, "FETCH?", },
 	{ DMM_CMD_QUERY_PREC, "CONF?", },
 	{ DMM_CMD_QUERY_RANGE_AUTO, "%s:RANGE:AUTO?", },
 	{ DMM_CMD_QUERY_RANGE, "%s:RANGE?", },
-	{ DMM_CMD_SETUP_RANGE_AUTO, "%s:RANGE:AUTO ON", },
-	{ DMM_CMD_SETUP_RANGE, "%s:RANGE %s", },
+	{ DMM_CMD_SETUP_RANGE, "CONF:%s %s", },
 	ALL_ZERO,
 };
 
@@ -133,11 +132,11 @@ static const struct mqopt_item mqopts_agilent_34405a[] = {
 	{ SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR:AC ", NO_DFLT_PREC, FLAGS_NONE, },
 	{ SR_MQ_RESISTANCE, 0, "RES", "RES ", NO_DFLT_PREC, FLAGS_NONE, },
 	{ SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, "FRES", "FRES ", NO_DFLT_PREC, FLAGS_NONE, },
-	{ SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, FLAGS_NONE, },
+	{ SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, FLAG_NO_RANGE, },
 	{ SR_MQ_CAPACITANCE, 0, "CAP", "CAP ", NO_DFLT_PREC, FLAGS_NONE, },
-	{ SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, FLAGS_NONE, },
-	{ SR_MQ_TEMPERATURE, 0, "TEMP", "TEMP ", NO_DFLT_PREC, FLAGS_NONE, },
-	{ SR_MQ_FREQUENCY, 0, "FREQ", "FREQ ", NO_DFLT_PREC, FLAGS_NONE, },
+	{ SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, FLAG_NO_RANGE, },
+	{ SR_MQ_TEMPERATURE, 0, "TEMP", "TEMP ", NO_DFLT_PREC, FLAG_NO_RANGE, },
+	{ SR_MQ_FREQUENCY, 0, "FREQ", "FREQ ", NO_DFLT_PREC, FLAG_NO_RANGE, },
 };
 
 static const struct mqopt_item mqopts_agilent_34401a[] = {
@@ -221,7 +220,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
 		1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
 		scpi_dmm_get_meas_gwinstek,
 		ARRAY_AND_SIZE(devopts_generic),
-		1000 * 2500, 0, FALSE,
+		2500 * 1000, 0, FALSE,
 		NULL, NULL, NULL,
 	},
 	{
@@ -229,7 +228,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
 		1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
 		scpi_dmm_get_meas_gwinstek,
 		ARRAY_AND_SIZE(devopts_generic),
-		1000 * 2500, 0, FALSE,
+		2500 * 1000, 0, FALSE,
 		NULL, NULL, NULL,
 	},
 	{
@@ -254,7 +253,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
 		scpi_dmm_get_meas_agilent,
 		ARRAY_AND_SIZE(devopts_generic),
 		/* 34401A: typ. 1020ms for AC readings (default is 1000ms). */
-		1000 * 1500, 0, FALSE,
+		1500 * 1000, 0, FALSE,
 		NULL, NULL, NULL,
 	},
 	{